Changeset 31253 for branches/czw_branch/20110406/ippToPsps/jython/stackbatch.py

Timestamp:

Apr 8, 2011, 6:31:08 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• ippToPsps/jython/stackbatch.py (modified) (14 diffs)

branches/czw_branch/20110406/ippToPsps/jython/stackbatch.py

@@ -7 +7 @@
 from gpc1db import Gpc1Db
 from batch import Batch
+import logging.config
 
 class StackBatch(Batch):
@@ -13 +14 @@
     Constructor
     '''
-    def __init__(self, skyID, inputFile):
+    def __init__(self, logger, skyID, inputFile):
        super(StackBatch, self).__init__(
+               logger,
                "stack", 
                inputFile, 
                "MD04") # TODO
 
-       self.log("StackBatch constructor. Creating batch from input file here: ''" + inputFile + "'")
+       self.logger.info("StackBatch constructor. Creating batch from: ''" + inputFile + "'")
 
        # obs time makes no sense except for nightly stacks
@@ -185 +187 @@
     '''
     def populateStackMeta(self):
-        self.log("Procesing StackMeta table")
+        self.logger.info("Procesing StackMeta table")
 
         sql = "INSERT INTO StackMeta (\
@@ -233 +235 @@
     '''
     def populateStackDetection(self):
-        self.log("Procesing StackDetection table")
+        self.logger.info("Procesing StackDetection table")
 
         # insert all the detections
@@ -297 +299 @@
     '''
     def populateStackApFlx(self):
-        self.log("Procesing StackApFlx table")
+        self.logger.info("Procesing StackApFlx table")
  
         sql = "INSERT INTO StackApFlx \
@@ -307 +309 @@
 
         # TODO temporarily loading 1st convolved fluxes into unconvolved fields
-        self.log("    Adding un-convolved fluxes")
+        self.logger.info("    Adding un-convolved fluxes")
         self.updateApFlxs("", "< 7.0")
-        self.log("    Adding 1st convolved fluxes")
+        self.logger.info("    Adding 1st convolved fluxes")
         self.updateApFlxs("c1", "< 7.0")
-        self.log("    Adding 2nd convolved fluxes")
+        self.logger.info("    Adding 2nd convolved fluxes")
         self.updateApFlxs("c2", "> 7.0")
 
-        self.log("    Adding petrosians for extended sources")
+        self.logger.info("    Adding petrosians for extended sources")
         sql = "UPDATE StackApFlx AS a, SkyChip_xsrc AS b SET \
         petRadius=b.PETRO_RADIUS \
@@ -337 +339 @@
     '''
     def populateStackModelFit(self):
-        self.log("Procesing StackModelFit table")
+        self.logger.info("Procesing StackModelFit table")
 
         # insert all the detections
@@ -344 +346 @@
 
         # populate model parameters
-        self.log("    Adding deVaucouleurs fit")
+        self.logger.info("    Adding deVaucouleurs fit")
         self.updateModelFit("deV", "PS_MODEL_DEV")
-        self.log("    Adding exponential fit")
+        self.logger.info("    Adding exponential fit")
         self.updateModelFit("exp", "PS_MODEL_EXP")
-        self.log("    Adding sersic fit")
+        self.logger.info("    Adding sersic fit")
         self.updateModelFit("ser", "PS_MODEL_SERSIC")
 
@@ -361 +363 @@
     '''
     def populateStackToImage(self):
-        self.log("Procesing StackToImage table")
+        self.logger.info("Procesing StackToImage table")
 
         sql = "INSERT INTO StackToImage (stackMetaID) VALUES (" + self.header['STK_ID'] + ")"
@@ -371 +373 @@
     def indexPspsTables(self):
 
-        self.log("Creating indexes on PSPS tables")
+        self.logger.info("Creating indexes on PSPS tables")
         self.createIndex("StackDetection", "ippDetectID")
         self.createIndex("StackApFlx", "ippDetectID")
@@ -381 +383 @@
     def indexIppTables(self):
 
-        self.log("Creating indexes on IPP tables")
+        self.logger.info("Creating indexes on IPP tables")
         self.createIndex("SkyChip_psf", "IPP_IDET")
         self.createIndex("SkyChip_xfit", "IPP_IDET")
@@ -391 +393 @@
     def fudgeIDs(self):
 
-        self.log("Creating bogus IDs on all detections")
+        self.logger.info("Creating bogus IDs on all detections")
 
         sql = "INSERT INTO dvo (ippDetectID) SELECT IPP_IDET FROM SkyChip_psf";
@@ -430 +432 @@
 
 
-sky_id = 299
-gpc1Db = Gpc1Db()
+logging.config.fileConfig("logging.conf")
+logger = logging.getLogger("stackbatch")
+sky_id = 299 # TODO
+gpc1Db = Gpc1Db(logger)
 cmfFiles = gpc1Db.getStackStageCmfs(sky_id)
 
@@ -437 +441 @@
 for file in cmfFiles:
 
-    stackBatch = StackBatch(sky_id, file)
+    stackBatch = StackBatch(logger, sky_id, file)
     
     stackBatch.createEmptyPspsTables()
-    #stackBatch.importIppTables("")
-    stackBatch.populatePspsTables()
-    stackBatch.fudgeIDs()
-    #stackBatch.reportNullsInAllPspsTables(False)
-    #stackBatch.replaceAllPspsNulls("-999")  
-    stackBatch.exportPspsTablesToFits()
-    stackBatch.writeBatchManifest()
+    stackBatch.importIppTables("")
+#    stackBatch.populatePspsTables()
+ #   stackBatch.fudgeIDs()
+  #  stackBatch.reportNullsInAllPspsTables(False)
+  #  stackBatch.replaceAllPspsNulls("-999")  
+  #  stackBatch.exportPspsTablesToFits()
+  #  stackBatch.writeBatchManifest()
+  #  stackBatch.createTarball()
+  #  stackBatch.publishToDatastore()
 
     i = i + 1