Changeset 40483 for branches/czw_branch/20170908/ippToPsps/jython/forcedwarpbatch.py

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ippToPsps/jython/forcedwarpbatch.py (modified) (8 diffs)

branches/czw_branch/20170908/ippToPsps/jython/forcedwarpbatch.py

@@ -424 +424 @@
         # self.selectDvoObjIDs()
         self.logger.infoPair("inserting dvo info: find imageID", "from externID")
-        imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],12000,12500) 
-        self.logger.infoPair("I don't like this", "it is hardwired to gpc1")
+
+        # get the imageID: this code has cases for simtest vs gpc1 cameras
+        # if self.config.test: 
+        self.logger.infoPair("current camera is", self.config.camera)
+        if self.config.camera == "gpc1":
+            self.logger.infoPair("I don't like this", "it is hardwired to gpc1")
+            imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],12000,12500) 
+        if self.config.camera == "simtest":
+            imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],15100,15500) 
+        if imageID == 0:
+            self.logger.infoPair ("failed to get imageID for", str(num))
+            raise
+
         self.logger.infoPair("updating", pspsTableName)
 
@@ -433 +444 @@
         sqlLine.group("a.ippObjID",   "b.ippObjID")
         sqlLine.group("a.dvoRegionID","b.catID")
-        sqlLine.group("a.zp",         "b.zp")
+        sqlLine.group("a.zp",         "b.zpPSF")
         sqlLine.group("a.telluricExt","b.telluricExt")
         sqlLine.group("a.airmass",    "b.airmass")
         sqlLine.group("a.FinfoFlag3", "b.flags")
 
-        sqlLine.group("a.FpsfFlux",     "a.FpsfFlux     * b.zpFactor")
-        sqlLine.group("a.FpsfFluxErr",  "a.FpsfFluxErr  * b.zpFactor")
-        sqlLine.group("a.FapFlux",      "a.FapFlux      * b.zpFactor")
-        sqlLine.group("a.FapFluxErr",   "a.FapFluxErr   * b.zpFactor")
-        sqlLine.group("a.FkronFlux",    "a.FkronFlux    * b.zpFactor")
-        sqlLine.group("a.FkronFluxErr", "a.FkronFluxErr * b.zpFactor")
-        sqlLine.group("a.Fsky",         "a.Fsky         * b.zpFactor")
-        sqlLine.group("a.FskyErr",      "a.FskyErr      * b.zpFactor")
+        sqlLine.group("a.FpsfFlux",     "a.FpsfFlux     * b.zpFactorPSF")
+        sqlLine.group("a.FpsfFluxErr",  "a.FpsfFluxErr  * b.zpFactorPSF")
+        sqlLine.group("a.FapFlux",      "a.FapFlux      * b.zpFactorAPER")
+        sqlLine.group("a.FapFluxErr",   "a.FapFluxErr   * b.zpFactorAPER")
+        sqlLine.group("a.FkronFlux",    "a.FkronFlux    * b.zpFactorAPER")
+        sqlLine.group("a.FkronFluxErr", "a.FkronFluxErr * b.zpFactorAPER")
+        sqlLine.group("a.Fsky",         "a.Fsky         * b.zpFactorAPER")
+        sqlLine.group("a.FskyErr",      "a.FskyErr      * b.zpFactorAPER")
 
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))
@@ -457 +468 @@
         self.logger.infoPair("row count of ForcedWarpMeasurement after cull of null objID ", rowCountAfter)
         if rowCountAfter == 0:
-            self.skipBatch = True
-            self.logger.infoPair ("skip this batch", "it is bad")
-            return False
+            if self.haveLensPSF[num] ==0:
+                self.logger.infoPair("skipping this table", "no lenspsf and no dvo, run this:")
+                self.logger.infoPair("update addRun join addProcessedExp using (add_id) set fault = 43 where add_id = ",str(self.number[num])) 
+                self.skipBatch = True
+                return False
+            else:    
+                self.skipBatch = True
+                self.logger.infoPair ("skip this batch", "it is bad")
+                return False
+
+
 
         self.logger.infoPair("Adding 'row' columns to", pspsTableName)
@@ -557 +576 @@
 
         sqlLine = sqlUtility("UPDATE " + pspsTableName + " as a, " + self.scratchDb.dvoDetectionTable + " as b SET ")
-        sqlLine.group("a.flxR5",     "a.flxR5     * b.zpFactor")
-        sqlLine.group("a.flxR5Err",  "a.flxR5Err  * b.zpFactor")
-        sqlLine.group("a.flxR5Std",  "a.flxR5Std  * b.zpFactor")
-
-        sqlLine.group("a.flxR6",     "a.flxR6     * b.zpFactor")
-        sqlLine.group("a.flxR6Err",  "a.flxR6Err  * b.zpFactor")
-        sqlLine.group("a.flxR6Std",  "a.flxR6Std  * b.zpFactor")
-
-        sqlLine.group("a.flxR7",     "a.flxR7     * b.zpFactor")
-        sqlLine.group("a.flxR7Err",  "a.flxR7Err  * b.zpFactor")
-        sqlLine.group("a.flxR7Std",  "a.flxR7Std  * b.zpFactor")
+        sqlLine.group("a.flxR5",     "a.flxR5     * b.zpFactorAPER")
+        sqlLine.group("a.flxR5Err",  "a.flxR5Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR5Std",  "a.flxR5Std  * b.zpFactorAPER")
+
+        sqlLine.group("a.flxR6",     "a.flxR6     * b.zpFactorAPER")
+        sqlLine.group("a.flxR6Err",  "a.flxR6Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR6Std",  "a.flxR6Std  * b.zpFactorAPER")
+
+        sqlLine.group("a.flxR7",     "a.flxR7     * b.zpFactorAPER")
+        sqlLine.group("a.flxR7Err",  "a.flxR7Err  * b.zpFactorAPER")
+        sqlLine.group("a.flxR7Std",  "a.flxR7Std  * b.zpFactorAPER")
 
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))
@@ -657 +676 @@
         # each of the "populate*" methods below add their tables to the list:
         self.tablesToExport=[]
+        tables = [] # list of tables to calculate min/max objid on...
     
         for num in self.number:    
@@ -671 +691 @@
             self.logger.infoPair("Populating", myTable)
             if not self.populateForcedWarpMeasurement(num):
-                self.logger.infoPair ("skippping ForcedWarpMeasurement", str(num))
+                self.logger.infoPair ("failed on ForcedWarpMeasurement", str(num))
                 #continue
                 raise
             self.tablesToExport.append(myTable)
-
-            self.logger.infoPair("setting min/max objid from", myTable)
-            self.setMinMaxObjID([myTable])
+            tables.append(myTable)
+            #self.logger.infoPair("setting min/max objid from", myTable)
+ 
+            #self.setMinMaxObjID([myTable])
 
             # populateForcedWarpMeasurement also populates ForcedWarpMasked (from ForcedWarpMeasurement)
@@ -697 +718 @@
             self.populateForcedWarpToImage(num)
             self.tablesToExport.append(myTable)
+        self.logger.infoPair("setting min/max objid from", "all the fw tables")
+        self.setMinMaxObjID(tables)
+        self.logger.infoPair("finishing","populatePspsTables")
+
             
-            self.logger.infoPair("finishing","populatePspsTables")
-
 
         return True
@@ -762 +785 @@
             self.haveLensPSF[num] = 0
             self.haveLensing[num] = 0
+
             for table in tables:
                 # check for AP_NPIX columns: missing for SAS39