Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/stackbatch.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/stackbatch.py (modified) (25 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/stackbatch.py

@@ -19 +19 @@
 '''
 StackBatch class
+
+This class, a sub-class of Batch, processes single stack skycells in the form of IPP cmf files
+
 '''
 class StackBatch(Batch):
@@ -27 +30 @@
     def __init__(self, 
                  logger, 
-                 configPath,
-                 configDoc,
+                 config,
                  gpc1Db,
                  ippToPspsDb,
-                 stackID):
+                 scratchDb,
+                 stackID,
+                 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
@@ -49 +56 @@
        # get stack meta data
        meta = self.gpc1Db.getStackStageMeta(self.id)
+       if not meta:
+           self.everythingOK = False
+           return
+
        self.filter = meta[0];
        self.filter = self.filter[0:1]
+       self.filterID = self.scratchDb.getFilterID(self.filter)
        self.skycell = meta[1];
-       # TODO HACK fix this
+
+       # skycell is, eg "skycell.1133.081"
+       # we need 1133.081 for skycell, but store as an int, so instead store 1133081
+       # projection cell is just the 1133 bit
+       # this is how it should be done
+       #self.projectioncell = self.skycell[8:12]
+       #self.skycell = self.skycell[8:]
+       #self.skycell = self.skycell.replace(".", "")
+       #self.projectioncell = self.skycell[8:12]
+
+       # TODO this is the wrong way, but is consistent with SkyCell table in IN data
        self.skycell = self.skycell[8:12]
-       # mangling e.g. 0683.043 into 0683043 for now until we have a schema change
-       #self.skycell = self.skycell.replace(".", "")
+       self.projectioncell = self.skycell
+
        self.analysisVer = meta[2];
 
@@ -77 +99 @@
        self.scratchDb.dropTable("SkyChip_xsrc")
 
-       # create an output filename, which is {filterID}{skycellID}.FITS
+       # create an output filename, which is {stackID}.FITS
        self.outputFitsFile = "%08d.FITS" % self.id
        self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
@@ -90 +112 @@
        if not self.useFullTables:
            self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
-
 
        # dump stuff to log
@@ -96 +117 @@
        self.logger.infoPair("Stack type", "%s" % self.stackType)
        self.logger.infoPair("Skycell", "%s" % self.skycell)
+       self.logger.infoPair("Projectioncell", "%s" % self.projectioncell)
        self.logger.infoPair("Filter", "%s" % self.filter)
-
-
 
     '''
@@ -247 +267 @@
         ,expTime \
         ,psfModelID \
+        ,psfFwhm_mean \
+        ,psfFwhm_max \
         ,ctype1 \
         ,ctype2 \
@@ -266 +288 @@
         ," + str(self.expTime) + " \
         ,'" + self.safeDictionaryAccess(self.header, 'PSFMODEL') + "' \
+        ,'" + self.safeDictionaryAccess(self.header, 'FWHM_MAJ') + "' \
+        ,'" + self.safeDictionaryAccess(self.header, 'FW_MJ_UQ') + "' \
         ,'" + self.header['CTYPE1'] + "' \
         ,'" + self.header['CTYPE2'] + "' \
@@ -283 +307 @@
         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")
 
@@ -297 +321 @@
                ippDetectID \
                ,skyCellID \
+               ,projectionCellID \
                ,obsTime \
                ,xPos \
@@ -311 +336 @@
                ,psfWidMinor \
                ,psfTheta \
+               ,psfLikelihood \
                ,infoFlag \
                ,psfCf \
@@ -335 +361 @@
                IPP_IDET \
                ," + self.skycell + " \
+               ," + self.projectioncell + " \
                ," + self.header['MJD-OBS'] + " \
                ,X_PSF \
@@ -349 +376 @@
                ,PSF_MINOR \
                ,PSF_THETA \
+               ,psfLikelihood(EXT_NSIGMA) \
                ,FLAGS << 32 | FLAGS2 \
                ,PSF_QF \
@@ -375 +403 @@
         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")
@@ -381 +409 @@
         self.updateStackTypeID("StackDetection")
         self.updateDvoIDs("StackDetection")
-        sql = "ALTER TABLE StackDetection ADD PRIMARY KEY (objID, stackDetectID)"
-        self.scratchDb.execute(sql)
-
+        sql = "ALTER IGNORE TABLE StackDetection ADD PRIMARY KEY (objID)"
+        self.scratchDb.execute(sql)
+  
         if self.stackType == "DEEP_STACK": 
 
@@ -390 +418 @@
                    SET instFlux = 2*b.PSF_INST_FLUX_SIG \
                    WHERE instFlux IS NULL \
+                   AND a.ippDetectID = b.IPP_IDET  \
                    AND b.PSF_INST_FLUX_SIG IS NOT NULL"
             self.scratchDb.execute(sql)
-            #    instFlux = 2*PSF_INST_FLUX_SIG
             
         self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "instFlux")
@@ -417 +445 @@
         # 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")
@@ -433 +461 @@
         ,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)
@@ -438 +467 @@
         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")
@@ -490 +519 @@
         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
@@ -496 +524 @@
         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))
        
 
@@ -527 +556 @@
                objID \
                ,ippObjID \
+               ,projectionCellID \
                ) \
                SELECT \
                DISTINCT objID \
                ,ippObjID \
+               ,projectionCellID \
                FROM StackDetection"
         self.scratchDb.execute(sql)
@@ -569 +600 @@
         self.scratchDb.createIndex("StackModelFit", "ippDetectID")
 
+        return True
+
     '''
     Applies indexes to the IPP tables
@@ -580 +613 @@
         self.scratchDb.createIndex("SkyChip_xsrc", "IPP_IDET")
 
+        return True
+
     '''
     Updates provided table with DVO IDs from DVO table
@@ -587 +622 @@
         imageID = self.scratchDb.getImageIDFromExternID(self.header['SOURCEID'], self.header['IMAGEID'])
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
-        sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
+        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 \