Changeset 35780 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Jul 8, 2013, 9:46:47 AM (13 years ago)

Author:

heather

Message:

current ipptopsps

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -616 +616 @@
     '''
     def populateStackApFlx(self):
+        self.logger.infoPair("getting","imageID")
+        imageID = self.scratchDb.getImageIDFromExternID(self.header['IMAGEID'])
+        self.logger.infoPair("obtained","imageID")
 
         self.logger.infoPair("Procesing", "StackApFlx")
@@ -651 +654 @@
         self.scratchDb.execute(sql)
 
+        self.logger.infoPair("adding"," PrimaryF to stackApFlx")
+        sql = "UPDATE StackApFlx AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
+               a.primaryF = ((b.flags & 0x10000) >> 16 ) \
+               WHERE a.ippDetectID = b.ippDetectID \
+               AND b.imageID = " + str(imageID)
+
+        print "update dvo sql: ", sql
+        # response = raw_input("update dvo...")
+        self.scratchDb.execute(sql)
+
+        
+
         self.scratchDb.updateAllRows("StackApFlx", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackApFlx", self.filter)
         self.scratchDb.updateAllRows("StackApFlx", "dataRelease", str(self.skychunk.dataRelease))
-        self.scratchDb.updateAllRows("StackApFlx", "primaryF", "0")
         self.scratchDb.updateAllRows("StackApFlx", "activeFlag", "0")
         self.updateStackMetaID("StackApFlx")
@@ -667 +681 @@
     '''
     def populateStackModelFit(self):
-
+        self.logger.infoPair("getting","imageID")
+        imageID = self.scratchDb.getImageIDFromExternID(self.header['IMAGEID'])
+        self.logger.infoPair("obtained","imageID")
         self.logger.infoPair("Procesing table", "StackModelFit")
+
 
         # insert all the detections
@@ -688 +705 @@
         self.scratchDb.updateFilterID("StackModelFit", self.filter)
         self.scratchDb.updateAllRows("StackModelFit", "dataRelease", str(self.skychunk.dataRelease))
-        self.scratchDb.updateAllRows("StackModelFit", "primaryF", "0")
+
+        self.logger.infoPair("adding"," PrimaryF to stackApFlx")
+        sql = "UPDATE StackModelFit AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
+               a.primaryF = ((b.flags & 0x10000) >> 16 ) \
+               WHERE a.ippDetectID = b.ippDetectID \
+               AND b.imageID = " + str(imageID)
+
+        print "update dvo sql: ", sql
+        # response = raw_input("update dvo...")
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            return
+
         self.scratchDb.updateAllRows("StackModelFit", "activeFlag", "0")
         self.updateStackMetaID("StackModelFit")
@@ -943 +973 @@
                a.stackDetectID = b.detectID, \
                a.objID = b.objID, \
-               a.infoFlag = b.flags << 45 | a.infoFlag \
+               a.infoFlag = b.flags << 45 | a.infoFlag,  \
                a.primaryF = ((b.flags & 0x10000) >> 16 ) \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)
 
-        # print "update dvo sql: ", sql
+        print "update dvo sql: ", sql
         # response = raw_input("update dvo...")
         self.scratchDb.execute(sql)