Index: trunk/ippToPsps/config/schema_browser.vot
===================================================================
--- trunk/ippToPsps/config/schema_browser.vot (revision 39028)
+++ trunk/ippToPsps/config/schema_browser.vot (revision 39029)
@@ -134,10 +134,8 @@
-
-
Index: trunk/ippToPsps/config/tables.FG.vot
===================================================================
--- trunk/ippToPsps/config/tables.FG.vot (revision 39028)
+++ trunk/ippToPsps/config/tables.FG.vot (revision 39029)
@@ -3,29 +3,4 @@
-
- Contains the metadata linking the stacked image used to generate sources to the summary of the single epoch forced warp photometry.
-
-
- Unique forced warp summary identifier.
-
-
- Internal database batch identifier.
-
-
- Survey identifier. Details in the Survey table.
-
-
- Filter identifier. Details in the Filter table.
-
-
- Unique stack identifier.
-
-
- Data release version.
-
-
-
-
-
Contains the extended source galaxy shape parameters. All filters are matched into a single row. References: Sersic, J. L. 1963, Boletin de la Asociacion Argentina de Astronomia La Plata Argentina, 6, 41.
@@ -53,6 +28,6 @@
IPP internal detection identifier.
-
- Unique forced warp summary identifier.
+
+ Unique stack identifier for the g filter stack that was the original detection source.
@@ -81,6 +56,6 @@
IPP internal detection identifier.
-
- Unique forced warp summary identifier.
+
+ Unique stack identifier for the r filter stack that was the original detection source.
@@ -110,5 +85,5 @@
- Unique forced warp summary identifier.
+ Unique stack identifier for the i filter stack that was the original detection source.
@@ -137,6 +112,6 @@
IPP internal detection identifier.
-
- Unique forced warp summary identifier.
+
+ Unique stack identifier for the z filter stack that was the original detection source.
@@ -165,6 +140,6 @@
IPP internal detection identifier.
-
- Unique forced warp summary identifier.
+
+ Unique stack identifier for the z filter stack that was the original detection source.
@@ -193,17 +168,4 @@
-
- Contains the mapping of which input images were used for the forced photometry summary.
-
-
- Unique forced warp summary identifier.
-
-
- Unique image identifier. Constructed as (100 * frameID + ccdID).
-
-
-
-
-
Index: trunk/ippToPsps/jython/forcedgalaxybatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedgalaxybatch.py (revision 39028)
+++ trunk/ippToPsps/jython/forcedgalaxybatch.py (revision 39029)
@@ -153,5 +153,5 @@
sqlLine = sqlUtility("UPDATE ForcedGalaxyShape AS a, " + cpqTable + " AS b SET")
sqlLine.group("a." + filter[1] + "ippDetectID", "b.DET_ID")
- sqlLine.group("a." + filter[1] + "forcedSummaryID", "b.IMAGE_ID")
+ sqlLine.group("a." + filter[1] + "stackImageID", "b.IMAGE_ID")
sqlLine.group("a." + filter[1] + "GalMajor", "b.MAJOR_AXIS")
sqlLine.group("a." + filter[1] + "GalMajorErr", "b.MAJOR_AXIS_ERR")
Index: trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedwarpbatch.py (revision 39028)
+++ trunk/ippToPsps/jython/forcedwarpbatch.py (revision 39029)
@@ -646,59 +646,4 @@
-# '''
-# Populate the ForcedSummaryMeta table, which should be fairly easy as it contains very little.
-# '''
-# def populateForcedSummaryMeta(self,num):
-# forcedSummaryID = self.number[num]
-# self.logger.infoPair("Processing table", "ForcedSummaryMeta_"+forcedSummaryID)
-
-# sql = "CREATE TABLE ForcedSummaryMeta_"+forcedSummaryID+" LIKE ForcedSummaryMeta"
-# try: self.scratchDb.execute(sql)
-# except: pass
-
-# header = self.header[num]
-# self.logger.infoPair("found header", "ok")
-
-# sqlLine = sqlUtility("INSERT INTO ForcedSummaryMeta_"+forcedSummaryID+" (")
-
-# sqlLine.group("forcedSummaryID", forcedSummaryID)
-# sqlLine.group("batchID", str(self.batchID))
-# sqlLine.group("surveyID", str(self.surveyID))
-# sqlLine.group("filterID", str(self.filterID))
-# sqlLine.group("stackMetaID", self.stackID[num])
-# sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
-
-
-# sql = sqlLine.make(") VALUES ( ", ")")
-
-# try: self.scratchDb.execute(sql)
-# except:
-# self.logger.errorPair('failed sql: ', sql)
-# raise
-
-# # End populateForcedSummaryMeta?
-
-# '''
-# Populate the ForcedSummaryToImage table, which has even less.
-# '''
-# def populateForcedSummaryToImage(self,num):
-# forcedSummaryID = self.number[num]
-# self.logger.infoPair("Processing table", "ForcedSummaryToImage_"+str(forcedSummaryID))
-
-# sql = "CREATE TABLE ForcedSummaryToImage_"+str(forcedSummaryID)+" LIKE ForcedSummaryToImage"
-# try: self.scratchDb.execute(sql)
-# except: pass
-
-# if forcedSummaryID > 0:
-# imageIDs = self.gpc1Db.getImageIDsForThisForcedSummaryID(forcedSummaryID)
-# for imageID in imageIDs:
-# sql = "INSERT INTO ForcedWarpSummaryToImage_"+str(forcedSummaryID)+" (forcedSummaryId, imageID) VALUES (" + str(forcedSummaryID) + ", " + str(imageID) + ")"
-# try: self.scratchDb.execute(sql)
-# except:
-# self.logger.infoPair("can't execute sql", sql)
-# raise
-
-# # End populateForcedSummaryToImage?
-
'''