Changeset 31113

Timestamp:

Apr 1, 2011, 10:35:15 PM (15 years ago)

Author:

rhenders

Message:

Using new log() method in base class; changed ambiguous method name from process to populatePspsTables

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (11 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -160 +160 @@
     '''
     def populateStackMeta(self):
-        print "Procesing StackMeta table";
+        self.log("Procesing StackMeta table")
 
         sql = "INSERT INTO StackMeta (\
@@ -197 +197 @@
         ," + self.header['PC002002'] + " \
         )"
-        print sql
         self.stmt.execute(sql)
 
@@ -208 +207 @@
     '''
     def populateStackDetection(self):
-        print "Procesing StackDetection table";
+        self.log("Procesing StackDetection table")
 
         # insert all the detections
@@ -266 +265 @@
     '''
     def populateStackApFlx(self):
-        print "Procesing StackApFlx table";
+        self.log("Procesing StackApFlx table")
  
         sql = "INSERT INTO StackApFlx \
@@ -275 +274 @@
         self.stmt.execute(sql)
 
-        print "    Adding 1st convolved fluxes"
+        self.log("    Adding 1st convolved fluxes")
         self.updateApFlxs("c1", "< 7.0")
-        print "    Adding 2nd convolved fluxes"
+        self.log("    Adding 2nd convolved fluxes")
         self.updateApFlxs("c2", "> 7.0")
 
-        print "    Adding petrosian stuff for extended sources"
+        self.log("    Adding petrosian stuff for extended sources")
         sql = "UPDATE StackApFlx AS a, SkyChip_xsrc AS b SET \
         petRadius=b.PETRO_RADIUS \
@@ -311 +310 @@
     '''
     def populateStackModelFit(self):
-        print "Procesing StackModelFit table";
+        self.log("Procesing StackModelFit table")
 
         # insert all the detections
@@ -318 +317 @@
 
         # populate model parameters
-        print "    Adding deVaucouleurs fit"
+        self.log("    Adding deVaucouleurs fit")
         self.updateModelFit("deV", "PS_MODEL_DEV")
-        print "    Adding exponential fit"
+        self.log("    Adding exponential fit")
         self.updateModelFit("exp", "PS_MODEL_EXP")
-        print "    Adding sersic fit"
+        self.log("    Adding sersic fit")
         self.updateModelFit("ser", "PS_MODEL_SERSIC")
 
@@ -336 +335 @@
     def indexPspsTables(self):
 
-        print "Creating indexes on PSPS tables"
+        self.log("Creating indexes on PSPS tables")
         self.createIndex("StackDetection", "ippDetectID")
         self.createIndex("StackApFlx", "ippDetectID")
@@ -346 +345 @@
     def indexIppTables(self):
 
-        print "Creating indexes on IPP tables"
+        self.log("Creating indexes on IPP tables")
         self.createIndex("SkyChip_psf", "IPP_IDET")
         self.createIndex("SkyChip_xfit", "IPP_IDET")
@@ -355 +354 @@
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
     '''
-    def process(self):
+    def populatePspsTables(self):
 
         # determine skycell from header value
@@ -374 +373 @@
 stackBatch.createEmptyPspsTables()
 #stackBatch.importIppTables()
-stackBatch.process()
+stackBatch.populatePspsTables()
 stackBatch.exportPspsTablesToFits()