Changeset 34902 for branches/eam_branches/ipp-20121219/ippToPsps/jython

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)
• ippToPsps/jython/gpc1db.py (modified) (2 diffs)
• ippToPsps/jython/stackbatch.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)

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

@@ -61 +61 @@
                    JOIN rawExp USING (exp_id) \
                    JOIN mergedvodbRun using (minidvodb_id) \
+                   JOIN mergedvodbProcessed using (merge_id) \
                    WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND mergedvodbRun.state = 'full' \
                    AND minidvodbProcessed.fault = 0 \
+                   AND mergedvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
@@ -77 +79 @@
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
+                   JOIN mergedvodbRun USING(minidvodb_id) \
+                   JOIN mergedvodbProcessed USING (merge_id) \
                    JOIN  stackRun USING(stack_id) JOIN skycell USING(skycell_id) \
-                   WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
+                   WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND minidvodbProcessed.fault = 0 \
+                   AND mergedvodbRun.state = 'full' \
+                   AND mergedvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
                    AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
                    AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) 
-
+            
         try:
             rs = self.executeQuery(sql)

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()