Changeset 36697 for trunk/ippToPsps/jython/loader.py

Timestamp:

Apr 25, 2014, 3:40:27 PM (12 years ago)

Author:

heather

Message:

first set of changes for new pv2 schema

File:

• trunk/ippToPsps/jython/loader.py (modified) (2 diffs)

trunk/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")
@@ -285 +285 @@
                             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()