Changeset 33638 for branches/eam_branches/ipp-20111122/ippToPsps/jython/stackbatch.py

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/jython/stackbatch.py (modified) (15 diffs)

branches/eam_branches/ipp-20111122/ippToPsps/jython/stackbatch.py

@@ -30 +30 @@
     def __init__(self, 
                  logger, 
-                 configPath,
-                 configDoc,
+                 config,
                  gpc1Db,
                  ippToPspsDb,
+                 scratchDb,
                  stackID,
-                 batchID):
+                 batchID,
+                 useFullTables):
 
        super(StackBatch, self).__init__(
                logger,
-               configPath,
-               configDoc,
+               config,
                gpc1Db,
                ippToPspsDb,
+               scratchDb,
                stackID,
                batchID,
                "ST", 
-               gpc1Db.getStackStageCmf(stackID))
+               gpc1Db.getStackStageCmf(config.dvoLabel, stackID),
+               useFullTables)
 
        if not self.everythingOK: return
@@ -60 +62 @@
        self.filter = meta[0];
        self.filter = self.filter[0:1]
+       self.filterID = self.scratchDb.getFilterID(self.filter)
        self.skycell = meta[1];
 
@@ -77 +80 @@
        self.analysisVer = meta[2];
 
-       self.expTime = gpc1Db.getStackExpTime(self.id)
-
-       self.logger.debug("Got exp time of %d" % self.expTime)
+       #self.expTime = gpc1Db.getStackExpTime(self.id)
+       self.expTime = self.header['EXPTIME']
 
        # delete PSPS tables
@@ -281 +283 @@
         " + str(self.id) + " \
         ," + self.skycell + " \
-        ," + str(self.scratchDb.getPhotoCalID(self.header['SOURCEID'], self.header['IMAGEID'])) + " \
+        ," + str(self.scratchDb.getPhotoCalID(self.header['IMAGEID'])) + " \
         ," + self.header['FPA.ZP'] + " \
-        ," + str(self.expTime) + " \
+        ," + self.expTime + " \
         ,'" + self.safeDictionaryAccess(self.header, 'PSFMODEL') + "' \
         ,'" + self.safeDictionaryAccess(self.header, 'FWHM_MAJ') + "' \
@@ -304 +306 @@
         self.scratchDb.updateAllRows("StackMeta", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackMeta", self.filter)
-        self.scratchDb.updateAllRows("StackMeta", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("StackMeta", "dataRelease", str(self.config.dataRelease))
         self.updateStackTypeID("StackMeta")
 
@@ -400 +402 @@
         self.scratchDb.updateAllRows("StackDetection", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackDetection", self.filter)
-        self.scratchDb.updateAllRows("StackDetection", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("StackDetection", "dataRelease", str(self.config.dataRelease))
         self.scratchDb.updateAllRows("StackDetection", "primaryF", "0")
         self.scratchDb.updateAllRows("StackDetection", "activeFlag", "0")
@@ -442 +444 @@
         # 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 +460 @@
         ,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)
@@ -463 +466 @@
         self.scratchDb.updateAllRows("StackApFlx", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackApFlx", self.filter)
-        self.scratchDb.updateAllRows("StackApFlx", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("StackApFlx", "dataRelease", str(self.config.dataRelease))
         self.scratchDb.updateAllRows("StackApFlx", "primaryF", "0")
         self.scratchDb.updateAllRows("StackApFlx", "activeFlag", "0")
@@ -497 +500 @@
         self.scratchDb.updateAllRows("StackModelFit", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackModelFit", self.filter)
-        self.scratchDb.updateAllRows("StackModelFit", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("StackModelFit", "dataRelease", str(self.config.dataRelease))
         self.scratchDb.updateAllRows("StackModelFit", "primaryF", "0")
         self.scratchDb.updateAllRows("StackModelFit", "activeFlag", "0")
@@ -515 +518 @@
         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 +523 @@
         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))
        
 
@@ -562 +565 @@
 
         self.scratchDb.updateAllRows("SkinnyObject", "surveyID", str(self.surveyID))
-        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -582 +585 @@
 
         self.scratchDb.updateFilterID("ObjectCalColor", self.filter)
-        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.config.dataRelease))
 
 
@@ -616 +619 @@
     def updateDvoIDs(self, table):
 
-        imageID = self.scratchDb.getImageIDFromExternID(self.header['SOURCEID'], self.header['IMAGEID'])
+        imageID = self.scratchDb.getImageIDFromExternID(self.header['IMAGEID'])
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
         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 \
-               AND b.sourceID = " + self.header['SOURCEID'] + "\
                AND b.imageID = " + str(imageID)
         self.scratchDb.execute(sql)