Changeset 33235 for trunk/ippToPsps/jython/detectionbatch.py

Timestamp:

Feb 10, 2012, 1:40:18 PM (14 years ago)

Author:

rhenders

Message:

got rid of dvoMeta table - now only use dvoImages table; whether we use DVO on-the-fly or already ingested data is passed as a boolean into the constructor

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (13 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -38 +38 @@
                  ippToPspsDb,
                  camID,
-                 batchID):
+                 batchID,
+                 useFullTables):
 
        super(DetectionBatch, self).__init__(
@@ -49 +50 @@
                batchID,
                "P2", 
-               gpc1Db.getCameraStageSmf(camID))
+               gpc1Db.getCameraStageSmf(camID),
+               useFullTables)
 
        if not self.everythingOK: return
@@ -322 +324 @@
                ," + self.safeDictionaryAccess(header, 'DAPMIFIT') + " \
                ,'" + self.safeDictionaryAccess(header, 'DETECTOR') + "' \
-               ," + str(self.scratchDb.getDvoImageFlags(header['SOURCEID'], header['IMAGEID'])) + " \
+               ," + str(self.scratchDb.getDvoImageFlags(header['IMAGEID'])) + " \
                ,'" + self.safeDictionaryAccess(header, 'DETREND.MASK') + "' \
                ,'" + self.safeDictionaryAccess(header, 'DETREND.DARK') + "' \
@@ -416 +418 @@
                ,momentYY \
                ,apMag \
-               ,kronFlux \
-               ,kronFluxErr \
                ,infoFlag \
                ,sky \
@@ -448 +448 @@
                ,MOMENTS_YY \
                ,AP_MAG \
-               ,KRON_FLUX \
-               ,KRON_FLUX_ERR \
                ,FLAGS\
                ,SKY \
@@ -545 +543 @@
         self.populateFrameMeta()
      
-        # dictionary objects to hold sourceIDs and imageIDs for later
-        self.sourceIDs = {}
+        # dictionary objects to hold imageIDs for later
         self.imageIDs = {}
 
@@ -578 +575 @@
 
                 # store these for later
-                self.sourceIDs[ota] = header['SOURCEID']
                 self.imageIDs[ota] = header['IMAGEID']
 
@@ -614 +610 @@
     Updates provided table with DVO IDs from DVO table
     '''
-    def updateDvoIDs(self, table, sourceID, externID):
-
-        imageID = self.scratchDb.getImageIDFromExternID(sourceID, externID)
+    def updateDvoIDs(self, table, externID):
+
+        imageID = self.scratchDb.getImageIDFromExternID(externID)
         self.logger.debug("Updating table '" + table + "' with DVO IDs using imageID = %d" % imageID)
         sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
@@ -624 +620 @@
                a.infoFlag = b.flags << 32 | a.infoFlag \
                WHERE a.ippDetectID = b.ippDetectID \
-               AND b.sourceID = " + str(sourceID) + " \
                AND b.imageID = " + str(imageID)
 
@@ -655 +650 @@
 
                 ota = "XY%d%d" % (x, y)
-                if ota not in self.sourceIDs: continue
+                if ota not in self.imageIDs: continue
 
                 #self.logger.infoTitle("Processing " + ota)
@@ -666 +661 @@
 
                 # now add DVO IDs
-                self.updateDvoIDs("Detection_" + ota, self.sourceIDs[ota], self.imageIDs[ota])
+                self.updateDvoIDs("Detection_" + ota, self.imageIDs[ota])
                 results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + ota, "objID")
                 self.updateImageID("Detection_" + ota, x, y) 
@@ -693 +688 @@
                 # update ImageMeta with count of detections for this OTA and photoCodeID
                 sql = "UPDATE ImageMeta_" + ota + " \
-                       SET nDetect = %d, photoCalID = %d" % (self.scratchDb.getRowCount("Detection_" + ota), self.scratchDb.getPhotoCalID(self.sourceIDs[ota], self.imageIDs[ota]))
+                       SET nDetect = %d, photoCalID = %d" % (self.scratchDb.getRowCount("Detection_" + ota), self.scratchDb.getPhotoCalID(self.imageIDs[ota]))
                 self.scratchDb.execute(sql)
 
@@ -760 +755 @@
        else : regex = ".*.psf"
   
-       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG KRON_FLUX KRON_FLUX_ERR FLAGS SKY SKY_SIGMA EXT_NSIGMA"
+       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG FLAGS SKY SKY_SIGMA EXT_NSIGMA"
 
        return super(DetectionBatch, self).importIppTables(columns, regex)