Changeset 37186 for branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

Timestamp:

Aug 4, 2014, 4:48:50 PM (12 years ago)

Author:

eugene

Message:

rename stack tables for consistency and clariy

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py (modified) (11 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

@@ -157 +157 @@
 
        self.dropTableVerbose("StackObjectThin")
-       self.dropTableVerbose("StackObjectExtra")
+       self.dropTableVerbose("StackObjectRaw")
        
-       self.dropTableVerbose("StackApFlx")
-       
-       self.dropTableVerbose("StackModelFitThin")
+       self.dropTableVerbose("StackModelFitExtra")
        self.dropTableVerbose("StackModelFitDeV")
        self.dropTableVerbose("StackModelFitExp")
        self.dropTableVerbose("StackModelFitSer")
-       self.dropTableVerbose("StackModelFitPet")
-       self.dropTableVerbose("StackModelFitFlx")
-       self.dropTableVerbose("StackModelFitFlxC1")
-       self.dropTableVerbose("StackModelFitFlxC2")
+
+       self.dropTableVerbose("StackApFlx")
+       self.dropTableVerbose("StackApFlxFull")
+       self.dropTableVerbose("StackApFlxFullC1")
+       self.dropTableVerbose("StackApFlxFullC2")
+
+       self.dropTableVerbose("StackPetrosian")
 
        self.dropTableVerbose("StackToImage")
@@ -370 +371 @@
 
     '''
-    Populates the StackObjectExtra table
-    '''
-    def populateStackObjectExtra(self):
-
-        tablename = "StackObjectExtra"
+    Populates the StackObjectRaw table
+    '''
+    def populateStackObjectRaw(self):
+
+        tablename = "StackObjectRaw"
 
         self.logger.infoPair("Procesing table", tablename)
@@ -380 +381 @@
 
         # if we are going to add a key, do it here so it is useful
-        # self.scratchDb.createIndex("StackObjectExtra", "objID") 
+        # self.scratchDb.createIndex(tablename, "objID") 
 
         self.logger.infoPair("inserting filter dependent cmf items into", tablename)
@@ -462 +463 @@
 
     '''
-    Populates the StackModelFitThin table
-    '''
-    def populateStackModelFitThin(self):
-
-        self.logger.infoPair("Procesing table", "StackModelFitThin")
-        self.insertDvoIDs("StackModelFitThin", "StackObjectThin")
+    Populates the StackModelFitExtra table
+    '''
+    def populateStackModelFitExtra(self):
+
+        self.logger.infoPair("Procesing table", "StackModelFitExtra")
+        self.insertDvoIDs("StackModelFitExtra", "StackObjectThin")
 
         # if we are going to add a key, do it here so it is useful
-        # self.scratchDb.createIndex("StackObjectExtra", "objID") 
+        # self.scratchDb.createIndex(tablename, "objID") 
 
         # currently, none of the fields defined by the table are generated
@@ -560 +561 @@
 
     '''
-    Populates the StackModelFitPet table, mainly from dictionary values found in IPP FITS header
+    Populates the StackPetrosian table, mainly from dictionary values found in IPP FITS header
     '''
     def populateStackPetrosian(self):
 
-        tablename = "StackModelFitPet"
+        tablename = "StackPetrosian"
 
         self.logger.infoPair("Procesing table", tablename)
@@ -579 +580 @@
 
     '''
-    Populates the StackModelFitPet table, mainly from dictionary values found in IPP FITS header
+    Populates the StackPetrosian table, mainly from dictionary values found in IPP FITS header
     '''
     def populateStackPetrosianFilter(self, filter):
@@ -588 +589 @@
 
         self.logger.infoPair("Adding", "petrosians for extended sources")
-        sqlLine = sqlUtility("UPDATE StackModelFitPet AS a, " + filter + "SkyChip_xsrc AS b SET")
+        sqlLine = sqlUtility("UPDATE StackPetrosian AS a, " + filter + "SkyChip_xsrc AS b SET")
 
         sqlLine.group("a."+filter+"haveData",         "'1'")
@@ -610 +611 @@
     Populates the StackApFlx table
     '''
-    def populateStackApFlxThin(self):
+    def populateStackApFlx(self):
 
         tablename = "StackApFlx"
@@ -629 +630 @@
 
     '''
-    Populates the StackApFlx table
-    '''
-    def populateStackApFlx(self, version):
-
-        tablename = "StackModelFitFlx" + version
+    Populates the StackApFlxFull table
+    '''
+    def populateStackApFlxFull(self, version):
+
+        tablename = "StackApFlxFull" + version
 
         self.logger.infoPair("Procesing table", tablename)
@@ -965 +966 @@
         self.populateStackObjectThin()
 
-        self.populateStackObjectExtra()
+        self.populateStackObjectRaw()
 
         if self.stackType != "NIGHTLY_STACK":
 
-            self.logger.infoPair("populating ","StackModelFitThin")
-            self.populateStackModelFitThin()
+            self.logger.infoPair("populating ","StackModelFitExtra")
+            self.populateStackModelFitExtra()
 
             self.logger.infoPair("populating ","StackModelFit")
@@ -980 +981 @@
 
             self.logger.infoPair("populating ","StackApFlx Tables")
-            self.populateStackApFlxThin()
-
-            self.populateStackApFlx("")
-            self.populateStackApFlx("C1")
-            self.populateStackApFlx("C2")
+            self.populateStackApFlx()
+
+            self.populateStackApFlxFull("")
+            self.populateStackApFlxFull("C1")
+            self.populateStackApFlxFull("C2")
 
         # delete rows with no content. for the other tables, this is done in