Skip to content

Commit

Permalink
update priorities and numbers of observations for the GD targets
Browse files Browse the repository at this point in the history
  • Loading branch information
geordie666 committed May 13, 2024
1 parent 56cd246 commit da4cf59
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions py/desitarget/data/targetmask.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ priorities:
DARK_TOO_LOP: SAME_AS_BRIGHT_TOO_LOP
DARK_TOO_HIP: SAME_AS_BRIGHT_TOO_HIP
GD1_BRIGHT_PM: {UNOBS: 1520, MORE_ZGOOD: 2, MORE_ZWARN: 2, DONE: 2, OBS: 1, DONOTOBSERVE: 0, MORE_MIDZQSO: 0}
GD1_FAINT_NO_PM: {UNOBS: 1420, MORE_ZGOOD: 2, MORE_ZWARN: 2, DONE: 2, OBS: 1, DONOTOBSERVE: 0, MORE_MIDZQSO: 0}
GD1_FILLER: {UNOBS: 100, MORE_ZGOOD: 2, MORE_ZWARN: 2, DONE: 2, OBS: 1, DONOTOBSERVE: 0, MORE_MIDZQSO: 0}
GD1_FAINT_NO_PM: {UNOBS: 1510, MORE_ZGOOD: 2, MORE_ZWARN: 2, DONE: 2, OBS: 1, DONOTOBSERVE: 0, MORE_MIDZQSO: 0}
GD1_FILLER: {UNOBS: 49, MORE_ZGOOD: 2, MORE_ZWARN: 2, DONE: 2, OBS: 1, DONOTOBSERVE: 0, MORE_MIDZQSO: 0}

# ADM INITIAL number of observations (NUMOBS_INIT) for each target bit
# ADM SAME_AS_XXX means to use the NUMOBS_INIT for bitname XXX
Expand Down Expand Up @@ -571,6 +571,6 @@ numobs:
DWF_BRIGHT_LO: 10
DWF_DARK_HI: 10
DWF_DARK_LO: 10
GD1_BRIGHT_PM: 1
GD1_FAINT_NO_PM: 1
GD1_FILLER: 1
GD1_BRIGHT_PM: 4
GD1_FAINT_NO_PM: 4
GD1_FILLER: 4
5 changes: 3 additions & 2 deletions py/desitarget/mtl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1219,11 +1219,12 @@ def add_to_ledgers_in_hp(targets, pixlist, mtldir=None, obscon="DARK",
for col in ["DESI_TARGET", "BGS_TARGET",
"MWS_TARGET", "SCND_TARGET"]:
oldmatches[col] |= mtlmatches[col]
# ADM set PRIORITY to larger number
# ADM (+ inherit TARGET_STATE, SUBPRIORITY, NUMOBS_MORE).
# ADM set PRIORITY to larger number (plus, inherit
# ADM TARGET_STATE, SUBPRIORITY, NUMOBS_MORE/_INIT).
ii = mtlmatches["PRIORITY"] > oldmatches["PRIORITY"]
oldmatches["PRIORITY"][ii] = mtlmatches["PRIORITY"][ii]
oldmatches["NUMOBS_MORE"][ii] = mtlmatches["NUMOBS_MORE"][ii]
oldmatches["NUMOBS_INIT"][ii] = mtlmatches["NUMOBS_INIT"][ii]
oldmatches["SUBPRIORITY"][ii] = mtlmatches["SUBPRIORITY"][ii]
oldmatches["TARGET_STATE"][ii] = mtlmatches["TARGET_STATE"][ii]
# ADM also need to inherit the new timestamp and code version.
Expand Down

0 comments on commit da4cf59

Please sign in to comment.