Changeset 40208 for trunk

Timestamp:

Nov 16, 2017, 6:57:49 PM (9 years ago)

Author:

heather

Message:

changes to make fw / p2 work around various dvo / cmf/smf issues

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (2 diffs)
• forcedwarpbatch.py (modified) (2 diffs)
• gpc1db.py (modified) (3 diffs)
• ipptopspsdb.py (modified) (1 diff)
• queue.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -60 +60 @@
        meta = self.gpc1Db.getCameraStageMeta(self.id)
        if not meta:
-           self.logger.errorPair("Could not get", "camera metadata")
-           raise
+           self.logger.infoPair("Could not get camera metadata", "trying with no warp id")
+           meta = self.gpc1Db.getCameraStageMetaNoWarpID(self.id)
+           if not meta:
+               self.logger.errorPair("Could not get camera metadata", "now what?")
+               raise
+       
 
        # set a flag indicating that we have the new columns added in version 5 of the
@@ -80 +84 @@
        self.chipID = meta[6];
        self.warpID = meta[7];
+       
+       
+
 
        if not self.analysisVer: self.analysisVer = -999

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -457 +457 @@
         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)
@@ -766 +774 @@
             self.haveLensPSF[num] = 0
             self.haveLensing[num] = 0
+
             for table in tables:
                 # check for AP_NPIX columns: missing for SAS39

trunk/ippToPsps/jython/gpc1db.py

@@ -760 +760 @@
 
         meta = []
+        
+
         sql = "SELECT exp_id, exp_name, camRun.dist_group, camRun.software_ver, rawExp.bg, rawExp.bg_stdev, chip_id, warp_id \
                FROM camRun \
@@ -768 +770 @@
                WHERE camRun.cam_id = %d" % camID \
                + " AND warpRun.state != 'drop'"
-
         try:
             rs = self.executeQuery(sql)
             rs.first()
         except:
-            self.logger.errorPair("Can't query for", "camera meta data")
-
+                self.logger.errorPair("Can't query for", "camera meta data")
         try:
             meta.append(rs.getInt(1))
@@ -786 +786 @@
         except:
             self.logger.errorPair("getCameraStageMeta()", "empty meta data")
-
         return meta
+
+    def getCameraStageMetaNoWarpID(self, camID):
+
+        self.logger.debug("Querying GPC1 for camera meta data")
+
+        meta = []
+        
+
+        sql = "SELECT exp_id, exp_name, camRun.dist_group, camRun.software_ver, rawExp.bg, rawExp.bg_stdev, chip_id, -999 \
+               FROM camRun \
+               JOIN chipRun USING(chip_id) \
+               JOIN rawExp USING(exp_id) \
+               LEFT JOIN fakeRun USING(cam_id) \
+               LEFT JOIN warpRun USING(fake_id) \
+               WHERE camRun.cam_id = %d" % camID 
+
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+        except:
+                self.logger.errorPair("Can't query for", "camera meta data")
+        try:
+            meta.append(rs.getInt(1))
+            meta.append(rs.getString(2))
+            meta.append(rs.getString(3))
+            meta.append(rs.getString(4))
+            meta.append(rs.getString(5))
+            meta.append(rs.getString(6))
+            meta.append(rs.getInt(7))
+            meta.append(rs.getInt(8))
+        except:
+            self.logger.errorPair("getCameraStageMeta()", "empty meta data")
+
+        return meta
+
+
+
 
     '''

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -27 +27 @@
         self.skychunk = skychunk
 
-        self.MAX_FAILS = 5
+        self.MAX_FAILS = 15
 
     '''

trunk/ippToPsps/jython/queue.py

@@ -134 +134 @@
                     #if (dec > 85): raise
                     # this may be a problem for poles # HAF XXX
-                    if (dec > 90): raise
+                    ####if (dec > 90): raise
                     # print "dec, dD: ", dec, dD ,self.skychunk.maxDec
 
@@ -178 +178 @@
                         dec = dec + 2*dD
                         #if (dec > 85): raise
-                        if (dec > 90): raise
+                        ###if (dec > 90): raise
                        #dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
                         dR = 0.5*self.skychunk.boxSize