Changeset 39922 for branches/czw_branch/20160809/ippToPsps/jython/loader.py

Timestamp:

Jan 6, 2017, 11:16:30 AM (10 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/czw_branch/20160809/ippToPsps/jython/loader.py (modified) (2 diffs)

branches/czw_branch/20160809/ippToPsps/jython/loader.py

@@ -30 +30 @@
 from forcedobjectbatch import ForcedObjectBatch
 from forcedgalaxybatch import ForcedGalaxyBatch
+from gaiaobjectbatch import GaiaObjectBatch
+
 #
 #
@@ -302 +304 @@
                                               id,
                                               batchID)
+                elif batchType == "GO":
+                    batch = GaiaObjectBatch(self.logger,
+                                              self.config,
+                                              self.skychunk,
+                                              self.gpc1Db,
+                                              self.ippToPspsDb,
+                                              self.scratchDb,
+                                              id,
+                                              batchID)
                     
                 batch.run()