Skip to content

Commit

Permalink
fix typo in submit_prod and better future support
Browse files Browse the repository at this point in the history
  • Loading branch information
akremin committed Aug 15, 2024
1 parent c314650 commit 2adb960
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/desi_submit_prod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def parse_args(): # options=None):

parser.add_argument("-p", "--production-yaml", type=str, required=True,
help="Relative or absolute pathname to the yaml file summarizing the production.")
parser.add_argument("-p", "--queue-threshold", type=int, default=4800,
parser.add_argument("-q", "--queue-threshold", type=int, default=4800,
help="The number of jobs for the current user in the queue at which the"
+ " at which the script stops submitting new jobs.")

Expand Down
6 changes: 3 additions & 3 deletions py/desispec/scripts/submit_prod.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from desispec.scripts.proc_night import proc_night
## Import some helper functions, you can see their definitions by uncomenting the bash shell command
from desispec.workflow.utils import verify_variable_with_environment, listpath
from desispec.workflow.redshifts import read_minimal_exptables_columns
# TODO when merged into branch with crossnight dependencies this is in workflow.exptable as the new name
from desispec.workflow.redshifts import read_minimal_exptables_columns as read_minimal_science_exptab_cols
from desispec.scripts.submit_night import submit_night
from desispec.workflow.queue import check_queue_count

Expand Down Expand Up @@ -59,8 +60,7 @@ def get_all_valid_nights(first_night, last_night):
Returns:
nights, list. A list of nights on or after Jan 1 2020 in which data exists at NERSC.
"""
# TODO when merged into branch with crossnight dependencies this function changes name
fulletab = read_minimal_exptables_columns()
fulletab = read_minimal_science_exptab_cols()
nights = np.unique(fulletab['NIGHT'])
nights = nights[((nights>=first_night)&(nights<=last_night))]
return nights
Expand Down

0 comments on commit 2adb960

Please sign in to comment.