Changeset 39099 for trunk

Timestamp:

Nov 10, 2015, 3:29:51 PM (11 years ago)

Author:

eugene

Message:

add stack FILTER epoch values; add ObjectThin.epochMean

Location:

trunk/ippToPsps/jython

Files:

• objectbatch.py (modified) (1 diff)
• stackbatch.py (modified) (7 diffs)

trunk/ippToPsps/jython/objectbatch.py

@@ -428 +428 @@
         sqlLine.group("raMean",          "RA_MEAN")
         sqlLine.group("decMean",         "DEC_MEAN")
+        sqlLine.group("epochMean",       "EPOCH_MEAN")
         sqlLine.group("raMeanErr",       "RA_ERR")
         sqlLine.group("decMeanErr",      "DEC_ERR")

trunk/ippToPsps/jython/stackbatch.py

@@ -64 +64 @@
        self.headerSet = {}
        self.md5sum = {}
+       self.stackEpochs = {}
 
        # we have two sets of imageIDs here:
@@ -113 +114 @@
            self.logger.infoPair(filter + " imageID = ", imageID)       
            self.imageIDs[filter] = imageID
+
+           self.stackEpochs[filter] = self.getKeyFloat(header, "%.10f", 'MJD-OBS')
 
            ## MEH -- md5sum test
@@ -374 +377 @@
             self.logger.infoPair("selecting imageID", imageID)
 
+            stackEpoch = self.stackEpochs[filter]
+
             # at this point, the StackObjectThin table includes objID and ippObjID
 
@@ -390 +395 @@
             sqlLine.group("a."+filter+"ra",            "b.ra")
             sqlLine.group("a."+filter+"dec",           "b.dec_")
+
+            sqlLine.group("a."+filter+"Epoch",         str(stackEpoch))
 
             sqlLine.group("a."+filter+"PSFMag",        "b.Mpsf")
@@ -1351 +1358 @@
         sql = "insert into StackObjectThin (objID, ippDetectID, ippObjID) select distinct objID, ippDetectID, ippObjID from dvoDetectionFull " + whereClause;
 
+        self.logger.debugPair("sql 1", sql)
         self.scratchDb.execute(sql)
 
@@ -1361 +1369 @@
               , processingVersion = '" + str(self.skychunk.processingVersion)  +"'"
               
+        self.logger.debugPair("sql 2", sql)
         self.scratchDb.execute(sql)
 
@@ -1366 +1375 @@
 
         for filter in self.filters:
-            sql = "update StackObjectThin join "+self.scratchDb.dvoDetectionTable +" using (objID, ippDetectID) set "+filter+"ippDetectID = ippDetectID \
+            if self.stackIDs[filter] <= 0: continue # stackIDs[filter] not set if we do not have the data
+
+            imageID = self.imageIDs[filter]
+
+            sql = "update StackObjectThin join "+self.scratchDb.dvoDetectionTable +" using (objID, ippObjID, ippDetectID) set "+filter+"ippDetectID = ippDetectID \
                   where " + self.scratchDb.dvoDetectionTable + ".imageID = " + str(imageID)
+
+            self.logger.debugPair("sql f", sql)
             self.scratchDb.execute(sql)