Add dcrModel support

lsst · May 8, 2017 · ef7c85f · ef7c85f
1 parent fc2e7f0
commit ef7c85f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/policy/DecamMapper.paf b/policy/DecamMapper.paf
@@ -86,6 +86,10 @@ exposures: {
     deepCoadd_tempExp: {
         template:    "deepCoadd/%(filter)s/%(tract)d/%(patch)stempExp/v%(visit)d-f%(filter)s.fits"
     }
+
+    dcrCoadd_tempExp: {
+        template:    "dcrCoadd/%(filter)s/%(tract)d/%(patch)stempExp/v%(visit)d-f%(filter)s%(subfilter)s.fits"
+    }
     deepDiff_differenceExp: {
         template:      "deepDiff/v%(visit)d/diffexp-%(ccdnum)02d.fits"
     }
@@ -298,4 +302,19 @@ datasets: {
         tables:        raw  
         tables:        raw_visit
     } 
+    dcrCoadd_measMatch: {
+        template:      "dcrCoadd-results/%(filter)s%(subfilter)s/%(tract)d/%(patch)s/srcMatch-%(filter)s%(subfilter)s-%(tract)d-%(patch)s.fits"
+    }
+    dcrCoadd_measMatchFull: {
+        template:      "dcrCoadd-results/%(filter)s%(subfilter)s/%(tract)d/%(patch)s/srcMatchFull-%(filter)s%(subfilter)s-%(tract)d-%(patch)s.fits"
+    }
+    dcrCoadd_forced_src: {
+        template:      "dcrCoadd-results/%(filter)s/%(tract)d/%(patch)s/forced-%(filter)s-%(tract)d-%(patch)s.fits"
+    }
+    dcrCoadd_forced_config: {
+        template:      "config/dcrCoadd_forced.py"
+    }
+    dcrCoadd_forced_metadata: {
+        template:      "dcrCoadd_forced_metadata/%(filter)s/%(tract)d/%(patch)s.boost"
+    }
 }
diff --git a/python/lsst/obs/decam/decamMapper.py b/python/lsst/obs/decam/decamMapper.py
@@ -145,6 +145,18 @@ def bypass_deepMergedCoaddId(self, datasetType, pythonType, location, dataId):
     def bypass_deepMergedCoaddId_bits(self, *args, **kwargs):
         return 64 - DecamMapper._nbit_id
 
+    def bypass_dcrCoaddId(self, datasetType, pythonType, location, dataId):
+        return self._computeCoaddExposureId(dataId, True)
+
+    def bypass_dcrCoaddId_bits(self, *args, **kwargs):
+        return 64 - DecamMapper._nbit_id
+
+    def bypass_dcrMergedCoaddId(self, datasetType, pythonType, location, dataId):
+        return self._computeCoaddExposureId(dataId, False)
+
+    def bypass_dcrMergedCoaddId_bits(self, *args, **kwargs):
+        return 64 - DecamMapper._nbit_id
+
     def translate_dqmask(self, dqmask):
         # TODO: make a class member variable that knows the mappings
         # below instead of hard-coding them