Changeset 33638 for branches/eam_branches/ipp-20111122/ippToPsps/jython/detectionbatch.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/detectionbatch.py (modified) (18 diffs)

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

@@ -33 +33 @@
     def __init__(self, 
                  logger,
-                 configPath,
-                 configDoc,
+                 config,
                  gpc1Db,
                  ippToPspsDb,
+                 scratchDb,
                  camID,
-                 batchID):
+                 batchID,
+                 useFullTables):
 
        super(DetectionBatch, self).__init__(
                logger,
-               configPath,
-               configDoc,
+               config,
                gpc1Db,
                ippToPspsDb,
+               scratchDb,
                camID,
                batchID,
                "P2", 
-               gpc1Db.getCameraStageSmf(camID))
+               gpc1Db.getCameraStageSmf(camID),
+               useFullTables)
 
        if not self.everythingOK: return
@@ -73 +75 @@
 
        # if test mode
-       if self.testMode:
+       if self.config.test:
            self.startX = 3
            self.endX = 4
@@ -219 +221 @@
         self.scratchDb.updateFilterID("FrameMeta", self.filter)
         self.scratchDb.updateAllRows("FrameMeta", "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -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') + "' \
@@ -366 +368 @@
         self.scratchDb.updateFilterID(tableName, self.filter)
         self.scratchDb.updateAllRows(tableName, "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
         if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO'])
         self.scratchDb.replaceNullsInThisColumn(tableName, "polyOrder", "0")
@@ -416 +418 @@
                ,momentYY \
                ,apMag \
-               ,kronFlux \
-               ,kronFluxErr \
                ,infoFlag \
                ,sky \
@@ -448 +448 @@
                ,MOMENTS_YY \
                ,AP_MAG \
-               ,KRON_FLUX \
-               ,KRON_FLUX_ERR \
                ,FLAGS\
                ,SKY \
@@ -457 +455 @@
                , '" + self.dateStr + "' \
                , 0 \
-               , " + str(self.dataRelease) + "\
+               , " + str(self.config.dataRelease) + "\
                FROM " + ippTableName
         self.scratchDb.execute(sql)
@@ -501 +499 @@
         self.scratchDb.execute(sql)
 
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -530 +528 @@
 
         self.scratchDb.updateAllRows(tableName, "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
 
 
@@ -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)
 
@@ -757 +752 @@
     def importIppTables(self, filter=""):
 
-       if self.testMode: regex = "XY33.psf"
+       if self.config.test: regex = "XY33.psf"
        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)