Changeset 40483 for branches/czw_branch/20170908/ippToPsps/jython/gpc1db.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/gpc1db.py (modified) (8 diffs)

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

@@ -511 +511 @@
             files = glob.glob(pathBase + ".cmf")
 
+        if len(files) < 1:
+            self.logger.errorPair("No files found for forced warp path", pathBase)
+            return None
         
-        if len(files) < 1: return None
         fits = Fits(self.logger, self.config, files[0])
         self.logger.infoPair("cmf file",files[0])
@@ -760 +762 @@
 
         meta = []
+        
+
         sql = "SELECT exp_id, exp_name, camRun.dist_group, camRun.software_ver, rawExp.bg, rawExp.bg_stdev, chip_id, warp_id \
                FROM camRun \
@@ -773 +777 @@
             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 +789 @@
         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
+
+
+
 
     '''
@@ -818 +857 @@
         files = []
 
-
         #there are a couple of states for smfversion
 
@@ -829 +867 @@
         #    use (file).smf if camRun.state = 'full' and if there is only a .smf
         #    fault out if camRun.state != 'full' -- that is a race condition we don't want.
-       
         
         if (smfversion == "not_reproc") or (smfversion == "use_new"):
@@ -904 +941 @@
 
         self.logger.infoPair("smf files:", files)
-        if len(files) < 1: return None
+        if len(files) < 1:
+            self.logger.errorPair("No files found for cam path", path)
+            return None
 
         return Fits(self.logger, self.config, files[0]) # TODO just returning first file - check
@@ -974 +1013 @@
 
         # print "stack cmf files:", files
-        if len(files) < 1: return None
+        if len(files) < 1:
+            self.logger.errorPair("No files found for stack path", pathBase)
+            return None
 
         # if we get here, then the cmf is readable, now check the stack_id