Changeset 39008

Timestamp:

Oct 29, 2015, 5:28:11 PM (11 years ago)

Author:

eugene

Message:

fix typos and other minor issues with forced galaxy stuff

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• dvoforcedgalaxy.py (modified) (1 diff)
• dvoforcedobjects.py (modified) (1 diff)
• forcedgalaxybatch.py (modified) (3 diffs)
• ipptopspsdb.py (modified) (1 diff)
• loader.py (modified) (3 diffs)

trunk/ippToPsps/jython/batch.py

@@ -696 +696 @@
         # for OB, this imports object data from DVO
         if not self.importIppTables():
-            if (self.batchType == "OB" or self.batchType =="DO" or self.batchType =="FO"):
+            if (self.batchType == "OB" or self.batchType =="DO" or self.batchType =="FO" or self.batchType =="FG"):
                 self.logger.errorPair("skipping this batch", "no dvo tables for this region")
                 self.ippToPspsDb.updateProcessed(self.batchID, 1)

trunk/ippToPsps/jython/dvoforcedgalaxy.py

@@ -25 +25 @@
 
         # declare DVO file types of interest
+        self.ingestFileTypes = ['cpt', 'cps', 'cpq']
         self.loadPhotcodes()
 

trunk/ippToPsps/jython/dvoforcedobjects.py

@@ -25 +25 @@
 
         # declare DVO file types of interest
+        self.ingestFileTypes = ['cpt', 'cps', 'cpy']
         self.loadPhotcodes()
 

trunk/ippToPsps/jython/forcedgalaxybatch.py

@@ -20 +20 @@
 from ipptopspsdb import IppToPspsDb
 from scratchdb import ScratchDb
+from dvoforcedgalaxy import DvoForcedGalaxy # need one specific for cpy.
 from sqlUtility import sqlUtility
 
@@ -65 +66 @@
         # create an output filename
         self.outputFitsFile = "%08d.FITS" % self.id
-        self.outputFitsPath = "%s/%s" & (self.localOutPath, self.outputFitsFile)
+        self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
 
         # dump stuff to log
@@ -76 +77 @@
         self.region = self.scratchDb.getRegionNameFromThisDvoIndex(self.id)
 #        self.ippToPspsDb.insertForcedSummaryMeta(self.batchID, self.region)
-        self.dvoForcedGalaxy.nativeInjectRegion(self.region)
+        self.dvoForcedGalaxy.nativeIngestRegion(self.region)
 
         cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1179 +1179 @@
         if rs.getInt(23) == 1: self.skychunk.batchTypes.append("DO")
         if rs.getInt(24) == 1: self.skychunk.batchTypes.append("FW")
+        if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FG")
         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

@@ -17 +17 @@
 from datastore import Datastore
 from batch import Batch
-from dvodetections import DvoDetections
+from dvo import Dvo
 
 from initbatch import InitBatch
@@ -102 +102 @@
         except: return ret
            
-        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
-#       self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+        self.dvo = Dvo(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
 
         return ret
@@ -173 +172 @@
                     if (batchType == "P2" or batchType == "ST" or batchType =="DF" or batchType == "FW"):
                         if self.config.resetDvo or not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
-                            if not self.dvoDetections.nativeIngestDetections(boxId, boxDim):
+                            if not self.dvo.nativeIngestDetections(boxId, boxDim):
                                 self.logger.error("Unable to ingest detections with nativeIngest")
                                 return False