Changeset 38931 for trunk

Timestamp:

Oct 21, 2015, 12:00:01 PM (11 years ago)

Author:

bills

Message:

Add chip_id, and warp_id to the camera stage metadata.
Add exp_id to the data returned for Diff stage metadata.

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -445 +445 @@
                exp_time, \
                (to_days(dateobs)-678941 + time_to_sec(dateobs)/86400.), \
-               diffInputSkyfile.tess_id \
+               diffInputSkyfile.tess_id, \
+               exp_id \
                FROM diffRun join diffInputSkyfile using (diff_id) \
                JOIN warpRun on (warp1=warp_id) \
@@ -471 +472 @@
             meta.append(rs.getString(8))
             meta.append(rs.getString(9))
+            meta.append(rs.getString(10))
 
         except:
@@ -604 +606 @@
 
         meta = []
-        sql = "SELECT exp_id, exp_name, camRun.dist_group, camRun.software_ver, rawExp.bg, rawExp.bg_stdev \
+        sql = "SELECT exp_id, exp_name, camRun.dist_group, camRun.software_ver, rawExp.bg, rawExp.bg_stdev, chip_id, warp_id \
                FROM camRun \
                JOIN chipRun USING(chip_id) \
-               JOIN rawExp USING(exp_id) WHERE camRun.cam_id = %d" % camID
+               JOIN rawExp USING(exp_id) \
+               LEFT JOIN fakeRun USING(cam_id) \
+               LEFT JOIN warpRun USING(fake_id) \
+               WHERE camRun.cam_id = %d" % camID \
+               + " AND warpRun.state != 'drop'"
 
         try:
@@ -622 +628 @@
             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")