Changeset 35079

Timestamp:

Jan 31, 2013, 10:47:23 PM (13 years ago)

Author:

eugene

Message:

do not limit to XY33 on test (or we cannot test SAS...); restrict select for detection calib to current image ID

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py (modified) (3 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py

@@ -76 +76 @@
        self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
 
-       # if test mode
-       if self.config.test:
-           self.startX = 3
-           self.endX = 4
-           self.startY = 3
-           self.endY = 4
-       else:
-           self.startX = 0
-           self.endX = 8
-           self.startY = 0
-           self.endY = 8
+       self.startX = 0
+       self.endX = 8
+       self.startY = 0
+       self.endY = 8
 
        #self.startX = 1
@@ -588 +581 @@
         except: pass
 
+        externID = self.imageIDs[ota]
+
+        imageID = self.scratchDb.getImageIDFromExternID(externID)
+        self.logger.infoPair("obtained","imageID")
+
         dumpFile = "/tmp/datadump/genetest.xx.dat"
         files = glob.glob(dumpFile)
@@ -614 +612 @@
          JOIN " + self.scratchDb.dvoDetectionTable + " as b \
          ON (a.objID = b.objID AND a.detectID = b.detectID) \
-         INTO OUTFILE '" + dumpFile + "'"
+         WHERE b.imageID = " + str(imageID) + 
+         " INTO OUTFILE '" + dumpFile + "'"
         print "sql: ", sql
         self.scratchDb.execute(sql)