From cb415f11c5bef10aff85dc49e24d65c76b4ba8ba Mon Sep 17 00:00:00 2001 From: akremin Date: Mon, 5 Aug 2024 16:00:10 -0700 Subject: [PATCH] bug fix in test_io and new jobdesc to CUSTOMZTILE --- py/desispec/test/test_io.py | 4 ++-- py/desispec/workflow/desi_proc_funcs.py | 2 +- py/desispec/workflow/redshifts.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/py/desispec/test/test_io.py b/py/desispec/test/test_io.py index d4342e6bf..7656e7c62 100644 --- a/py/desispec/test/test_io.py +++ b/py/desispec/test/test_io.py @@ -937,12 +937,12 @@ def test_findfile(self): tileid = 8888 refpath = os.path.expandvars(f'$DESI_SPECTRO_DATA/{night}/{expid:08d}/fiberassign-{tileid:06d}.fits.gz') for groupname in ('healpix', 'pernight', 'cumulative', 'perexp', 'blatfoo'): - testpath = findfile('fiberassign', night=night, expid=expid, tile=tileid, groupname='healpix') + testpath = findfile('fiberassign', night=night, expid=expid, tile=tileid, groupname=groupname) self.assertEqual(testpath, refpath) refpath = os.path.expandvars(f'$DESI_SPECTRO_REDUX/$SPECPROD/preproc/{night}/{expid:08d}/tilepix-{tileid}.json') for groupname in ('healpix', 'pernight', 'cumulative', 'perexp', 'blatfoo'): - testpath = findfile('tilepix', night=night, expid=expid, tile=tileid, groupname='healpix') + testpath = findfile('tilepix', night=night, expid=expid, tile=tileid, groupname=groupname) self.assertEqual(testpath, refpath) #- Can't set both tile and healpix diff --git a/py/desispec/workflow/desi_proc_funcs.py b/py/desispec/workflow/desi_proc_funcs.py index 33c8e415f..41989633a 100755 --- a/py/desispec/workflow/desi_proc_funcs.py +++ b/py/desispec/workflow/desi_proc_funcs.py @@ -455,7 +455,7 @@ def determine_resources(ncameras, jobdesc, nexps=1, forced_runtime=None, queue=N elif jobdesc == 'NIGHTLYBIAS': ncores, runtime = 15, 5 nodes = 2 - elif jobdesc in ['PEREXP', 'PERNIGHT', 'CUMULATIVE', 'CUSTOM_TILE']: + elif jobdesc in ['PEREXP', 'PERNIGHT', 'CUMULATIVE', 'CUSTOMZTILE']: if system_name.startswith('perlmutter'): nodes, runtime = 1, 50 #- timefactor will bring time back down else: diff --git a/py/desispec/workflow/redshifts.py b/py/desispec/workflow/redshifts.py index 5a1ab5f84..8ea42c528 100644 --- a/py/desispec/workflow/redshifts.py +++ b/py/desispec/workflow/redshifts.py @@ -239,7 +239,7 @@ def create_desi_zproc_batch_script(group, ## Derive job description name from group jobdesc = group if jobdesc not in ('perexp', 'pernight', 'cumulative'): - jobdesc = 'custom_tile' + jobdesc = 'customztile' log.warning(f'Unrecognized {group=}, using {jobdesc=}') ## If system name isn't specified, guess it