Merge pull request #27 from lsst/tickets/DM-24738

DM-24738: Add background offset tracking to fgcmcal

fgcm/__init__.py

@@ -40,3 +40,4 @@
 from .fgcmMirrorChromaticity import FgcmMirrorChromaticity
 from .fgcmZpsToApply import FgcmZpsToApply
 from .fgcmApplyZeropoints import FgcmApplyZeropoints
+from .fgcmDeltaAper import FgcmDeltaAper

fgcm/_version.py

@@ -1,3 +1,3 @@
-__version__ = '3.7.0'
+__version__ = '3.8.4'
 
 __version_info__ = __version__.split('.')

fgcm/fgcmApplyZeropoints.py

@@ -10,6 +10,8 @@
 from .fgcmStars import FgcmStars
 from .fgcmLUT import FgcmLUT
 from .fgcmZpsToApply import FgcmZpsToApply
+from .fgcmDeltaAper import FgcmDeltaAper
+from .fgcmUtilities import FocalPlaneProjectorFromOffsets
 
 from .fgcmUtilities import getMemoryString, expFlagDict, obsFlagDict
 
@@ -149,6 +151,10 @@ def run(self):
         if (not self.setupComplete):
             raise RuntimeError("Must complete applyZeropoints setup first!")
 
+        # Compute signs for CCD offsets if necessary
+        if isinstance(self.fgcmConfig.focalPlaneProjector, FocalPlaneProjectorFromOffsets):
+            self.fgcmConfig.focalPlaneProjector.computeCCDOffsetSigns(self.fgcmStars)
+
         if self.fgcmStars.hasDeltaMagBkg:
             self.fgcmStars.applyDeltaMagBkg()
 
@@ -202,6 +208,25 @@ def run(self):
         #  and with error modeling.
         self.fgcmZpsToApply.applyZeropoints()
 
+        if self.fgcmStars.hasDeltaAper:
+            self.fgcmDeltaAper = FgcmDeltaAper(self.fgcmConfig, self.fgcmPars,
+                                               self.fgcmStars)
+            if self.fgcmConfig.doComputeDeltaAperExposures:
+                self.fgcmDeltaAper.computeDeltaAperExposures()
+            if self.fgcmConfig.doComputeDeltaAperStars:
+                self.fgcmDeltaAper.computeDeltaAperStars()
+                if self.fgcmConfig.doComputeDeltaAperMap:
+                    self.fgcmDeltaAper.computeEpsilonMap()
+            if self.fgcmConfig.doComputeDeltaAperPerCcd:
+                self.fgcmDeltaAper.computeEpsilonPerCcd()
+
+            if self.useFits:
+                outParFile = '%s/%s_applied_parameters.fits' % (self.fgcmConfig.outputPath,
+                                                                self.fgcmConfig.outfileBaseWithCycle)
+                self.fgcmPars.saveParsFits(outParFile)
+
+
+
         # Output the stars.
         if self.fgcmConfig.outputStars:
             outStarFile = '%s/%s_stdstars.fits' % (self.fgcmConfig.outputPath,

fgcm/fgcmConfig.py

@@ -169,6 +169,7 @@ class FgcmConfig(object):
     sigmaCalFitPercentile = ConfigField(list, default=[0.05, 0.15], length=2)
     sigmaCalPlotPercentile = ConfigField(list, default=[0.05, 0.95], length=2)
     sigma0Phot = ConfigField(float, default=0.003)
+    defaultTelRot = ConfigField(float, default=0.0)
     logLevel = ConfigField(str, default='INFO')
     quietMode = ConfigField(bool, default=False)
     useRepeatabilityForExpGrayCutsDict = ConfigField(dict, default={})
@@ -217,6 +218,18 @@ class FgcmConfig(object):
     saveParsForDebugging = ConfigField(bool, default=False)
     doPlots = ConfigField(bool, default=True)
 
+    deltaAperFitMinNgoodObs = ConfigField(int, default=2)
+    deltaAperFitPerCcdNx = ConfigField(int, default=8)
+    deltaAperFitPerCcdNy = ConfigField(int, default=16)
+    deltaAperFitSpatialNside = ConfigField(int, default=64)
+    deltaAperFitSpatialMinStar = ConfigField(int, default=500)
+    deltaAperInnerRadiusArcsec = ConfigField(float, default=0.0)
+    deltaAperOuterRadiusArcsec = ConfigField(float, default=0.0)
+    doComputeDeltaAperExposures = ConfigField(bool, default=False)
+    doComputeDeltaAperStars = ConfigField(bool, default=True)
+    doComputeDeltaAperMap = ConfigField(bool, default=False)
+    doComputeDeltaAperPerCcd = ConfigField(bool, default=False)
+
     pwvFile = ConfigField(str, required=False)
     externalPwvDeltaT = ConfigField(float, default=0.1)
     tauFile = ConfigField(str, required=False)