Changeset 31285 for trunk/ippToPsps

Timestamp:

Apr 14, 2011, 3:16:26 PM (15 years ago)

Author:

rhenders

Message:

Changes to make it work with changes in superclass

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (7 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -6 +6 @@
 from batch import Batch
 
+import logging.config
+
+'''
+DetectionBatch class
+'''
 class DetectionBatch(Batch):
 
@@ -11 +16 @@
     Constructor
     '''
-    def __init__(self):
+    def __init__(self, logger, expID, inputFile):
        super(DetectionBatch, self).__init__(
+               logger,
                "detection", 
-               "detdemo.fits", 
-               "detection.fits",
-               "localhost",
-               "ipptopsps_scratch",
-               "ipp",
-               "ipp",
-               "3PI") # TODO
+               inputFile, 
+               "ThreePi") # TODO
 
+       self.logger.info("DetectionBatch constructor. Creating batch from: '" + inputFile + "'")
 
+       # create an output filename, which is {expID}.FITS
+       self.outputFitsFile = "%08d.FITS" % expID
+       self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
 
-    '''
-    Updates a table with stackMetaID
-    '''
-    def updateStackMetaID(self, table):
-
-        sql = "UPDATE " + table + "  SET stackMetaID=" + self.header['STK_ID']
-        self.stmt.execute(sql)
-
-    '''
-    Updates a table with stackTypeID grabbed from FitModel init table
-    '''
-    def updateStackTypeID(self, table):
-
-        sql = "UPDATE "+table+" AS a, StackType AS b SET a.stackTypeID=b.stackTypeID WHERE b.name = '"+self.header['STK_TYPE']+"'"
-        self.stmt.execute(sql)
 
     '''
@@ -81 +71 @@
         ," + self.header['PC002002'] + " \
         )"
-        self.stmt.execute(sql)
+        self.localStmt.execute(sql)
 
         self.updateSurveyID("ImageMeta")
@@ -106 +96 @@
                       FROM XY%d%d_psf" % (x, y)
 
-               self.stmt.execute(sql)
+               self.localStmt.execute(sql)
 
 
@@ -133 +123 @@
 
     '''
+    Updates provided table with DVO IDs from DVO table
+    '''
+    def updateDvoIDs(self, table):
+
+        self.logger.info("Updating table '" + table + "' with DVO IDs...")
+        sql = "UPDATE " + table + " AS a, dvo AS b SET \
+               a.ippObjID = b.ippObjID, \
+               a.detectID = b.detectID, \
+               a.objID = b.objID \
+               WHERE a.ippDetectID = b.ippDetectID"
+        self.localStmt.execute(sql)
+        self.logger.info("...done")
+
+
+    '''
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
     '''
@@ -140 +145 @@
         self.filter = self.header['FILTERID']
         self.filter = self.filter[0:1]
-        print "filter = ", self.filter
 
         #self.populateStackMeta()
@@ -147 +151 @@
         #self.populateStackApFlx()
 
-    
-detectionBatch = DetectionBatch()
+        self.getIDsFromDVO("33", "8345290") # TODO need to get sourceID and imageID from chip header
+        self.updateDvoIDs("Detection")
+        self.setMinMaxObjID("Detection")
+
+
+
+logging.config.fileConfig("logging.conf")
+logger = logging.getLogger("detectionbatch")
+logger.info("Starting")
+
+expID = 230033;
+inputFile = "detdemo.fits" 
+detectionBatch = DetectionBatch(logger, expID, inputFile)
 detectionBatch.createEmptyPspsTables()
 detectionBatch.importIppTables("XY33\.psf")
 detectionBatch.populatePspsTables()
 detectionBatch.exportPspsTablesToFits()
+detectionBatch.exportPspsTablesToFits()
+detectionBatch.writeBatchManifest()
+detectionBatch.reportNullsInAllPspsTables(False)
+
+