Changeset 38816

Timestamp:

Oct 7, 2015, 12:05:17 PM (11 years ago)

Author:

eugene

Message:

change XstackMetaID to XstackImageID; change diffMetaID to diffImageID

Location:

trunk/ippToPsps/jython

Files:

• diffbatch.py (modified) (3 diffs)
• stackbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -205 +205 @@
         sqlLine = sqlUtility("INSERT INTO DiffMeta_"+str(num)+" (")
 
-        sqlLine.group("diffMetaID",            str(diffSkyFileID));
+        sqlLine.group("diffImageID",           str(diffSkyFileID));
         sqlLine.group("difftypeID",            self.difftypeID[num]);
         sqlLine.group("posImageID",            self.posImageID[num]);
@@ -274 +274 @@
 
         sqlLine.group("ippDetectID",     "IPP_IDET")
-        sqlLine.group("diffDetMetaID",            str(diffSkyFileID));                                                
+        sqlLine.group("diffImageID",     str(diffSkyFileID));                                                
 
         sqlLine.group("randomDiffID",     "RAND("+str(self.batchID)+")")                       
@@ -416 +416 @@
         for imageID in imageIDs:
 
-            sql = "INSERT INTO DiffToImage_"+str(num)+" (diffMetaID, imageID) \
+            sql = "INSERT INTO DiffToImage_"+str(num)+" (diffImageID, imageID) \
             VALUES (\
             " + str(diffSkyFileID) + ", " + imageID + ")"

trunk/ippToPsps/jython/stackbatch.py

@@ -248 +248 @@
         sqlLine = sqlUtility("INSERT INTO " + tablename + " (")
 
-        sqlLine.group("stackMetaID",   str(stackID))        
+        sqlLine.group("stackImageID",  str(stackID))        
         sqlLine.group("batchID",       str(self.batchID))
         sqlLine.group("surveyID",      str(self.surveyID))
@@ -333 +333 @@
             # NOTE: filter:ippDetectID (eg, gippDetectID) are inserted in selectDvoObjIDs()
             sqlLine.group("a."+filter+"stackDetectID", "b.detectID")    # eg, gstackDetectID (from dvo.measure.extID)
-            sqlLine.group("a."+filter+"stackMetaID",    str(stackID))   # eg, gstackMetaID (from cmf.IMAGEID)
+            sqlLine.group("a."+filter+"stackImageID",  str(stackID))    # eg, gstackImageID (from cmf.IMAGEID)
 
             sqlLine.group("a.dvoRegionID",             "b.catID")       # this is not filter dependent, but is re-written for each filter (if data exists)
@@ -996 +996 @@
         for filter in self.filters:
             
-            stackmetaID = self.stackIDs[filter]
-            if stackmetaID > 0:
+            stackImageID = self.stackIDs[filter]
+            if stackImageID > 0:
     
-                imageIDs = self.gpc1Db.getImageIDsForThisStackID(stackmetaID)
+                imageIDs = self.gpc1Db.getImageIDsForThisStackID(stackImageID)
 
                 for imageID in imageIDs:
 
-                    sql = "INSERT INTO StackToImage (stackMetaID, imageID) \
+                    sql = "INSERT INTO StackToImage (stackImageID, imageID) \
                    VALUES (\
-                   " + str(stackmetaID) + ", " + imageID + ")"
+                   " + str(stackImageID) + ", " + imageID + ")"
                     self.scratchDb.execute(sql)
 
                     # now update StackMeta with correct number of inputs
-                    sql = "UPDATE "+filter+"StackMeta SET nP2Images = (SELECT COUNT(distinct(floor(imageID/100))) FROM StackToImage where stackMetaID = "+str(stackmetaID)+")"
+                    sql = "UPDATE "+filter+"StackMeta SET nP2Images = (SELECT COUNT(distinct(floor(imageID/100))) FROM StackToImage where stackImageID = "+str(stackImageID)+")"
                     self.scratchDb.execute(sql)
 
@@ -1192 +1192 @@
             fields += filter + "stackDetectID, "
 #            fields += filter + "StackDetectRowID, " 
-            fields += filter + "stackMetaID " # careful here: do not add comma to last entry
+            fields += filter + "stackImageID " # careful here: do not add comma to last entry
             if (i < len(self.filters) - 1):
                 fields += ", "