Skip to content

Commit

Permalink
Update calibration code for cp_pipe/cp_verify changes due to RFC-1013.
Browse files Browse the repository at this point in the history
* Switch instrument names in file path to match default:
  * Latiss -> LATISS
  * LsstComCam -> LSSTComCam
* Fix changes in pipeline definition names:
  * findDefects.yaml -> cpDefects.yaml
  * VerifyBias.yaml -> verifyBias.yaml (similar changes for
    verifyDark.yaml and verifyFlat.yaml).
* Fix subset name change:
  * gainFromFlatPairs -> cpPtcGainFromFlatPairs
  • Loading branch information
czwa committed Jun 17, 2024
1 parent fa5c531 commit b14bf51
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def instrument_name(self):
@property
def pipeline_instrument(self):
"""String with instrument name for pipeline yaml file"""
return "Latiss"
return "LATISS"

@property
def detectors(self):
Expand Down
14 changes: 7 additions & 7 deletions python/lsst/ts/externalscripts/base_make_calibrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def get_schema(cls):
do_gain_from_flat_pairs:
type: boolean
descriptor: Should the gain be estimated from each pair of flats
taken at the same exposure time? Runs the cpPtc.yaml# generateGainFromFlatPairs \
taken at the same exposure time? Runs the cpPtc.yaml#cpPtcGainFromFlatPairs \
pipeline. Use the 'config_options_ptc' parameter to pass options to the ISR and \
cpExtract tasks. This configuration will only be in effect if \
script_mode = BIAS_DARK_FLAT.
Expand Down Expand Up @@ -651,7 +651,7 @@ def get_pipetask_parameters_defects(self):
input_collections_defects = f"{self.config.input_collections_defects}"

return (
"findDefects.yaml",
"cpDefects.yaml",
(
f"-j {self.config.n_processes} -i {input_collections_defects} "
"--register-dataset-types "
Expand All @@ -665,7 +665,7 @@ def get_pipetask_parameters_ptc(self):
Returns
-------
cpPtc.yaml or cpPtc.yaml#gainFromFlatPairs : `str`
cpPtc.yaml or cpPtc.yaml#cpPtcGainFromFlatPairs : `str`
cp_pipe PTC or gain from pairs pipeline.
config_string : `str`
Expand All @@ -685,7 +685,7 @@ def get_pipetask_parameters_ptc(self):
if (self.config.do_ptc is False) and (
self.config.do_gain_from_flat_pairs is True
):
pipeline_yaml_file = "cpPtc.yaml#gainFromFlatPairs"
pipeline_yaml_file = "cpPtc.yaml#cpPtcGainFromFlatPairs"
else:
pipeline_yaml_file = "cpPtc.yaml"

Expand Down Expand Up @@ -806,7 +806,7 @@ def get_pipetask_parameters_verification_bias(self, job_id_calib):
List of bias exposure IDs.
"""

pipe_yaml = "VerifyBias.yaml"
pipe_yaml = "verifyBias.yaml"
# If the combined calibration was not generated with the images
# taken at the beginning of the script, the verification
# pipetask will use the calibrations provided as input
Expand Down Expand Up @@ -850,7 +850,7 @@ def get_pipetask_parameters_verification_dark(self, job_id_calib):
exposure_ids_dark : `list`[`int`]
List of dark exposure IDs.
"""
pipe_yaml = "VerifyDark.yaml"
pipe_yaml = "verifyDark.yaml"
# If the combined calibration was not generated with the images
# taken at the beginning of the script, the verification
# pipetask will use the calibrations provided as input
Expand Down Expand Up @@ -895,7 +895,7 @@ def get_pipetask_parameters_verification_flat(self, job_id_calib):
List of flat exposure IDs.
"""

pipe_yaml = "VerifyFlat.yaml"
pipe_yaml = "verifyFlat.yaml"
# If the combined calibration was not generated with the images
# taken at the beginning of the script, the verification
# pipetask will use the calibrations provided as input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def instrument_name(self):
@property
def pipeline_instrument(self):
"""String with instrument name for pipeline yaml file"""
return "LsstComCam"
return "LSSTComCam"

@property
def detectors(self):
Expand Down

0 comments on commit b14bf51

Please sign in to comment.