Changeset 38960

Timestamp:

Oct 25, 2015, 5:57:48 PM (11 years ago)

Author:

bills

Message:

add more tracking IDS
ForcedWarpMeta.ippSkycalID
ForcedWarpMeta.stackMetaID
DiffMeta.ippDiffID

Location:

trunk/ippToPsps/jython

Files:

• diffbatch.py (modified) (3 diffs)
• forcedwarpbatch.py (modified) (3 diffs)
• gpc1db.py (modified) (3 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -65 +65 @@
        self.header ={}
        self.diffSkyFileIDs = {}
+       self.ippDiffID = {}
        self.filterName = {}
        self.filterID = {}
@@ -113 +114 @@
 
            self.difftypeID[num] = meta[1];
+           self.ippDiffID[num] = stage_id
            self.posImageID[num] = meta[2];
            self.negImageID[num] = meta[3];
@@ -217 +219 @@
         sqlLine.group("posImageID",            self.posImageID[num]);
         sqlLine.group("negImageID",            self.negImageID[num]);
+        sqlLine.group("ippDiffID",             self.ippDiffID[num]);
+
         ## MEH adding projectionID -- want str for pre-0 in both? 
         sqlLine.group("projectionID",          str(self.projectionID[num]))

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -86 +86 @@
        self.projectionID = {}
        self.tessID = {}
+       self.stackMetaID = {}
+       self.ippSkycalID = {}
 
        #I give a number to the forcedwarp stuff, I am not sure if this is the best way but it might work
@@ -128 +130 @@
            self.skycellName[num] = meta['skycell_id']
            self.tessName[num]    = meta['tess_id']
+           self.stackMetaID[num] = meta['stack_id']
+           self.ippSkycalID[num] = meta['skycal_id']
        
            # This isn't populated in the database (it's NULL).  The hack is below.
@@ -270 +274 @@
         sqlLine.group("md5sum",         str(self.md5sum[num]))
         sqlLine.group("expTime",        self.expTime[num])
+        sqlLine.group("ippSkycalID",    self.ippSkycalID[num])
+        sqlLine.group("stackMetaID",    self.stackMetaID[num])
 # no astrometry calibration for forced warp
 #       sqlLine.group("astroScat",      self.getKeyFloat(header, "%.8f", 'CERROR'))

trunk/ippToPsps/jython/gpc1db.py

@@ -396 +396 @@
                fullForceResult.software_ver, \
                skycell_id, \
-               warpRun.tess_id \
+               warpRun.tess_id, \
+               skycalRun.skycal_id, \
+               skycalRun.stack_id \
                FROM fullForceInput join addRun on \
                (fullForceInput.ff_id = addRun.stage_id and fullForceInput.warp_id = addRun.stage_extra1) \
@@ -406 +408 @@
                JOIN chipRun using (chip_id) \
                JOIN rawExp using (exp_id) \
+               JOIN fullForceRun using(ff_id) \
+               JOIN skycalRun USING(skycal_id) \
                WHERE add_id = " + str(forcedWarpID) + " \
                AND warp_skyfile_id = " +  str(warpSkyfileID)
@@ -422 +426 @@
             meta['skycell_id']   = rs.getString(5)
             meta['tess_id']      = rs.getString(6)
+            meta['skycal_id']    = rs.getString(7)
+            meta['stack_id']     = rs.getString(8)
         except:
             self.logger.errorPair("getForcedWarpStageMeta()", "missing metadata entry")