Changeset 40011 for trunk

Timestamp:

Apr 11, 2017, 3:01:23 PM (9 years ago)

Author:

heather

Message:

changes to make forcedwards correctly (not dropping things)

Location:

trunk/ippToPsps/jython

Files:

• dvo.py (modified) (2 diffs)
• forcedwarpbatch.py (modified) (3 diffs)
• gpc1db.py (modified) (4 diffs)
• scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -698 +698 @@
         # P2 and DF need to use a full GPC1 exposure radius:
         myBorder = self.skychunk.BORDER_GPC1
-
+        self.logger.infoPair("batch type", myBatchType)
         # ST and FW need to use just a skycell
         if myBatchType == "ST" :
@@ -704 +704 @@
         if myBatchType == "FW" :
             myBorder = self.skychunk.BORDER_SKYCELL
+
 
         dR_border = myBorder / math.cos(math.radians(boxDim['DEC']))

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -424 +424 @@
         # self.selectDvoObjIDs()
         self.logger.infoPair("inserting dvo info: find imageID", "from externID")
-        imageID = self.scratchDb.getImageIDFromExternID(self.warpSkyFileID[num])
+        imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],12000,12500) 
+        self.logger.infoPair("I don't like this", "it is hardwired to gpc1")
         self.logger.infoPair("updating", pspsTableName)
 
@@ -663 +664 @@
             if not self.populateForcedWarpMeta(num):
                 self.logger.infoPair ("failure for ForcedWarpMeta, skipping ", str(num))
-                continue
+                #continue
+                raise
             self.tablesToExport.append(myTable)
             
@@ -670 +672 @@
             if not self.populateForcedWarpMeasurement(num):
                 self.logger.infoPair ("skippping ForcedWarpMeasurement", str(num))
-                continue
+                #continue
+                raise
             self.tablesToExport.append(myTable)
 

trunk/ippToPsps/jython/gpc1db.py

@@ -225 +225 @@
                SELECT DISTINCT exp_id,class_id \
                FROM addRun join \
+               addProcessedExp using(add_id) join \
                fullForceInput on (fullForceInput.ff_id = addRun.stage_id and \
                fullForceInput.warp_id = addRun.stage_extra1) \
@@ -233 +234 @@
                JOIN camRun USING(cam_id)  \
                JOIN chipRun USING(chip_id) \
-               WHERE add_id = " + str(forcedWarpID) + ") AS a"
+               WHERE addProcessedExp.fault = 0 and add_id = " + str(forcedWarpID) + ") AS a"
 
         try:
@@ -261 +262 @@
               JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id \
               AND fullForceInput.warp_id = addRun.stage_extra1) \
+              JOIN addProcessedExp using (add_id) \
               JOIN minidvodbRun USING(minidvodb_name) \
               JOIN minidvodbProcessed USING(minidvodb_id)\
@@ -277 +279 @@
               AND addRun.stage = 'fullforce' \
               AND addRun.state = 'full'\
+              AND addProcessedExp.fault = 0 \
               AND stage_id = " + str(stageID)
 

trunk/ippToPsps/jython/scratchdb.py

@@ -186 +186 @@
               
         return imageID 
+
+    ''' 
+    Gets imageID from extern ID and photcoderange (needed for FW, possibly for others)
+    ''' 
+    def getImageIDFromExternIDandPhotcodeRange(self, externID, r1, r2): 
+               
+        imageID = -1 
+               
+        sql1 = "SELECT IMAGE_ID FROM " + self.dvoImagesTable + " WHERE EXTERN_ID = %s" % (externID) 
+        range = " AND PHOTCODE >= " + str(r1) +" AND PHOTCODE <=" + str(r2)
+        sql = sql1 + range
+
+        self.logger.info(sql)
+        try: 
+            rs = self.executeQuery(sql)   
+            rs.first() 
+            imageID = rs.getInt(1) 
+        except: 
+            self.logger.errorPair("Unable to get imageID from dvo using", sql) 
+              
+        return imageID 
+
+
+
+
 
     '''