From b0d9e10eb3d1af455f14c6ceba54c4e6bd785ee4 Mon Sep 17 00:00:00 2001 From: kremin Date: Wed, 14 Aug 2024 23:08:06 -0700 Subject: [PATCH] fix new exptab cache name and submit_prod typo --- bin/desi_submit_prod | 2 +- py/desispec/scripts/submit_prod.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/desi_submit_prod b/bin/desi_submit_prod index 9c3102a92..069a80bcf 100755 --- a/bin/desi_submit_prod +++ b/bin/desi_submit_prod @@ -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.") diff --git a/py/desispec/scripts/submit_prod.py b/py/desispec/scripts/submit_prod.py index eef83700e..8aa417447 100644 --- a/py/desispec/scripts/submit_prod.py +++ b/py/desispec/scripts/submit_prod.py @@ -17,7 +17,7 @@ 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 +from desispec.workflow.exptable import read_minimal_science_exptab_cols from desispec.scripts.submit_night import submit_night from desispec.workflow.queue import check_queue_count @@ -60,7 +60,7 @@ def get_all_valid_nights(first_night, last_night): 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