Changeset 39103 for trunk/ippToPsps/jython/diffbatch.py

Timestamp:

Nov 11, 2015, 11:08:06 AM (11 years ago)

Author:

eugene

Message:

use Ohana / fhead to read headers (ex PHU) so we avoid seek problems, etc; merge reading of exptime, zp, zperr, ninjected, magerf into the init methods of diff and stack batches

File:

• trunk/ippToPsps/jython/diffbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -77 +77 @@
        self.md5sum = {}
        self.expTime = {}
+       self.zpImage = {}
+       self.magref = {}
+       self.nInjected = {}
        self.obsTime = {}
        self.posFits = {}
@@ -150 +153 @@
            self.obsTime[num] = float(self.header[num]['MJD-OBS']) + (float(self.expTime[num]) / 172800.0)
 
+           # grap zpImage from the PHU header
+           self.zpImage[num] = self.getKeyFloat(self.header[num],"%.8f","FPA.ZP")
+
+           deteffHeader = self.posFits[num].findAndReadHeader("SkyChip.deteff", self.config.test)
+           if not deteffHeader:
+               if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
+               return False
+
+           # grab the detection threshold reference magnitude
+           self.magref[num] = self.getKeyFloat(deteffHeader, "%.8f", "DETEFF.MAGREF")
+
+           self.nInjected[num] = self.getKeyInt(deteffHeader, 0, 'DETEFF.NUM')
+
+           # self.logger.infoPair("Found zeropoint and set magref", str(magref))
+
            tessName = self.tessName[num]
            self.logger.infoPair("TessName ", tessName)
@@ -225 +243 @@
 
         # Convert detectionThreshold to appropriate magnitudes
-        detectionThreshold = self.getKeyFloat(header, "%.8f", 'DETEFF.MAGREF')
-        zpImage            = self.getKeyFloat(header, "%.8f", 'FPA.ZP')
-           
-        detectionThreshold = detectionThreshold + zpImage + 2.5 * math.log10(float(self.expTime[num]))
+        # we have read these values from the appropriate locations in init()
+        zpImage = float(self.zpImage[num])
+        expTime = float(self.expTime[num])
+        magref  = float(self.magref[num])
+
+        detectionThreshold = magref + zpImage + 2.5 * math.log10(expTime)
 
         sql = "CREATE TABLE DiffMeta_"+str(num)+" like DiffMeta"
@@ -506 +526 @@
         self.logger.infoPair("Created tmp table:", ippTableName)
 
-        header = self.header[num]
-        zpImage = self.getKeyFloat(header,"%.8f","FPA.ZP")
-        expTime = self.getKeyFloat(header, "%.8f", 'EXPTIME')
-
-        if zpImage == 0.0:
-            self.logger.infoPair("CZW If this value for the zeropoint is zero, the getImageZeroPoint call is likely still broken", str(zpImage))
-
-# CZW 20151110 This is broken due to findAndReadHeader being broken.
-#        deteffHeader = self.posFits[num].findAndReadHeader("SkyChip.deteff", self.config.test)
-#        if not deteffHeader:
-#            if self.config.test: self.logger.errorPair("No header found for Skychip.deteff for", filter)
-#            return False
-# This next line is a work around.
-        
-        deteffHeader = header
-        magref = self.getKeyFloat(deteffHeader,"%.8f","DETEFF.MAGREF") + zpImage + 2.5 * math.log10(expTime)
-        self.logger.infoPair("Found zeropoint and set magref", str(magref))
-
-        nInjected = int(self.getKeyInt(deteffHeader, 0, 'DETEFF.NUM'))
-        
+        # we have read these values from the appropriate locations in init()
+        zpImage = float(self.zpImage[num])
+        expTime = float(self.expTime[num])
+        magref  = float(self.magref[num])
+
+        detectionThreshold = magref + zpImage + 2.5 * math.log10(expTime)
+
+        nInjected = int(self.nInjected[num])
 
         sqlLine = sqlUtility("INSERT INTO " + ippTableName + "(")
         sqlLine.group("diffImageID", str(diffSkyFileID))
-        sqlLine.group("magref",       magref)
+        sqlLine.group("magref",       detectionThreshold)
         sqlLine.group("nInjected",    nInjected)
         sql = sqlLine.make(") VALUES ( ", ")")
@@ -574 +582 @@
         self.scratchDb.makeColumnPrimaryKey("DiffDetection", "ippDetectID")
 
-        #self.populateDiffMeta()
-     
         # dictionary objects to hold imageIDs for later
         self.imageIDs = {}