Index: branches/eam_branches/ipp-20140717/ippToPsps/config/tables.ST.vot
===================================================================
--- branches/eam_branches/ipp-20140717/ippToPsps/config/tables.ST.vot	(revision 37185)
+++ branches/eam_branches/ipp-20140717/ippToPsps/config/tables.ST.vot	(revision 37186)
@@ -464,6 +464,6 @@
     </TABLE>
 
-    <!-- StackObjecExtra Table ************************************************** -->
-    <TABLE name="StackObjectExtra">
+    <!-- StackObjectRaw Table ************************************************** -->
+    <TABLE name="StackObjectRaw">
       <DESCRIPTION>VOTable description of PSPS table StackObject</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
@@ -1589,7 +1589,7 @@
     </TABLE>
 
-    <!-- StackModelFitThin Table ************************************************** -->
-    <TABLE name="StackModelFitThin">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+    <!-- StackModelFitExtra Table ************************************************** -->
+    <TABLE name="StackModelFitExtra">
+      <DESCRIPTION>VOTable description of PSPS table StackModelFitExtra</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -1779,5 +1779,5 @@
     <!-- StackModelFitExp Table ************************************************** -->
     <TABLE name="StackModelFitExp">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+      <DESCRIPTION>VOTable description of PSPS table StackModelFitExp</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -2072,5 +2072,5 @@
     <!-- StackModelFitDeV Table ************************************************** -->
     <TABLE name="StackModelFitDeV">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+      <DESCRIPTION>VOTable description of PSPS table StackModelFitDeV</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -2365,5 +2365,5 @@
     <!-- StackModelFitSer Table ************************************************** -->
     <TABLE name="StackModelFitSer">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+      <DESCRIPTION>VOTable description of PSPS table StackModelFitSer</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -2686,7 +2686,7 @@
     </TABLE>
 
-    <!-- StackModelFitFlx Table ************************************************** -->
-    <TABLE name="StackModelFitFlx">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+    <!-- StackApFlxFull Table ************************************************** -->
+    <TABLE name="StackApFlxFull">
+      <DESCRIPTION>VOTable description of PSPS table StackApFlxFull</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -3369,7 +3369,7 @@
     </TABLE>
 
-    <!-- StackModelFitFlxC1 Table ************************************************** -->
-    <TABLE name="StackModelFitFlxC1">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+    <!-- StackApFlxFullC1 Table ************************************************** -->
+    <TABLE name="StackApFlxFullC1">
+      <DESCRIPTION>VOTable description of PSPS table StackApFlxFullC1</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -4052,7 +4052,7 @@
     </TABLE>
 
-    <!-- StackModelFitFlxC2 Table ************************************************** -->
-    <TABLE name="StackModelFitFlxC2">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+    <!-- StackApFlxFullC2 Table ************************************************** -->
+    <TABLE name="StackApFlxFullC2">
+      <DESCRIPTION>VOTable description of PSPS table StackApFlxFullC2</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
@@ -4735,7 +4735,7 @@
     </TABLE>
 
-    <!-- StackModelFitPet Table ************************************************** -->
-    <TABLE name="StackModelFitPet">
-      <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
+    <!-- StackPetrosian Table ************************************************** -->
+    <TABLE name="StackPetrosian">
+      <DESCRIPTION>VOTable description of PSPS table StackPetrosian</DESCRIPTION>
       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
       <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
Index: branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py
===================================================================
--- branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py	(revision 37185)
+++ branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py	(revision 37186)
@@ -157,16 +157,17 @@
 
        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,9 +371,9 @@
 
     '''
-    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,5 +381,5 @@
 
         # 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,13 +463,13 @@
 
     '''
-    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,9 +561,9 @@
 
     '''
-    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,5 +580,5 @@
 
     '''
-    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,5 +589,5 @@
 
         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,5 +611,5 @@
     Populates the StackApFlx table
     '''
-    def populateStackApFlxThin(self):
+    def populateStackApFlx(self):
 
         tablename = "StackApFlx"
@@ -629,9 +630,9 @@
 
     '''
-    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,10 +966,10 @@
         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,9 +981,9 @@
 
             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