Changeset 35369 for branches/eam_branches/ipp-20130307/ippToPsps/jython/detectionbatch.py

Timestamp:

Apr 5, 2013, 6:16:49 AM (13 years ago)

Author:

eugene

Message:

fix test for imageID in dvo

File:

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

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

@@ -681 +681 @@
         # store these for later
         self.imageIDs[chipname] = header['IMAGEID']
+        self.sourceIDs[chipname] = header['SOURCEID']
             
         # populate ImageMeta
@@ -702 +703 @@
         # dictionary objects to hold imageIDs for later
         self.imageIDs = {}
+        self.sourceIDs = {}
 
         # loop through all OTAs and populate ImageMeta extensions
@@ -791 +793 @@
 
         # does this chip exist in the DVO image table (if NOT, then skip it)
-        if not self.scratchDb.haveThisChip(self.imageIDs[chipname]):
+        if not self.scratchDb.haveThisChip(self.imageIDs[chipname], self.sourceIDs[chipname]):
             self.logger.info("| %5s |            ------------- Chip not in DVO : rejecting ------------                    |" % chipname)
             return False