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

Timestamp:

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

Author:

watersc1

Message:

DetEff/ detectionThreshold/ nInjected fixes.

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -372 +372 @@
         sqlLine = sqlUtility("INSERT INTO " + tableName + "(")
 
+        nInjected = int(self.getKeyInt(header, 0, 'DETEFF.NUM'))
+        detectionThreshold = self.getKeyFloat(header, "%.8f", 'DETEFF.MAGREF')
+        expTime = self.getKeyFloat(header, "%.8f", 'EXPTIME')
+        zp      = self.getKeyFloat(header, "%.8f", 'ZPT_OBS')
+
+        zpImage = self.scratchDb.getImageZeroPoint(self.imageIDs[ota])
+
+        # XXX zp correction should come from DVO
+        detectionThreshold = detectionThreshold + zpImage + 2.5 * math.log10(expTime)
+
+
         sqlLine.group("frameID",          str(self.expID))
-        sqlLine.group("magref",           self.getKeyFloat(header,"%.8f","DETEFF.MAGREF"))
+        sqlLine.group("magref",           detectionThreshold)
+        sqlLine.group("nInjected",        nInjected)
         sql = sqlLine.make(") VALUES ( ", ")")
                       
@@ -1063 +1075 @@
         ## regex only works for -stilts import
         regex = ".*"
-    
+        
         ## for a quick test, just do the first chip:
         if self.config.test and self.config.camera == "gpc1":