Changeset 38969

Timestamp:

Oct 27, 2015, 2:18:38 PM (11 years ago)

Author:

watersc1

Message:

Set of changes to attempt to enable the forced galaxy code to operate.

Location:

trunk/ippToPsps/jython

Files:

• Makefile.am (modified) (1 diff)
• ipptopspsdb.py (modified) (2 diffs)
• loader.py (modified) (2 diffs)
• metrics.py (modified) (4 diffs)
• pollOdm.py (modified) (2 diffs)
• queue.py (modified) (1 diff)

trunk/ippToPsps/jython/Makefile.am

@@ -23 +23 @@
   forcedobjectbatch.py \
   forcedwarpbatch.py \
+  forcedgalaxybatch.py \
   gpc1db.py \
   initbatch.py \

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1104 +1104 @@
         ,queue_FW \
         ,queue_FO \
+        ,queue_FG \
         ,parallel \
         ,P2_smf_version \
@@ -1180 +1181 @@
         if rs.getInt(24) == 1: self.skychunk.batchTypes.append("FW")
         if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FO")
+        if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FG")
 
         self.skychunk.force = True # TODO

trunk/ippToPsps/jython/loader.py

@@ -29 +29 @@
 from forcedwarpbatch import ForcedWarpBatch 
 from forcedobjectbatch import ForcedObjectBatch
+from forcedgalaxybatch import ForcedGalaxyBatch
 #
 #
@@ -291 +292 @@
                             id,
                             batchID)
+
+                elif batchType == "FG":
+                    batch = ForcedGalaxyBatch(self.logger,
+                                              self.config,
+                                              self.skychunk,
+                                              self.gpc1Db,
+                                              self.ippToPspsDb,
+                                              self.scratchDb,
+                                              id,
+                                              batchID)
                     
                 batch.run()

trunk/ippToPsps/jython/metrics.py

@@ -52 +52 @@
             rateFW = self.printStats("FW")
             rateFO = self.printStats("FO")
+            rateFG = self.printStats("FG")
             self.logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
         
@@ -74 +75 @@
             pendFWProcessed = self.printTableRow(stages, "FW")
             pendFOProcessed = self.printTableRow(stages, "FO")
+            pendFGProcessed = self.printTableRow(stages, "FG")
             self.writeTableSeparator(colCount)
 
@@ -90 +92 @@
             except: pass
             try: self.logger.infoPair("Estimated time for FOs", "%.1f hours" % (pendFOProcessed / rateFO)) 
+            except: pass
+            try: self.logger.infoPair("Estimated time for FGs", "%.1f hours" % (pendFGProcessed / rateFG)) 
             except: pass
        
@@ -102 +106 @@
             self.plot.createDensityPlot("FW", True)
             self.plot.createDensityPlot("FO", True)
+            self.plot.createDensityPlot("FG", True)
             # some clean-up before going to sleep
             self.ippToPspsDb.purgeDeadClients()

trunk/ippToPsps/jython/pollOdm.py

@@ -42 +42 @@
         else: self.stages = [self.STAGE]
 
-        if self.BATCHTYPE == "all": self.batchTypes = ['IN', 'P2', 'ST', 'OB', 'DF', 'DO', 'FW', 'FO']
+        if self.BATCHTYPE == "all": self.batchTypes = ['IN', 'P2', 'ST', 'OB', 'DF', 'DO', 'FW', 'FO', 'FG']
         else: self.batchTypes = [self.BATCHTYPE]
 
@@ -126 +126 @@
     '''
     def printUsage(self):
-        super(PollOdm, self).printUsage("<IN|P2|ST|OB|DF|DO|FW|FO|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
+        super(PollOdm, self).printUsage("<IN|P2|ST|OB|DF|DO|FW|FO|FG|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
     
     

trunk/ippToPsps/jython/queue.py

@@ -73 +73 @@
 
                 # for object-like batches, info comes from dvo
-                if (batchType == "OB" or batchType =="DO" or batchType =="FO"):
+                if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType = "FG"):
                     self.dvoObjects.setSkyArea(
                             self.skychunk.minRa,