Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/stackbatch.py

Timestamp:

Mar 28, 2015, 8:28:32 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippToPsps/jython/stackbatch.py (modified) (9 diffs)

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

@@ -293 +293 @@
         self.generateRandomIDs()
 
+        self.logger.infoPair("Adding 'row' columns to", "StackObjectThin")
+        self.scratchDb.addRowCountColumn("StackObjectThin", "row")
+        self.logger.infoPair("Adding unique psps ids to", "StackObjectThin")
         self.generateStackDetectRowIDsAndPspsUniqueIDs()
+        self.logger.infoPair("Dropping row column from", "StackObjectThin table")
+        self.scratchDb.dropColumn("StackObjectThin", "row")
+
 
         # add indexes StackObjectThin
@@ -372 +378 @@
                 self.logger.errorPair('failed sql: ', sql)
                 raise
+
+
+            # we do not yet set bestdetection, this is a placeholder until we do
+            sql = "UPDATE StackObjectThin set bestDetection = 0"
+            try:
+                self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair('failed sql: ', sql)
+                raise
+
 
         self.tablesToExport.append("StackObjectThin")
@@ -756 +772 @@
 
         minRadius = 1
-        maxRadius = 10
+        maxRadius = 9
         if tablename == 'StackApFlx':
             minRadius = 3
@@ -765 +781 @@
 
         sqlLine = sqlUtility("UPDATE " + tablename + " SET")
-        for radius in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]:
+        for radius in [1, 2, 3, 4, 5, 6, 7, 8, 9]:
             if radius < minRadius: continue
             if radius > maxRadius: continue
@@ -821 +837 @@
         sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET AND  " + psfCondition)
 
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql", sql)
+            raise
         # instrumental flux, AB mags, Jy:
         # flux_inst = cts / sec
@@ -843 +861 @@
             sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
         sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID AND b.imageID = " + str(self.imageIDs[filter]) )
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql",sql)
+            raise
     '''
     Populates the StackToImage table
@@ -950 +970 @@
 
     def generateStackDetectRowIDsAndPspsUniqueIDs(self):
-        sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \
-        (select @r:=0) r, StackObjectThin t) as foo using (objID) set \
-        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum), \
-        uniquePspsSTid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)";
+#        sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \
+#        (select @r:=0) r, StackObjectThin t) as foo using (objID) set \
+#        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum), \
+#        uniquePspsSTid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)";
+        sql = "UPDATE StackObjectThin set uniquePspsSTid = (("+str(self.batchID)+"*1000000000 ) + row)"
+
         try: self.scratchDb.execute(sql)
         except:
@@ -1010 +1032 @@
             self.scratchDb.addColumn(table, filter + "haveData", "tinyint")
 
-        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, "
+        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, StackDetectRowID, "
 
         for i in range(len(self.filters)):
@@ -1016 +1038 @@
             fields += filter + "ippDetectID, "
             fields += filter + "stackDetectID, "
+#            fields += filter + "StackDetectRowID, " 
             fields += filter + "stackMetaID " # careful here: do not add comma to last entry
             if (i < len(self.filters) - 1):
                 fields += ", "
 
-        if (table == "StackObjectAttributes"):
-            fields += ", stackDetectRowID "
+        #if (table == "StackObjectAttributes"):
+        #    fields += ", stackDetectRowID "
         sql  = "INSERT INTO " + table + " (" + fields + ") "
         sql += "SELECT " + fields + " FROM " + mainTable