Changeset 40208 for trunk/ippToPsps/jython/gpc1db.py

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

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (3 diffs)

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
+
+
+
 
     '''