Changeset 38802 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Oct 6, 2015, 4:13:12 PM (11 years ago)

Author:

eugene

Message:

fix typo in var name expTimeString; set expTimeString in stackbatch.py

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (6 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -361 +361 @@
                 raise
 
-            # insert values coming from the CMF, not carried by DVO
-            header = self.headerSet[filter]
-            exptime = self.getKeyFloat(header, "%.5f", "EXPTIME")
-
             sqlLine = sqlUtility("UPDATE StackObjectThin AS a , " + filter + "SkyChip_psf AS b SET")
 
@@ -424 +420 @@
             header = self.headerSet[filter]
             exptime = self.getKeyFloat(header, "%.5f", "EXPTIME")
+            expTimeString = str(exptime)
 
             # insert all the detections
@@ -447 +444 @@
             sqlLine.group("a."+filter+"momentR1",      "b.MOMENTS_R1 * b.PLTSCALE")
             sqlLine.group("a."+filter+"momentRH",      "b.MOMENTS_RH * b.PLTSCALE")
-            sqlLine.group("a."+filter+"PSFFlux",       "b.PSF_INST_FLUX / " + str(exptime))
-            sqlLine.group("a."+filter+"PSFFluxErr",    "b.PSF_INST_FLUX_SIG / " + str(exptime))
-            sqlLine.group("a."+filter+"ApFlux",        "b.AP_FLUX / " + str(exptime))
-            sqlLine.group("a."+filter+"ApFluxErr",     "b.AP_FLUX_SIG / " + str(exptime))
-            sqlLine.group("a."+filter+"KronFlux",      "b.KRON_FLUX / " + str(exptime))
-            sqlLine.group("a."+filter+"KronFluxErr",   "b.KRON_FLUX_ERR / " + str(exptime))
+            sqlLine.group("a."+filter+"PSFFlux",       "b.PSF_INST_FLUX / " + expTimeString)
+            sqlLine.group("a."+filter+"PSFFluxErr",    "b.PSF_INST_FLUX_SIG / " + expTimeString)
+            sqlLine.group("a."+filter+"ApFlux",        "b.AP_FLUX / " + expTimeString)
+            sqlLine.group("a."+filter+"ApFluxErr",     "b.AP_FLUX_SIG / " + expTimeString)
+            sqlLine.group("a."+filter+"KronFlux",      "b.KRON_FLUX / " + expTimeString)
+            sqlLine.group("a."+filter+"KronFluxErr",   "b.KRON_FLUX_ERR / " + expTimeString)
             sqlLine.group("a."+filter+"ApFillFac",     "b.AP_NPIX / (3.14159265359 * POW(b.AP_MAG_RADIUS - 0.5, 2))")
             sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
@@ -458 +455 @@
             sqlLine.group("a."+filter+"PlateScale",    "b.PLTSCALE")
             sqlLine.group("a."+filter+"ExtNSigma",     "b.EXT_NSIGMA")
-            sqlLine.group("a."+filter+"sky",           "b.SKY / " + str(exptime))
-            sqlLine.group("a."+filter+"skyErr",        "b.SKY_SIGMA / " + str(exptime))
+            sqlLine.group("a."+filter+"sky",           "b.SKY / " + expTimeString)
+            sqlLine.group("a."+filter+"skyErr",        "b.SKY_SIGMA / " + expTimeString)
 
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
@@ -531 +528 @@
                 continue
 
-            header = self.headerSet[filter]
-            exptime = self.getKeyFloat(header, "%.5f", "EXPTIME")
-
             # insert all the detections
             sqlLine = sqlUtility("UPDATE " + tablename + " AS a , " + filter + "SkyChip_xsrc AS b SET")
 
-            sqlLine.group("a."+filter+"haveData",      "'1'")
-            sqlLine.group("a."+filter+"S2",          "b.G_S2")
+            sqlLine.group("a."+filter+"haveData",       "'1'")
+            sqlLine.group("a."+filter+"S2",             "b.G_S2")
             sqlLine.group("a."+filter+"logRT",          "b.G_RT")
             sqlLine.group("a."+filter+"logRA",          "b.G_RA")
             sqlLine.group("a."+filter+"bumpy",          "b.G_BUMPY")
-            sqlLine.group("a."+filter+"halfLightRad",          "b.HALF_LIGHT_RADIUS")
+            sqlLine.group("a."+filter+"halfLightRad",   "b.HALF_LIGHT_RADIUS")
+
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
 
@@ -781 +776 @@
         # PETRO_MAG is instrumental + 2.5log(exptime) + FPA.ZP
         # we want to apply the DVO zero point, so remove FPA.ZP:
+        ## XXX is this statement true: is FPA.ZP + 2.5log(exptime) applied to PETRO_MAG?
 
         hdrZP   = "%.5f" % float(header['FPA.ZP'])
-        # magtime = "%.5f" % (2.5*math.log10(float(header['EXPTIME'])))
+        magtime = "%.5f" % (2.5*math.log10(float(header['EXPTIME'])))
 
         self.logger.infoPair("Adding", "petrosians for extended sources")