Changeset 33530 for trunk/ippToPsps

Timestamp:

Mar 15, 2012, 11:47:55 AM (14 years ago)

Author:

rhenders

Message:

now not using source_id in detection table; fixed by with dataRelease - trying to use as class variable, but it is a config field now

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -82 +82 @@
        #self.expTime = gpc1Db.getStackExpTime(self.id)
        self.expTime = self.header['EXPTIME']
-
-       self.logger.infoPair("Got exp time of %d" % self.expTime)
 
        # delete PSPS tables
@@ -285 +283 @@
         " + str(self.id) + " \
         ," + self.skycell + " \
-        ," + str(self.scratchDb.getPhotoCalID(self.header['SOURCEID'], self.header['IMAGEID'])) + " \
+        ," + str(self.scratchDb.getPhotoCalID(self.header['IMAGEID'])) + " \
         ," + self.header['FPA.ZP'] + " \
-        ," + str(self.expTime) + " \
+        ," + self.expTime + " \
         ,'" + self.safeDictionaryAccess(self.header, 'PSFMODEL') + "' \
         ,'" + self.safeDictionaryAccess(self.header, 'FWHM_MAJ') + "' \
@@ -502 +500 @@
         self.scratchDb.updateAllRows("StackModelFit", "surveyID", str(self.surveyID))
         self.scratchDb.updateFilterID("StackModelFit", self.filter)
-        self.scratchDb.updateAllRows("StackModelFit", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("StackModelFit", "dataRelease", str(self.config.dataRelease))
         self.scratchDb.updateAllRows("StackModelFit", "primaryF", "0")
         self.scratchDb.updateAllRows("StackModelFit", "activeFlag", "0")
@@ -567 +565 @@
 
         self.scratchDb.updateAllRows("SkinnyObject", "surveyID", str(self.surveyID))
-        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -587 +585 @@
 
         self.scratchDb.updateFilterID("ObjectCalColor", self.filter)
-        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("ObjectCalColor", "dataRelease", str(self.config.dataRelease))
 
 
@@ -621 +619 @@
     def updateDvoIDs(self, table):
 
-        imageID = self.scratchDb.getImageIDFromExternID(self.header['SOURCEID'], self.header['IMAGEID'])
+        imageID = self.scratchDb.getImageIDFromExternID(self.header['IMAGEID'])
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
         sql = "UPDATE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
@@ -628 +626 @@
                a.objID = b.objID \
                WHERE a.ippDetectID = b.ippDetectID \
-               AND b.sourceID = " + self.header['SOURCEID'] + "\
                AND b.imageID = " + str(imageID)
         self.scratchDb.execute(sql)