Changeset 34902 for branches/eam_branches/ipp-20121219/ippToPsps/jython/stackbatch.py

Timestamp:

Jan 10, 2013, 11:33:10 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/stackbatch.py (modified) (2 diffs)

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

@@ -93 +93 @@
        self.scratchDb.dropTable("StackToImage")
        self.scratchDb.dropTable("SkinnyObject")
-       self.scratchDb.dropTable("ObjectCalColor")
+       #self.scratchDb.dropTable("ObjectCalColor")
        self.scratchDb.dropTable("StackDetectionCalib")
 
@@ -828 +828 @@
         self.populateSkinnyObject()
         #self.logger.infoPair("populating","ObjectCalColor") 
-        self.populateObjectCalColor()
+        #self.populateObjectCalColor()
         #self.logger.infoPair("populating","StackDetectionCalib") 
         self.populateStackDetectionCalib()