Changeset 33146

Timestamp:

Jan 25, 2012, 1:40:31 PM (14 years ago)

Author:

rhenders

Message:

change to the way we call method to get cmf; more fields populated, including unconvolved fluxes; change to way we encode stackDetectID

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (7 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -46 +46 @@
                batchID,
                "ST", 
-               gpc1Db.getStackStageCmf(stackID))
+               gpc1Db.getStackStageCmf(configDoc.find("dvo/gpc1Label").text, stackID))
 
        if not self.everythingOK: return
@@ -60 +60 @@
        self.filter = meta[0];
        self.filter = self.filter[0:1]
+       self.filterID = self.scratchDb.getFilterID(self.filter)
        self.skycell = meta[1];
 
@@ -442 +443 @@
         # TODO temporarily loading 1st convolved fluxes into unconvolved fields
         self.logger.infoPair("Adding fluxes", "un-convolved")
-        self.updateApFlxs("", "< 7.0")
+        self.updateApFlxs("", "IS NULL")
         self.logger.infoPair("Adding fluxes", "1st convolved")
         self.updateApFlxs("c1", "< 7.0")
@@ -458 +459 @@
         ,petR90=b.PETRO_RADIUS_90 \
         ,petR90Err=b.PETRO_RADIUS_90_ERR \
+        ,petCf=b.PETRO_FILL \
         WHERE a.ippDetectID=b.IPP_IDET"
         self.scratchDb.execute(sql)
@@ -515 +517 @@
         rs.first()
         nMissing = rs.getInt(1)
-        self.logger.infoPair("Detections deleted from %s that are not in StackDetection" + table, "%5d" % nMissing)
   
         if nMissing < 1: return
@@ -521 +522 @@
         sql = "DELETE FROM " + table + " WHERE ippDetectID NOT IN (SELECT ippDetectID FROM StackDetection)"
         self.scratchDb.execute(sql)
+        self.logger.infoPair("Detections not in StackDetection", "%d deleted from %s" % (nMissing, table))
        
 
@@ -620 +622 @@
         sql = "UPDATE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
                a.ippObjID = b.ippObjID, \
-               a.stackDetectID = b.detectID, \
+               a.stackDetectID = 10 * b.detectID + " + str(self.filterID) + ", \
                a.objID = b.objID \
                WHERE a.ippDetectID = b.ippDetectID \