diff --git a/config/assembleCoadd.py b/config/assembleCoadd.py index 0972fb1f1..9fd350b34 100644 --- a/config/assembleCoadd.py +++ b/config/assembleCoadd.py @@ -22,15 +22,16 @@ import os.path +from lsst.pipe.tasks.selectImages import PsfWcsSelectImagesTask + # Load configs shared between assembleCoadd and makeCoaddTempExp config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py")) -config.subregionSize = (10000, 200) # 200 rows (since patch width is typically < 10k pixels) +config.subregionSize = (10000, 200) # 200 rows (since patch width is typically < 10k pixels) config.removeMaskPlanes.append("CROSSTALK") config.doNImage = True config.badMaskPlanes += ["SUSPECT"] -from lsst.pipe.tasks.selectImages import PsfWcsSelectImagesTask config.select.retarget(PsfWcsSelectImagesTask) # FUTURE: Set to True when we get transmission curves diff --git a/config/cmodel.py b/config/cmodel.py index 7d4bacbae..892d98797 100644 --- a/config/cmodel.py +++ b/config/cmodel.py @@ -20,8 +20,8 @@ # the GNU General Public License along with this program. If not, # see . -import os -import lsst.meas.modelfit +import lsst.meas.modelfit # noqa: F401 required to use modelfit plugin below + config.measurement.plugins.names |= ["modelfit_DoubleShapeletPsfApprox", "modelfit_CModel"] -config.measurement.slots.modelFlux = 'modelfit_CModel' -config.catalogCalculation.plugins['base_ClassificationExtendedness'].fluxRatio = 0.985 +config.measurement.slots.modelFlux = "modelfit_CModel" +config.catalogCalculation.plugins["base_ClassificationExtendedness"].fluxRatio = 0.985 diff --git a/config/coaddDriver_noPSF.py b/config/coaddDriver_noPSF.py index af033a10c..d8fb76677 100644 --- a/config/coaddDriver_noPSF.py +++ b/config/coaddDriver_noPSF.py @@ -21,4 +21,5 @@ # see . from lsst.pipe.tasks.selectImages import WcsSelectImagesTask + config.select.retarget(WcsSelectImagesTask) diff --git a/config/comCamSim/analysisToolsPhotometricCatalogMatch.py b/config/comCamSim/analysisToolsPhotometricCatalogMatch.py index 17e9a2462..4acbc5a62 100644 --- a/config/comCamSim/analysisToolsPhotometricCatalogMatch.py +++ b/config/comCamSim/analysisToolsPhotometricCatalogMatch.py @@ -1,8 +1,9 @@ """comCamSim-specific overrides for PhotometricCatalogMatchTask""" import os.path + configDir = os.path.dirname(__file__) -config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, 'filterMap.py')) +config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.referenceCatalogLoader.doApplyColorTerms = False config.connections.refCatalog = "uw_stars_20240524" diff --git a/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py b/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py index f5ae79c38..fb1f1820a 100644 --- a/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py @@ -1,8 +1,9 @@ """comCamSim-specific overrides for PhotometricCatalogMatchVisitTask""" import os.path + configDir = os.path.dirname(__file__) -config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, 'filterMap.py')) +config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.connections.refCatalog = "uw_stars_20240524" config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/comCamSim/computeExposureSummaryStats.py b/config/comCamSim/computeExposureSummaryStats.py index 84c99d044..89a0d661e 100644 --- a/config/comCamSim/computeExposureSummaryStats.py +++ b/config/comCamSim/computeExposureSummaryStats.py @@ -7,30 +7,30 @@ # Fiducial PsfSigma in pixels config.fiducialPsfSigma = { - 'u': 1.72, - 'g': 1.63, - 'r': 1.56, - 'i': 1.51, - 'z': 1.47, - 'y': 1.44, + "u": 1.72, + "g": 1.63, + "r": 1.56, + "i": 1.51, + "z": 1.47, + "y": 1.44, } # Fiducial ZeroPoint for 1s exposure config.fiducialZeroPoint = { - 'u': 25.96, - 'g': 27.95, - 'r': 27.80, - 'i': 27.61, - 'z': 27.22, - 'y': 26.26, + "u": 25.96, + "g": 27.95, + "r": 27.80, + "i": 27.61, + "z": 27.22, + "y": 26.26, } # Fiducial SkyBackground in ADU per second config.fiducialSkyBackground = { - 'u': 0.90, - 'g': 9.20, - 'r': 19.62, - 'i': 31.51, - 'z': 47.26, - 'y': 53.91, + "u": 0.90, + "g": 9.20, + "r": 19.62, + "i": 31.51, + "z": 47.26, + "y": 53.91, } diff --git a/config/comCamSim/fgcmFitCycle.py b/config/comCamSim/fgcmFitCycle.py index a0cc0e1de..15a25953c 100644 --- a/config/comCamSim/fgcmFitCycle.py +++ b/config/comCamSim/fgcmFitCycle.py @@ -17,7 +17,7 @@ config.maxIterBeforeFinalCycle = 50 config.minCcdPerExp = 1 config.utBoundary = 0.0 -config.washMjds = (0.0, ) +config.washMjds = (0.0,) # For now, define 1 observing epoch that encompasses everything. config.epochMjds = (0.0, 100000.0) config.coatingMjds = [] diff --git a/config/comCamSim/fgcmMakeLut.py b/config/comCamSim/fgcmMakeLut.py index 4d1da705f..04874369f 100644 --- a/config/comCamSim/fgcmMakeLut.py +++ b/config/comCamSim/fgcmMakeLut.py @@ -6,4 +6,4 @@ ] # FGCM name or filename of precomputed atmospheres -config.atmosphereTableName = 'fgcm_atm_lsst2' +config.atmosphereTableName = "fgcm_atm_lsst2" diff --git a/config/comCamSim/gbdesAstrometricFit.py b/config/comCamSim/gbdesAstrometricFit.py index 942262e16..8786c166a 100644 --- a/config/comCamSim/gbdesAstrometricFit.py +++ b/config/comCamSim/gbdesAstrometricFit.py @@ -3,6 +3,6 @@ """ config.connections.referenceCatalog = "uw_stars_20240524" config.applyRefCatProperMotion = False -config.referenceFilter = 'lsst_r' +config.referenceFilter = "lsst_r" config.devicePolyOrder = 5 config.exposurePolyOrder = 7 diff --git a/config/convolvedFluxes.py b/config/convolvedFluxes.py index ec8e63754..6322be134 100644 --- a/config/convolvedFluxes.py +++ b/config/convolvedFluxes.py @@ -20,6 +20,7 @@ # the GNU General Public License along with this program. If not, # see . -import lsst.meas.extensions.convolved # noqa: Load flux.convolved algorithm +import lsst.meas.extensions.convolved # noqa: F401 required to use ConvolvedFlux below + config.plugins.names.add("ext_convolved_ConvolvedFlux") config.plugins["ext_convolved_ConvolvedFlux"].seeing.append(8.0) diff --git a/config/findDefects.py b/config/findDefects.py index 7ab41c11b..9f353360c 100644 --- a/config/findDefects.py +++ b/config/findDefects.py @@ -1,4 +1,4 @@ import os.path config.load(os.path.join(os.path.dirname(__file__), "lsstCamCommon.py")) -config.ccdKey = 'detector' +config.ccdKey = "detector" diff --git a/config/forcedPhotCoadd.py b/config/forcedPhotCoadd.py index b4c05f824..66094e393 100644 --- a/config/forcedPhotCoadd.py +++ b/config/forcedPhotCoadd.py @@ -22,8 +22,6 @@ import os.path -from lsst.meas.base import CircularApertureFluxAlgorithm - config.measurement.load(os.path.join(os.path.dirname(__file__), "apertures.py")) config.measurement.load(os.path.join(os.path.dirname(__file__), "kron.py")) config.measurement.load(os.path.join(os.path.dirname(__file__), "convolvedFluxes.py")) @@ -35,6 +33,7 @@ config.catalogCalculation.plugins.names = ["base_ClassificationExtendedness"] config.measurement.slots.psfFlux = "base_PsfFlux" + def doUndeblended(config, algName, fluxList=None): """Activate undeblended measurements of algorithm Parameters diff --git a/config/gaap.py b/config/gaap.py index 6c3a5d261..2c96eccec 100644 --- a/config/gaap.py +++ b/config/gaap.py @@ -20,7 +20,8 @@ # the GNU General Public License along with this program. If not, # see . -import lsst.meas.extensions.gaap # noqa: Load GAaP algorithm +import lsst.meas.extensions.gaap # noqa: F401 required to use GaapFlux below + config.plugins.names.add("ext_gaap_GaapFlux") config.plugins["ext_gaap_GaapFlux"].sigmas = [0.5, 0.7, 1.0, 1.5, 2.5, 3.0] # Enable PSF photometry after PSF-Gaussianization in the `ext_gaap_GaapFlux` plugin diff --git a/config/imsim/analysisToolsPhotometricCatalogMatch.py b/config/imsim/analysisToolsPhotometricCatalogMatch.py index 55ef2d47f..7cc1ca5a8 100644 --- a/config/imsim/analysisToolsPhotometricCatalogMatch.py +++ b/config/imsim/analysisToolsPhotometricCatalogMatch.py @@ -1,5 +1,6 @@ import os.path + configDir = os.path.dirname(__file__) -config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, 'filterMap.py')) +config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py b/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py index 55ef2d47f..7cc1ca5a8 100644 --- a/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py @@ -1,5 +1,6 @@ import os.path + configDir = os.path.dirname(__file__) -config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, 'filterMap.py')) +config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/imsim/calibrate.py b/config/imsim/calibrate.py index 0a0120b37..d0b97d676 100644 --- a/config/imsim/calibrate.py +++ b/config/imsim/calibrate.py @@ -29,8 +29,8 @@ # imSim-specifc reference catalog configuration. config.connections.astromRefCat = "cal_ref_cat" config.connections.photoRefCat = "cal_ref_cat" -config.astromRefObjLoader.load(os.path.join(configDir, 'filterMap.py')) -config.photoRefObjLoader.load(os.path.join(configDir, 'filterMap.py')) +config.astromRefObjLoader.load(os.path.join(configDir, "filterMap.py")) +config.photoRefObjLoader.load(os.path.join(configDir, "filterMap.py")) config.astromRefObjLoader.anyFilterMapsToThis = None # Reduce Chebyshev polynomial order for background fitting (DM-30820) diff --git a/config/imsim/calibrateImage.py b/config/imsim/calibrateImage.py index 324d7c6a7..b65e89c4a 100644 --- a/config/imsim/calibrateImage.py +++ b/config/imsim/calibrateImage.py @@ -18,9 +18,9 @@ config.connections.astrometry_ref_cat = "cal_ref_cat_2_2" config.connections.photometry_ref_cat = "cal_ref_cat_2_2" # Use the ImSim filterMap ("lsst_X_smeared" reference fluxes). -config.astrometry_ref_loader.load(os.path.join(config_dir, 'filterMap.py')) +config.astrometry_ref_loader.load(os.path.join(config_dir, "filterMap.py")) config.astrometry_ref_loader.anyFilterMapsToThis = None -config.photometry_ref_loader.load(os.path.join(config_dir, 'filterMap.py')) +config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py")) # Make sure galaxies from truth catalog are not used for calibration. config.astrometry.referenceSelector.doUnresolved = True diff --git a/config/imsim/filterMap.py b/config/imsim/filterMap.py index ea14edf10..e8a57d7db 100644 --- a/config/imsim/filterMap.py +++ b/config/imsim/filterMap.py @@ -20,4 +20,4 @@ # the GNU General Public License along with this program. If not, # see . -config.filterMap = {band: 'lsst_%s_smeared' % (band) for band in 'ugrizy'} +config.filterMap = {band: "lsst_%s_smeared" % (band) for band in "ugrizy"} diff --git a/config/imsim/isr.py b/config/imsim/isr.py index a93582868..ab0a70d83 100644 --- a/config/imsim/isr.py +++ b/config/imsim/isr.py @@ -22,5 +22,5 @@ """ imsim-specific overrides for IsrTask """ -config.connections.newBFKernel = "bfk" +config.connections.newBFKernel = "bfk" config.doBrighterFatter = True diff --git a/config/kron.py b/config/kron.py index 4e1cc32a2..9313f5100 100644 --- a/config/kron.py +++ b/config/kron.py @@ -20,5 +20,6 @@ # the GNU General Public License along with this program. If not, # see . -import lsst.meas.extensions.photometryKron +import lsst.meas.extensions.photometryKron # noqa: F401 required to use KronFlux below + config.plugins.names |= ["ext_photometryKron_KronFlux"] diff --git a/config/latiss/assembleCoadd.py b/config/latiss/assembleCoadd.py index 80b1bb1c9..dd211724f 100644 --- a/config/latiss/assembleCoadd.py +++ b/config/latiss/assembleCoadd.py @@ -21,13 +21,13 @@ # see . # AuxTel PSF is not stable at this time resulting in many frames being -# rejected by standard psfWcsSelect. Switch to using WcsSelectImagesTask +# rejected by standard psfWcsSelect. Switch to using WcsSelectImagesTask # to avoid rejecting too many frames. import os.path +from lsst.pipe.tasks.selectImages import WcsSelectImagesTask # Load configs shared between assembleCoadd and makeWarp. config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py")) -from lsst.pipe.tasks.selectImages import WcsSelectImagesTask config.select.retarget(WcsSelectImagesTask) diff --git a/config/latiss/associatedSourcesTractAnalysis.py b/config/latiss/associatedSourcesTractAnalysis.py index 5acdb22f5..7cd22e90b 100644 --- a/config/latiss/associatedSourcesTractAnalysis.py +++ b/config/latiss/associatedSourcesTractAnalysis.py @@ -4,4 +4,4 @@ # By default loop over all the same bands that are present in the Object Table objectConfig = TransformObjectCatalogConfig() objectConfig.load(os.path.join(os.path.dirname(__file__), "transformObjectCatalog.py")) -config.bands = objectConfig.outputBands \ No newline at end of file +config.bands = objectConfig.outputBands diff --git a/config/latiss/calibrate.py b/config/latiss/calibrate.py index d4613f9e2..82f4417f1 100644 --- a/config/latiss/calibrate.py +++ b/config/latiss/calibrate.py @@ -14,7 +14,7 @@ colors["g-r"] = ColorLimit(primary="g_flux", secondary="r_flux", minimum=0.4, maximum=2.0) config.photoCal.applyColorTerms = True -config.photoCal.photoCatName="atlas_refcat2_20220201" +config.photoCal.photoCatName = "atlas_refcat2_20220201" config.photoCal.colorterms.load(os.path.join(ObsConfigDir, "colorterms.py")) # We often have very few sources due to smaller aperture so use affine task. @@ -44,8 +44,8 @@ config.astrometry.matcher.maxRotationDeg = 2.0 config.astrometry.sourceFluxType = "Psf" -config.astrometry.sourceSelector['matcher'].sourceFluxType = "Psf" -config.astrometry.sourceSelector['matcher'].minSnr = 10 +config.astrometry.sourceSelector["matcher"].sourceFluxType = "Psf" +config.astrometry.sourceSelector["matcher"].minSnr = 10 config.measurement.plugins["base_Jacobian"].pixelScale = 0.1 @@ -53,5 +53,5 @@ config.measurement.algorithms["base_CompensatedTophatFlux"].apertures = [35] config.normalizedCalibrationFlux.raw_calibflux_name = "base_CompensatedTophatFlux_35" -config.measurement.slots.apFlux='base_CircularApertureFlux_35_0' -config.measurement.slots.calibFlux='base_CircularApertureFlux_35_0' +config.measurement.slots.apFlux = "base_CircularApertureFlux_35_0" +config.measurement.slots.calibFlux = "base_CircularApertureFlux_35_0" diff --git a/config/latiss/calibrateImage.py b/config/latiss/calibrateImage.py index aed56f395..cdd136202 100644 --- a/config/latiss/calibrateImage.py +++ b/config/latiss/calibrateImage.py @@ -20,7 +20,7 @@ config.psf_measure_psf.psfDeterminer["psfex"].stampSize = 71 config.install_simple_psf.width = 21 -config.install_simple_psf.fwhm = 2.355*2 # LATISS plate scale is 2x LSST nominal +config.install_simple_psf.fwhm = 2.355 * 2 # LATISS plate scale is 2x LSST nominal # Turn off S/N cut for aperture correction measurement source selection # (it now only includes calib_psf_used objects, and that cut is "good @@ -36,7 +36,7 @@ colors["g-r"] = ColorLimit(primary="g_flux", secondary="r_flux", minimum=0.4, maximum=2.0) config.photometry.applyColorTerms = True -config.photometry.photoCatName="atlas_refcat2_20220201" +config.photometry.photoCatName = "atlas_refcat2_20220201" config.photometry.colorterms.load(os.path.join(config_dir, "colorterms.py")) # Note that the following two config values were validated on data taken in @@ -64,5 +64,5 @@ # Set the default aperture as appropriate for the LATISS plate scale. config.star_measurement.plugins["base_CircularApertureFlux"].radii = [35.0] -config.star_measurement.slots.apFlux = 'base_CircularApertureFlux_35_0' -config.star_measurement.slots.calibFlux = 'base_CircularApertureFlux_35_0' +config.star_measurement.slots.apFlux = "base_CircularApertureFlux_35_0" +config.star_measurement.slots.calibFlux = "base_CircularApertureFlux_35_0" diff --git a/config/latiss/characterizeImage.py b/config/latiss/characterizeImage.py index f40f880f8..cffde3f5e 100644 --- a/config/latiss/characterizeImage.py +++ b/config/latiss/characterizeImage.py @@ -20,7 +20,7 @@ config.measurePsf.psfDeterminer["psfex"].stampSize = 71 config.installSimplePsf.width = 21 -config.installSimplePsf.fwhm = 2.355*2 # LATISS plate scale is 2x LSST nominal +config.installSimplePsf.fwhm = 2.355 * 2 # LATISS plate scale is 2x LSST nominal # Turn off S/N cut for aperture correction measurement source selection # (it now only includes calib_psf_used objects, and that cut is "good @@ -36,7 +36,11 @@ # As above, turn off S/N cut for aperture correction source selection. config.normalizedCalibrationFlux.measure_ap_corr.sourceSelector["science"].doSignalToNoise = False # Put in the correct override fields in case we revisit this in the future. -config.normalizedCalibrationFlux.measure_ap_corr.sourceSelector["science"].signalToNoise.fluxField = "base_CompensatedTophatFlux_35_instFlux" -config.normalizedCalibrationFlux.measure_ap_corr.sourceSelector["science"].signalToNoise.errField = "base_CompensatedTophatFlux_35_instFluxErr" +config.normalizedCalibrationFlux.measure_ap_corr.sourceSelector[ + "science" +].signalToNoise.fluxField = "base_CompensatedTophatFlux_35_instFlux" +config.normalizedCalibrationFlux.measure_ap_corr.sourceSelector[ + "science" +].signalToNoise.errField = "base_CompensatedTophatFlux_35_instFluxErr" config.measurement.slots.apFlux = "base_CircularApertureFlux_35_0" config.measurement.slots.calibFlux = "base_CircularApertureFlux_35_0" diff --git a/config/latiss/coaddBase.py b/config/latiss/coaddBase.py index f9cb2f366..7c5b08f58 100644 --- a/config/latiss/coaddBase.py +++ b/config/latiss/coaddBase.py @@ -25,4 +25,3 @@ # These configs are for skymaps of pixel scale 0.1 # TO DO: Delete the below if we go a 0.2 pixel scale. config.matchingKernelSize = 43 - diff --git a/config/latiss/compareWarpAssembleCoadd.py b/config/latiss/compareWarpAssembleCoadd.py index 5b715c43f..aea99f279 100644 --- a/config/latiss/compareWarpAssembleCoadd.py +++ b/config/latiss/compareWarpAssembleCoadd.py @@ -24,4 +24,3 @@ # Load configs from base assembleCoadd config.load(os.path.join(os.path.dirname(__file__), "assembleCoadd.py")) - diff --git a/config/latiss/fgcmBuildFromIsolatedStars.py b/config/latiss/fgcmBuildFromIsolatedStars.py index 2e49001cc..aff7e590b 100644 --- a/config/latiss/fgcmBuildFromIsolatedStars.py +++ b/config/latiss/fgcmBuildFromIsolatedStars.py @@ -10,15 +10,15 @@ config.minPerBand = 2 config.connections.ref_cat = "atlas_refcat2_20220201" -config.apertureInnerInstFluxField="apFlux_35_0_instFlux" -config.apertureOuterInstFluxField="apFlux_50_0_instFlux" +config.apertureInnerInstFluxField = "apFlux_35_0_instFlux" +config.apertureOuterInstFluxField = "apFlux_50_0_instFlux" configDir = os.path.join(os.path.dirname(__file__)) config.physicalFilterMap = LATISS_FILTER_DEFINITIONS.physical_to_band config.doSubtractLocalBackground = False config.fgcmLoadReferenceCatalog.load(os.path.join(configDir, "filterMap.py")) config.fgcmLoadReferenceCatalog.applyColorTerms = True -config.fgcmLoadReferenceCatalog.colorterms.load(os.path.join(configDir, 'colorterms.py')) +config.fgcmLoadReferenceCatalog.colorterms.load(os.path.join(configDir, "colorterms.py")) config.fgcmLoadReferenceCatalog.referenceSelector.doSignalToNoise = True config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.fluxField = "i_flux" config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.errField = "i_fluxErr" diff --git a/config/latiss/fgcmFitCycle.py b/config/latiss/fgcmFitCycle.py index fee9930d3..9613f6d2d 100644 --- a/config/latiss/fgcmFitCycle.py +++ b/config/latiss/fgcmFitCycle.py @@ -29,7 +29,7 @@ config.maxIterBeforeFinalCycle = 100 config.minCcdPerExp = 1 config.utBoundary = 0.0 -config.washMjds = (0.0, ) +config.washMjds = (0.0,) # For now, define 1 observing epoch that encompasses everything. config.epochMjds = (0.0, 100000.0) config.coatingMjds = [] diff --git a/config/latiss/fgcmMakeLut.py b/config/latiss/fgcmMakeLut.py index 67c1fcf88..5edfcdda3 100644 --- a/config/latiss/fgcmMakeLut.py +++ b/config/latiss/fgcmMakeLut.py @@ -19,4 +19,4 @@ "empty~SDSSy_65mm": "SDSSy_65mm~empty"} # FGCM name or filename of precomputed atmospheres -config.atmosphereTableName = 'fgcm_atm_lsst2' +config.atmosphereTableName = "fgcm_atm_lsst2" diff --git a/config/latiss/fgcmOutputProducts.py b/config/latiss/fgcmOutputProducts.py index bdd9d1ffb..1aa7c8bcc 100644 --- a/config/latiss/fgcmOutputProducts.py +++ b/config/latiss/fgcmOutputProducts.py @@ -1,4 +1,5 @@ +from lsst.obs.lsst.filters import LATISS_FILTER_DEFINITIONS + config.connections.cycleNumber = 6 -from lsst.obs.lsst.filters import LATISS_FILTER_DEFINITIONS config.physicalFilterMap = LATISS_FILTER_DEFINITIONS.physical_to_band diff --git a/config/latiss/filterMap.py b/config/latiss/filterMap.py index 2a9fad3fc..af53db707 100644 --- a/config/latiss/filterMap.py +++ b/config/latiss/filterMap.py @@ -2,14 +2,14 @@ # This file is appropriate for ATLAS Refcat2. for source, target in [ - ("SDSSg_65mm~empty", "g"), - ("SDSSr_65mm~empty", "r"), - ("SDSSi_65mm~empty", "i"), - ("empty~SDSSi_65mm", "i"), - ("SDSSz_65mm~empty", "z"), - # ATLAS Refcat2 does not have y band. - ("SDSSy_65mm~empty", "z"), - ("empty~SDSSy_65mm", "z"), - ("y", "z"), - ]: + ("SDSSg_65mm~empty", "g"), + ("SDSSr_65mm~empty", "r"), + ("SDSSi_65mm~empty", "i"), + ("empty~SDSSi_65mm", "i"), + ("SDSSz_65mm~empty", "z"), + # ATLAS Refcat2 does not have y band. + ("SDSSy_65mm~empty", "z"), + ("empty~SDSSy_65mm", "z"), + ("y", "z"), +]: config.filterMap[source] = target diff --git a/config/latiss/finalize_characterization.py b/config/latiss/finalize_characterization.py index ea61f1c17..268b64e3f 100644 --- a/config/latiss/finalize_characterization.py +++ b/config/latiss/finalize_characterization.py @@ -1,6 +1,6 @@ # Change the PSF determiner to psfex from piff default as the latter will not # scale well to the large kernel/stamp sizes for PSF modeling for LATISS data. -import lsst.meas.extensions.psfex.psfexPsfDeterminer +import lsst.meas.extensions.psfex.psfexPsfDeterminer # noqa: F401 required to use psfex below config.psf_determiner.name = "psfex" # Reduce spatialOrder to 1, this helps ensure success with low numbers of psf candidates. diff --git a/config/latiss/isolatedStarAssociation.py b/config/latiss/isolatedStarAssociation.py index 050e99e10..33c2a1e0c 100644 --- a/config/latiss/isolatedStarAssociation.py +++ b/config/latiss/isolatedStarAssociation.py @@ -1,18 +1,18 @@ # Override calibration apertures as appropriate for LATISS plate scale. config.extra_columns = [ - 'x', - 'y', - 'xErr', - 'yErr', - 'apFlux_35_0_instFlux', - 'apFlux_35_0_instFluxErr', - 'apFlux_35_0_flag', - 'apFlux_50_0_instFlux', - 'apFlux_50_0_instFluxErr', - 'apFlux_50_0_flag', - 'localBackground_instFlux', - 'localBackground_flag', - 'ixx', - 'iyy', - 'ixy', + "x", + "y", + "xErr", + "yErr", + "apFlux_35_0_instFlux", + "apFlux_35_0_instFluxErr", + "apFlux_35_0_flag", + "apFlux_50_0_instFlux", + "apFlux_50_0_instFluxErr", + "apFlux_50_0_flag", + "localBackground_instFlux", + "localBackground_flag", + "ixx", + "iyy", + "ixy", ] diff --git a/config/latiss/isr.py b/config/latiss/isr.py index 6772023df..efc836058 100644 --- a/config/latiss/isr.py +++ b/config/latiss/isr.py @@ -22,9 +22,9 @@ """ latiss-specific overrides for IsrTask """ -config.doCrosstalk=True -config.doDefect=True -config.overscan.fitType="MEDIAN_PER_ROW" -config.overscan.doParallelOverscan=True -config.cameraKeywordsToCompare=["SEQNAME", "SEQFILE", "SEQCKSUM", "ODP", "AP0_RC", "TEMP_SET"] +config.doCrosstalk = True +config.doDefect = True +config.overscan.fitType = "MEDIAN_PER_ROW" +config.overscan.doParallelOverscan = True +config.cameraKeywordsToCompare = ["SEQNAME", "SEQFILE", "SEQCKSUM", "ODP", "AP0_RC", "TEMP_SET"] config.saturation = 120000 diff --git a/config/latiss/latiss.py b/config/latiss/latiss.py index 5646f90d6..5acc8bd1f 100644 --- a/config/latiss/latiss.py +++ b/config/latiss/latiss.py @@ -23,8 +23,8 @@ # see . # -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'detectorName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "detectorName"] config.isr.doDefect = True config.isr.doLinearize = False diff --git a/config/latiss/makeWarp.py b/config/latiss/makeWarp.py index 1fe8f5c10..0f4407122 100644 --- a/config/latiss/makeWarp.py +++ b/config/latiss/makeWarp.py @@ -52,10 +52,10 @@ # TO DO: Change this to 9.5 if we go to 0.2 pixel scale. config.modelPsf.defaultFwhm = 19.0 -config.warpAndPsfMatch.psfMatch.kernel['AL'].kernelSize = config.matchingKernelSize +config.warpAndPsfMatch.psfMatch.kernel["AL"].kernelSize = config.matchingKernelSize # These configs are for skymaps of pixel scale 0.1 # TO DO: Delete these 3 if we go a 0.2 pixel scale -config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.5, 3.0, 6.0] -config.warpAndPsfMatch.psfMatch.kernel['AL'].sizeCellX = 256 -config.warpAndPsfMatch.psfMatch.kernel['AL'].sizeCellY = 256 +config.warpAndPsfMatch.psfMatch.kernel["AL"].alardSigGauss = [1.5, 3.0, 6.0] +config.warpAndPsfMatch.psfMatch.kernel["AL"].sizeCellX = 256 +config.warpAndPsfMatch.psfMatch.kernel["AL"].sizeCellY = 256 diff --git a/config/latiss/processStar.py b/config/latiss/processStar.py index 2ed7b6b3b..7d536dad1 100644 --- a/config/latiss/processStar.py +++ b/config/latiss/processStar.py @@ -4,8 +4,8 @@ # Configuration for processStarTask -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'detectorName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "detectorName"] config.isr.doLinearize = False diff --git a/config/latiss/ptcIsr.py b/config/latiss/ptcIsr.py index 90aeb06ea..b9fc7dbd9 100644 --- a/config/latiss/ptcIsr.py +++ b/config/latiss/ptcIsr.py @@ -1,5 +1,3 @@ -import os.path - config.isr.doFlat = False config.isr.doFringe = False config.isr.doCrosstalk = False diff --git a/config/latiss/transformObjectCatalog.py b/config/latiss/transformObjectCatalog.py index 68f42ce4a..885574f58 100644 --- a/config/latiss/transformObjectCatalog.py +++ b/config/latiss/transformObjectCatalog.py @@ -1,3 +1,3 @@ # Always produce these output bands in the Parquet coadd tables, no matter # what bands are in the input. -config.outputBands = ["g", "r", "i"] \ No newline at end of file +config.outputBands = ["g", "r", "i"] diff --git a/config/lsstCamCommon.py b/config/lsstCamCommon.py index bc5bbebf4..3e3397a70 100644 --- a/config/lsstCamCommon.py +++ b/config/lsstCamCommon.py @@ -23,8 +23,8 @@ """ LSST Cam generic settings """ -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'snap', 'raftName', 'detectorName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "snap", "raftName", "detectorName"] -if hasattr(config, 'visitKeys'): +if hasattr(config, "visitKeys"): config.visitKeys = ["expId"] diff --git a/config/makeBrighterFatterKernel.py b/config/makeBrighterFatterKernel.py index 1f867742b..be5c55046 100644 --- a/config/makeBrighterFatterKernel.py +++ b/config/makeBrighterFatterKernel.py @@ -21,7 +21,7 @@ # see . config.isr.doFlat = False # mandatory for this task -config.ccdKey = 'detector' +config.ccdKey = "detector" # to be re-examined once more calibration products are available config.isr.doBias = False diff --git a/config/makeSkyMap.py b/config/makeSkyMap.py index 94825994a..62404576f 100644 --- a/config/makeSkyMap.py +++ b/config/makeSkyMap.py @@ -23,5 +23,5 @@ config.skyMap.name = "rings" config.skyMap["rings"].numRings = 120 config.skyMap["rings"].projection = "TAN" -config.skyMap["rings"].tractOverlap = 1.0/60 # Overlap between tracts (degrees) +config.skyMap["rings"].tractOverlap = 1.0 / 60 # Overlap between tracts (degrees) config.skyMap["rings"].pixelScale = 0.2 diff --git a/config/makeWarp.py b/config/makeWarp.py index 727c28943..fcf7f4d32 100644 --- a/config/makeWarp.py +++ b/config/makeWarp.py @@ -26,8 +26,8 @@ config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py")) config.makePsfMatched = True -config.warpAndPsfMatch.psfMatch.kernel['AL'].kernelSize = config.matchingKernelSize -config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5] +config.warpAndPsfMatch.psfMatch.kernel["AL"].kernelSize = config.matchingKernelSize +config.warpAndPsfMatch.psfMatch.kernel["AL"].alardSigGauss = [1.0, 2.0, 4.5] config.modelPsf.defaultFwhm = 7.7 # FUTURE: Set to True when we have sky background estimate diff --git a/config/measurePhotonTransferCurve.py b/config/measurePhotonTransferCurve.py index 7ab41c11b..9f353360c 100644 --- a/config/measurePhotonTransferCurve.py +++ b/config/measurePhotonTransferCurve.py @@ -1,4 +1,4 @@ import os.path config.load(os.path.join(os.path.dirname(__file__), "lsstCamCommon.py")) -config.ccdKey = 'detector' +config.ccdKey = "detector" diff --git a/config/mergeCoaddDetections.py b/config/mergeCoaddDetections.py index 8014982b2..869c8e37c 100644 --- a/config/mergeCoaddDetections.py +++ b/config/mergeCoaddDetections.py @@ -1,4 +1,5 @@ import os.path + # Gen3 mergeDetections will supersede mergeCoaddDetections # Keep in sync in the meantime config.load(os.path.join(os.path.dirname(__file__), "mergeDetections.py")) diff --git a/config/mergeCoaddMeasurements.py b/config/mergeCoaddMeasurements.py index bad4bf4ee..d5bac5426 100644 --- a/config/mergeCoaddMeasurements.py +++ b/config/mergeCoaddMeasurements.py @@ -1,4 +1,5 @@ import os.path + # Gen3 mergeMeasurements will supersede mergeCoaddMeasurements # Keep in sync in the meantime config.load(os.path.join(os.path.dirname(__file__), "mergeMeasurements.py")) diff --git a/config/phosim/calibrate.py b/config/phosim/calibrate.py index 40bfbb4e8..aeeee629d 100644 --- a/config/phosim/calibrate.py +++ b/config/phosim/calibrate.py @@ -24,6 +24,6 @@ """ # Additional configs for star+galaxy ref cats post DM-17917 config.astrometry.referenceSelector.doUnresolved = True -config.astrometry.referenceSelector.unresolved.name = 'resolved' +config.astrometry.referenceSelector.unresolved.name = "resolved" config.astrometry.referenceSelector.unresolved.minimum = None -config.astrometry.referenceSelector.unresolved.maximum = 0.5 \ No newline at end of file +config.astrometry.referenceSelector.unresolved.maximum = 0.5 diff --git a/config/phosim/isr.py b/config/phosim/isr.py index 23e516004..39299a380 100644 --- a/config/phosim/isr.py +++ b/config/phosim/isr.py @@ -22,4 +22,4 @@ """ phosim-specific overrides for IsrTask """ -config.doCrosstalk=True \ No newline at end of file +config.doCrosstalk = True diff --git a/config/phosim/measureCrosstalk.py b/config/phosim/measureCrosstalk.py index ae8d1ddbc..2ccf7eff3 100644 --- a/config/phosim/measureCrosstalk.py +++ b/config/phosim/measureCrosstalk.py @@ -22,4 +22,4 @@ config.isr.doLinearize = False config.isr.doDefect = False -config.isr.doCrosstalk=False +config.isr.doCrosstalk = False diff --git a/config/ts3/ts3.py b/config/ts3/ts3.py index 6172819c3..fe4682db7 100644 --- a/config/ts3/ts3.py +++ b/config/ts3/ts3.py @@ -22,9 +22,9 @@ # the GNU General Public License along with this program. If not, # see . -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'detectorName', 'raftName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "detectorName", "raftName"] config.isr.doLinearize = False config.isr.doDefect = False -config.isr.doCrosstalk=False +config.isr.doCrosstalk = False diff --git a/config/ts8/ts8.py b/config/ts8/ts8.py index ecc4e2e6c..fa7aaab02 100644 --- a/config/ts8/ts8.py +++ b/config/ts8/ts8.py @@ -22,9 +22,9 @@ # the GNU General Public License along with this program. If not, # see . -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'detectorName', 'raftName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "detectorName", "raftName"] config.isr.doLinearize = False config.isr.doDefect = False -config.isr.doCrosstalk=False +config.isr.doCrosstalk = False diff --git a/config/ucd/ucd.py b/config/ucd/ucd.py index e9195c5fd..a6cb23f3a 100644 --- a/config/ucd/ucd.py +++ b/config/ucd/ucd.py @@ -1,8 +1,8 @@ # Configuration for UCD -if hasattr(config, 'ccdKeys'): - config.ccdKeys = ['detector', 'detectorName'] +if hasattr(config, "ccdKeys"): + config.ccdKeys = ["detector", "detectorName"] config.isr.doLinearize = False config.isr.doDefect = False -config.isr.doCrosstalk=True +config.isr.doCrosstalk = True