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

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

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

@@ -50 +50 @@
                useFullTables)
 
-       if not self.everythingOK: return
-
        self.stackType = "DEEP_STACK" # TODO
 
@@ -57 +55 @@
        meta = self.gpc1Db.getStackStageMeta(self.id)
        if not meta:
-           self.everythingOK = False
-           return
+           self.logger.errorPair("Could not get stack", "metadata")
+           raise
 
        self.filter = meta[0];
@@ -80 +78 @@
        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
@@ -284 +281 @@
         " + 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') + "' \
@@ -367 +364 @@
                ,X_PSF_SIG \
                ,Y_PSF_SIG \
-               ,POW(10.0, (-0.4*PSF_INST_MAG)) / "+str(self.expTime)+" \
-               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / "+str(self.expTime)+")) / 1.085736) \
-               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / "+str(self.expTime)+" \
+               ,POW(10.0, (-0.4*PSF_INST_MAG)) / " + str(self.expTime) + " \
+               ,ABS((PSF_INST_MAG_SIG*(POW(10.0, (-0.4*PSF_INST_MAG)) / " + str(self.expTime) + ")) / 1.085736) \
+               ,POW(10.0, (-0.4*PEAK_FLUX_AS_MAG)) / " + str(self.expTime) + " \
                ,SKY \
                ,SKY_SIGMA \
@@ -390 +387 @@
                ,AP_MAG \
                , NULL \
-               ,KRON_FLUX \
-               ,KRON_FLUX_ERR \
+               ,KRON_FLUX / " + str(self.expTime) + " \
+               ,KRON_FLUX_ERR / " + str(self.expTime) + " \
                , NULL \
                , NULL \
@@ -416 +413 @@
             #if deep stack and instFlux = null and err not null
             sql = "UPDATE StackDetection AS a, SkyChip_psf AS b \
-                   SET instFlux = 2*b.PSF_INST_FLUX_SIG \
+                   SET instFlux = 2*b.PSF_INST_FLUX_SIG / " + str(self.expTime) + " \
                    WHERE instFlux IS NULL \
                    AND a.ippDetectID = b.IPP_IDET  \
@@ -501 +498 @@
         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")
@@ -566 +563 @@
 
         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))
 
     '''
@@ -586 +583 @@
 
         self.scratchDb.updateFilterID("ObjectCalColor", self.filter)
-        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.config.dataRelease))
 
 
@@ -620 +617 @@
     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 \
@@ -627 +624 @@
                a.objID = b.objID \
                WHERE a.ippDetectID = b.ippDetectID \
-               AND b.sourceID = " + self.header['SOURCEID'] + "\
                AND b.imageID = " + str(imageID)
         self.scratchDb.execute(sql)