Changeset 36826 for branches/eam_branches/ipp-20140423/ippToPsps/jython/loader.py

Timestamp:

Jun 7, 2014, 5:36:39 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140423/ippToPsps/jython/loader.py (modified) (4 diffs)

branches/eam_branches/ipp-20140423/ippToPsps/jython/loader.py

@@ -182 +182 @@
                             # XXXX EAM : in parallel model, this should happen for all P2 & Stack batches
                             # 
-                            if (batchType == 'P2' or batchType == 'ST') and smfsPerGB > 30:
+                            if (batchType == 'P2' or batchType == 'ST' or batchType == 'DF' or batchType == 'FW') and smfsPerGB > 30:
                                 if not self.dvoDetections.sync():
                                     self.logger.errorPair("Could not sync DVO with MySQL", "skipping")
@@ -234 +234 @@
         # loop round IDs of all items to be processed
         self.ippToPspsDb.lockBatchTable()
-        self.logger.infoPair("heather:","lockbatchtable")
+        #self.logger.infoPair("heather:","lockbatchtable")
         unattemptedCount = 0
         for id in ids:
-            self.logger.infoPair("heather:","in ids")
-            self.logger.infoPair("heather:id",str(id))
+            #self.logger.infoPair("heather:","in ids")
+            #self.logger.infoPair("heather:id",str(id))
             batchID = self.ippToPspsDb.createNewBatch(batchType, id)
-            self.logger.infoPair("heather:","creatednewbatch")
-            self.logger.infoPair("heather:batchId", str(batchID))
+            #self.logger.infoPair("heather:","creatednewbatch")
+            #self.logger.infoPair("heather:batchId", str(batchID))
             if batchID < 0: 
                 unattemptedCount += 1
                 continue
-            self.logger.infoPair("heather:","passed logic")
+            #self.logger.infoPair("heather:","passed logic")
             self.ippToPspsDb.unlockTables()
-            self.logger.infoPair("heather:","unlock table")
+            #self.logger.infoPair("heather:","unlock table")
             self.ippToPspsDb.deletePendingItem(batchType, id)
-            self.logger.infoPair("heather:","deleted pending item")
+            #self.logger.infoPair("heather:","deleted pending item")
 
             # catch any raised exceptions in batch constructors
             try:
                 if batchType == "P2":
+                    self.logger.infoPair("defining P2 batch for cam_id:",id)
                     batch = DetectionBatch(self.logger,
                             self.config,
@@ -264 +265 @@
                             useFullTables)
                 elif batchType == "ST":
+                    self.logger.infoPair("defining ST batch for sky_id:",id)
                     batch = StackBatch(self.logger,
                             self.config,
@@ -285 +287 @@
                             useFullTables)
     
+                elif batchType == "DF":
+                    batch = DiffBatch(self.logger,
+                            self.config,
+                            self.skychunk,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+    
+                elif batchType == "DO":
+                    batch = DiffObjectBatch(self.logger,
+                            self.config,
+                            self.skychunk,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+    
+                elif batchType == "FW":
+                    batch = ForcedWarpBatch(self.logger,
+                            self.config,
+                            self.skychunk,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+    
+                elif batchType == "FO":
+                    batch = ForcedObjectBatch(self.logger,
+                            self.config,
+                            self.skychunk,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+                    
                 batch.run()