Changeset 34902 for branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.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/detectionbatch.py (modified) (2 diffs)

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

@@ -766 +766 @@
                 self.populateSkinnyObjectTable(ota)
                 #self.logger.info("updated skinnyobject")
-                self.populateObjectCalColorTable(ota)
+                #self.populateObjectCalColorTable(ota)
                 #self.logger.info("updated objectcalcolor")
                 self.populateDetectionCalibTable(ota)
@@ -775 +775 @@
                 self.tablesToExport.append("Detection_" + ota)
                 self.tablesToExport.append("SkinnyObject_" + ota)
-                self.tablesToExport.append("ObjectCalColor_" + ota)
+                #self.tablesToExport.append("ObjectCalColor_" + ota)
                 self.tablesToExport.append("DetectionCalib_" + ota)
                 tables.append("Detection_" + ota)