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

Timestamp:

Nov 10, 2015, 3:09:38 PM (11 years ago)

Author:

watersc1

Message:

DetEff/ detectionThreshold/ nInjected fixes.

File:

• trunk/ippToPsps/jython/diffbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/diffbatch.py

@@ -507 +507 @@
         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))
 
-        magref = self.getKeyFloat(header,"%.8f","DETEFF.MAGREF") + zpImage
+
+        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
+
+        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'))
+        
 
         sqlLine = sqlUtility("INSERT INTO " + ippTableName + "(")
         sqlLine.group("diffImageID", str(diffSkyFileID))
         sqlLine.group("magref",       magref)
+        sqlLine.group("nInjected",    nInjected)
         sql = sqlLine.make(") VALUES ( ", ")")