Merge branch 'tickets/DM-31861'

lsst · Sep 22, 2021 · 14664d4 · 14664d4
2 parents 93fdf36 + 4c1e27f
commit 14664d4
Showing 1 changed file with 32 additions and 3 deletions.
diff --git a/pipelines/DRP.yaml b/pipelines/DRP.yaml
@@ -21,9 +21,38 @@ tasks:
       doPhotometry: false
       applyColorTerms: false
       python: |
-        # This override is temporary until DM-29008.
-        from lsst.utils import getPackageDir
-        config.load(os.path.join(getPackageDir("jointcal"), "tests", "config", "config-gen3.py"))
+        # These overrides were copied from the tests/config/config-gen3.yaml file
+        # on 22 Sept 2021.  This is necessary for processing in containers to succeed
+        # because the build system strips out the test directories for space concerns.
+        #
+        # TODO DM-29008: When that ticket is merged these overrides will no longer
+        # be needed at all since that will fix higher level issues with how config
+        # overrides are imported in general.
+        config.sourceSelector['science'].flags.bad = ['PixelFlags_edge',
+                                                      'PixelFlags_saturated',
+                                                      'PixelFlags_interpolatedCenter',
+                                                      'PixelFlags_interpolated',
+                                                      'PixelFlags_crCenter',
+                                                      'PixelFlags_bad',
+                                                      'HsmPsfMoments_flag',
+                                                      'ApFlux_12_0_flag',
+                                                     ]
+        config.sourceSelector['science'].doUnresolved = False
+        config.sourceSelector['science'].signalToNoise.fluxField = 'ApFlux_12_0_instFlux'
+        config.sourceSelector['science'].signalToNoise.errField = 'ApFlux_12_0_instFluxErr'
+        config.sourceSelector['science'].isolated.parentName = 'parentSourceId'
+        config.sourceSelector['science'].isolated.nChildName = 'Deblend_nChild'
+        config.sourceFluxType = "ApFlux_12_0"
+
+        # TODO DM-27843: workaround for gen3 not supporting anyFilterMapsToThis
+        config.astrometryRefObjLoader.filterMap = {'g': 'phot_g_mean',
+                                                   'r': 'phot_g_mean',
+                                                   'i': 'phot_g_mean',
+                                                   'z': 'phot_g_mean',
+                                                   'y': 'phot_g_mean',
+                                                   'N921': 'phot_g_mean',
+                                                  }
+        config.astrometryRefObjLoader.anyFilterMapsToThis = None
   # The FGCM configurations below are appropriate specifically for RC2; like
   # the jointcal information above, this is the least-bad place for it, because
   # Gen3 HSC is unlikely to mean anything other than RC2 until we have a new