Changeset 32337 for branches/eam_branches/ipp-20110710/ippToPsps/jython/stackbatch.py

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/ippToPsps/jython

Files:

• . (modified) (1 prop)
• stackbatch.py (modified) (7 diffs)

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

@@ -27 +27 @@
     def __init__(self, 
                  logger, 
+                 configPath,
                  configDoc,
                  gpc1Db,
@@ -34 +35 @@
        super(StackBatch, self).__init__(
                logger,
+               configPath,
                configDoc,
                gpc1Db,
                ippToPspsDb,
                stackID,
-               "stack", 
-               gpc1Db.getStackStageCmf(stackID), 
-               "3PI") # TODO
+               "ST", 
+               gpc1Db.getStackStageCmf(stackID))
 
        if not self.everythingOK: return
@@ -48 +49 @@
        # 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.skycell = meta[1];
-       self.skycell = self.skycell[8:]
+       # TODO HACK fix this
+       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.skycell = self.skycell.replace(".", "")
        self.analysisVer = meta[2];
 
@@ -87 +93 @@
        # insert sourceID/imageID combo so DVO can look it up
        if not self.useFullTables:
-           self.scratchDb.insertNewDvoImage(self.header['SOURCEID'], self.header['IMAGEID'])
-
-    '''
-    Prints metadata to the log
-    '''
-    def printMe(self):
-
-       super(StackBatch, self).printMe()
-
+           self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
+
+
+       # dump stuff to log
        self.logger.infoPair("Stack ID", "%d" % self.id)
        self.logger.infoPair("Stack type", "%s" % self.stackType)
        self.logger.infoPair("Skycell", "%s" % self.skycell)
        self.logger.infoPair("Filter", "%s" % self.filter)
+
 
 
@@ -383 +385 @@
         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": 
 
@@ -392 +394 @@
                    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")
@@ -588 +590 @@
 
         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.dvoDetection + " AS b SET \
+        sql = "UPDATE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
                a.ippObjID = b.ippObjID, \
                a.stackDetectID = b.detectID, \