Index: /trunk/ippToPsps/config/tables.FO.vot
===================================================================
--- /trunk/ippToPsps/config/tables.FO.vot (revision 37474)
+++ /trunk/ippToPsps/config/tables.FO.vot (revision 37475)
@@ -9,4 +9,7 @@
ODM object identifier index
+
+ unique psps id
+
galactic coordinates ODM object identifier
Index: /trunk/ippToPsps/config/tables.FW.vot
===================================================================
--- /trunk/ippToPsps/config/tables.FW.vot (revision 37474)
+++ /trunk/ippToPsps/config/tables.FW.vot (revision 37475)
@@ -115,4 +115,7 @@
ODM object identifier
+
+ unique psps id
+
galactic coordinates ODM object identifier
Index: /trunk/ippToPsps/config/tables.OB.vot
===================================================================
--- /trunk/ippToPsps/config/tables.OB.vot (revision 37474)
+++ /trunk/ippToPsps/config/tables.OB.vot (revision 37475)
@@ -11,4 +11,7 @@
ODM object identifier index
+
+
+ unique psps id
@@ -136,4 +139,7 @@
ODM object identifier index
+
+ unique psps id
+
maximum psf QfPerfect from best available g band detections
Index: /trunk/ippToPsps/config/tables.P2.vot
===================================================================
--- /trunk/ippToPsps/config/tables.P2.vot (revision 37474)
+++ /trunk/ippToPsps/config/tables.P2.vot (revision 37475)
@@ -383,4 +383,7 @@
ODM object identifier
+
+ unique psps id
+
ODM detection identifier
Index: /trunk/ippToPsps/config/tables.ST.vot
===================================================================
--- /trunk/ippToPsps/config/tables.ST.vot (revision 37474)
+++ /trunk/ippToPsps/config/tables.ST.vot (revision 37475)
@@ -131,4 +131,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -465,9 +468,12 @@
-
+
VOTable description of PSPS table StackObject
ODM object identifier
+
+
+ unique psps id
@@ -989,4 +995,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -1611,4 +1620,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -1799,4 +1811,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -2092,4 +2107,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -2385,4 +2403,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -2702,5 +2723,5 @@
-
+
VOTable description of PSPS table StackApFlxFull
@@ -2708,4 +2729,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -3385,5 +3409,5 @@
-
+
VOTable description of PSPS table StackApFlxFullC1
@@ -3391,4 +3415,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
@@ -4068,9 +4095,12 @@
-
+
VOTable description of PSPS table StackApFlxFullC2
ODM object identifier
+
+
+ unique psps id
@@ -4757,4 +4787,7 @@
ODM object identifier
+
+ unique psps id
+
IPP object identifier
Index: /trunk/ippToPsps/jython/stackbatch.py
===================================================================
--- /trunk/ippToPsps/jython/stackbatch.py (revision 37474)
+++ /trunk/ippToPsps/jython/stackbatch.py (revision 37475)
@@ -161,5 +161,5 @@
self.dropTableVerbose("StackObjectThin")
- self.dropTableVerbose("StackObjectRaw")
+ self.dropTableVerbose("StackObjectAttributes")
self.dropTableVerbose("StackModelFitExtra")
@@ -169,7 +169,7 @@
self.dropTableVerbose("StackApFlx")
- self.dropTableVerbose("StackApFlxFull")
- self.dropTableVerbose("StackApFlxFullC1")
- self.dropTableVerbose("StackApFlxFullC2")
+ self.dropTableVerbose("StackApFlxEGUnc")
+ self.dropTableVerbose("StackApFlxEGCon6")
+ self.dropTableVerbose("StackApFlxEGCon8")
self.dropTableVerbose("StackPetrosian")
@@ -374,9 +374,9 @@
'''
- Populates the StackObjectRaw table
- '''
- def populateStackObjectRaw(self):
-
- tablename = "StackObjectRaw"
+ Populates the StackObjectAttributes table
+ '''
+ def populateStackObjectAttributes(self):
+
+ tablename = "StackObjectAttributes"
self.logger.infoPair("Procesing table", tablename)
@@ -558,5 +558,5 @@
# insert detection information for each filter based on the
# DVO contents. Since I already have extracted
- # StackObjectRaw, this is probably faster using that table:
+ # StackObjectAttributes, this is probably faster using that table:
sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
sqlLine.group("a." + filter + model + "Mag", "a." + filter + model + "Mag + b.zp")
@@ -592,5 +592,5 @@
# insert detection information for each filter based on the DVO contents
- sqlLine = sqlUtility("UPDATE " + tablename + " AS a, StackObjectThin as b, StackObjectRaw as c SET ")
+ sqlLine = sqlUtility("UPDATE " + tablename + " AS a, StackObjectThin as b, StackObjectAttributes as c SET ")
sqlLine.group(extR, rawR + " - (" + extR + " - " + rawX + ")*" + rawS + " / 3600.0 / cos(radians(" + rawD + "))")
sqlLine.group(extD, rawD + " + (" + extD + " - " + rawY + ")*" + rawS + " / 3600.0")
@@ -699,7 +699,7 @@
for filter in self.filters:
- self.populateStackApFlxFilter(tablename, "", filter)
- self.populateStackApFlxFilter(tablename, "C1", filter)
- self.populateStackApFlxFilter(tablename, "C2", filter)
+ self.populateStackApFlxFilter(tablename, "Unc", filter)
+ self.populateStackApFlxFilter(tablename, "Con6", filter)
+ self.populateStackApFlxFilter(tablename, "Con8", filter)
self.deleteRowsWithNoStackData(tablename)
@@ -707,9 +707,9 @@
'''
- Populates the StackApFlxFull table
- '''
- def populateStackApFlxFull(self, version):
-
- tablename = "StackApFlxFull" + version
+ Populates the StackApFlxEG table
+ '''
+ def populateStackApFlxEG(self, version):
+
+ tablename = "StackApFlxEG" + version
if self.config.camera == "simtest":
@@ -730,5 +730,5 @@
'''
- Updates aperture fluxes for StackApFkx table
+ Updates aperture fluxes for StackApFlx table
'''
def populateStackApFlxFilter(self, tablename, version, filter):
@@ -737,13 +737,13 @@
# order of the 3 convolutions is fixed (raw, C1, C2) = (1, 2, 3)
- if version == "":
+ if version == "Unc":
psfCondition = "(b.table_index % 3 = 1)"
prefix = ""
- if version == "C1":
+ if version == "Con6":
psfCondition = "(b.table_index % 3 = 2)"
- prefix = "c1"
- if version == "C2":
+ prefix = "c6"
+ if version == "Con8":
psfCondition = "(b.table_index % 3 = 0)"
- prefix = "c2"
+ prefix = "c8"
if prefix == "none":
@@ -1053,5 +1053,5 @@
self.populateStackObjectThin()
- self.populateStackObjectRaw()
+ self.populateStackObjectAttributes()
if self.stackType != "NIGHTLY_STACK":
@@ -1070,7 +1070,7 @@
self.populateStackApFlx()
- self.populateStackApFlxFull("")
- self.populateStackApFlxFull("C1")
- self.populateStackApFlxFull("C2")
+ self.populateStackApFlxEG("Unc")
+ self.populateStackApFlxEG("Con6")
+ self.populateStackApFlxEG("Con8")
# delete rows with no content. for the other tables, this is done in
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx (revision 37475)
@@ -26,29 +26,29 @@
gflxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
---------------------------------------------------- convolved across all bands to 6 or 8 pixels
-gc1flxR3 Jy REAL 4 -999 Flux inside r = 3
-gc1flxR3Err Jy REAL 4 -999 estimated error is c1flxR3
-gc1flxR3Std Jy REAL 4 -999 estimated standard deviation in c1flxR3
-gc1flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
-gc1flxR4 Jy REAL 4 -999 Flux inside r = 4
-gc1flxR4Err Jy REAL 4 -999 estimated error is c1flxR4
-gc1flxR4Std Jy REAL 4 -999 estimated standard deviation in c1flxR4
-gc1flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
-gc1flxR5 Jy REAL 4 -999 Flux inside r = 5
-gc1flxR5Err Jy REAL 4 -999 estimated error is c1flxR5
-gc1flxR5Std Jy REAL 4 -999 estimated standard deviation in c1flxR5
-gc1flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
+gc6flxR3 Jy REAL 4 -999 Flux inside r = 3
+gc6flxR3Err Jy REAL 4 -999 estimated error is c1flxR3
+gc6flxR3Std Jy REAL 4 -999 estimated standard deviation in c1flxR3
+gc6flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
+gc6flxR4 Jy REAL 4 -999 Flux inside r = 4
+gc6flxR4Err Jy REAL 4 -999 estimated error is c1flxR4
+gc6flxR4Std Jy REAL 4 -999 estimated standard deviation in c1flxR4
+gc6flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
+gc6flxR5 Jy REAL 4 -999 Flux inside r = 5
+gc6flxR5Err Jy REAL 4 -999 estimated error is c1flxR5
+gc6flxR5Std Jy REAL 4 -999 estimated standard deviation in c1flxR5
+gc6flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
---------------------------------------------------- convolved across all bands to 6 or 8 pixels
-gc2flxR3 Jy REAL 4 -999 Flux inside r = 3
-gc2flxR3Err Jy REAL 4 -999 estimated error in c2flxR3
-gc2flxR3Std Jy REAL 4 -999 estimated standard deviation in c2flxR3
-gc2flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
-gc2flxR4 Jy REAL 4 -999 Flux inside r = 4
-gc2flxR4Err Jy REAL 4 -999 estimated error in c2flxR4
-gc2flxR4Std Jy REAL 4 -999 estimated standard deviation in c2flxR4
-gc2flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
-gc2flxR5 Jy REAL 4 -999 Flux inside r = 5
-gc2flxR5Err Jy REAL 4 -999 estimated error in c2flxR5
-gc2flxR5Std Jy REAL 4 -999 estimated standard deviation in c2flxR5
-gc2flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
+gc8flxR3 Jy REAL 4 -999 Flux inside r = 3
+gc8flxR3Err Jy REAL 4 -999 estimated error in c2flxR3
+gc8flxR3Std Jy REAL 4 -999 estimated standard deviation in c2flxR3
+gc8flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
+gc8flxR4 Jy REAL 4 -999 Flux inside r = 4
+gc8flxR4Err Jy REAL 4 -999 estimated error in c2flxR4
+gc8flxR4Std Jy REAL 4 -999 estimated standard deviation in c2flxR4
+gc8flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
+gc8flxR5 Jy REAL 4 -999 Flux inside r = 5
+gc8flxR5Err Jy REAL 4 -999 estimated error in c2flxR5
+gc8flxR5Std Jy REAL 4 -999 estimated standard deviation in c2flxR5
+gc8flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
-- repeat for other filters with appropriate leading prefex.
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt (revision 37475)
@@ -26,27 +26,27 @@
gflxR5Fill + cmf : APER_FILL_5
----------------
-gc1flxR3 + cmf : APER_FLUX_3
-gc1flxR3Err + cmf : APER_FLUX_ERR_3
-gc1flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
-gc1flxR3Fill + cmf : APER_FILL_3
-gc1flxR4 + cmf : APER_FLUX_4
-gc1flxR4Err + cmf : APER_FLUX_ERR_4
-gc1flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
-gc1flxR4Fill + cmf : APER_FILL_4
-gc1flxR5 + cmf : APER_FLUX_5
-gc1flxR5Err + cmf : APER_FLUX_ERR_5
-gc1flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
-gc1flxR5Fill + cmf : APER_FILL_5
+gc6flxR3 + cmf : APER_FLUX_3
+gc6flxR3Err + cmf : APER_FLUX_ERR_3
+gc6flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
+gc6flxR3Fill + cmf : APER_FILL_3
+gc6flxR4 + cmf : APER_FLUX_4
+gc6flxR4Err + cmf : APER_FLUX_ERR_4
+gc6flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
+gc6flxR4Fill + cmf : APER_FILL_4
+gc6flxR5 + cmf : APER_FLUX_5
+gc6flxR5Err + cmf : APER_FLUX_ERR_5
+gc6flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
+gc6flxR5Fill + cmf : APER_FILL_5
----------------
-gc2flxR3 + cmf : APER_FLUX_3
-gc2flxR3Err + cmf : APER_FLUX_ERR_3
-gc2flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
-gc2flxR3Fill + cmf : APER_FILL_3
-gc2flxR4 + cmf : APER_FLUX_4
-gc2flxR4Err + cmf : APER_FLUX_ERR_4
-gc2flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
-gc2flxR4Fill + cmf : APER_FILL_4
-gc2flxR5 + cmf : APER_FLUX_5
-gc2flxR5Err + cmf : APER_FLUX_ERR_5
-gc2flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
-gc2flxR5Fill + cmf : APER_FILL_5
+gc8flxR3 + cmf : APER_FLUX_3
+gc8flxR3Err + cmf : APER_FLUX_ERR_3
+gc8flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
+gc8flxR3Fill + cmf : APER_FILL_3
+gc8flxR4 + cmf : APER_FLUX_4
+gc8flxR4Err + cmf : APER_FLUX_ERR_4
+gc8flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
+gc8flxR4Fill + cmf : APER_FILL_4
+gc8flxR5 + cmf : APER_FLUX_5
+gc8flxR5Err + cmf : APER_FLUX_ERR_5
+gc8flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
+gc8flxR5Fill + cmf : APER_FILL_5
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6 (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6 (revision 37475)
@@ -13,44 +13,44 @@
gstackMetaID dimensionless BIGINT 8 NA stack identifier
----------------------------------------------------------------------------------------
-gc1flxR1 Jy REAL 4 -999 Flux inside r = 1
-gc1flxR1Err Jy REAL 4 -999 estimated error is c1flxR1
-gc1flxR1Std Jy REAL 4 -999 estimated standard deviation in c1flxR1
-gc1flxR1Fill dimensionless REAL 4 -999 estimated filling factor at R1
-gc1flxR2 Jy REAL 4 -999 Flux inside r = 2
-gc1flxR2Err Jy REAL 4 -999 estimated error is c1flxR2
-gc1flxR2Std Jy REAL 4 -999 estimated standard deviation in c1flxR2
-gc1flxR2Fill dimensionless REAL 4 -999 estimated filling factor at R1
-gc1flxR3 Jy REAL 4 -999 Flux inside r = 3
-gc1flxR3Err Jy REAL 4 -999 estimated error is c1flxR3
-gc1flxR3Std Jy REAL 4 -999 estimated standard deviation in c1flxR3
-gc1flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
-gc1flxR4 Jy REAL 4 -999 Flux inside r = 4
-gc1flxR4Err Jy REAL 4 -999 estimated error is c1flxR4
-gc1flxR4Std Jy REAL 4 -999 estimated standard deviation in c1flxR4
-gc1flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
-gc1flxR5 Jy REAL 4 -999 Flux inside r = 5
-gc1flxR5Err Jy REAL 4 -999 estimated error is c1flxR5
-gc1flxR5Std Jy REAL 4 -999 estimated standard deviation in c1flxR5
-gc1flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
-gc1flxR6 Jy REAL 4 -999 Flux inside r = 6
-gc1flxR6Err Jy REAL 4 -999 estimated error is c1flxR6
-gc1flxR6Std Jy REAL 4 -999 estimated standard deviation in c1flxR6
-gc1flxR6Fill dimensionless REAL 4 -999 estimated filling factor at R6
-gc1flxR7 Jy REAL 4 -999 Flux inside r = 7
-gc1flxR7Err Jy REAL 4 -999 estimated error is c1flxR7
-gc1flxR7Std Jy REAL 4 -999 estimated standard deviation in c1flxR7
-gc1flxR7Fill dimensionless REAL 4 -999 estimated filling factor at R7
-gc1flxR8 Jy REAL 4 -999 Flux inside r = 8
-gc1flxR8Err Jy REAL 4 -999 estimated error is c1flxR8
-gc1flxR8Std Jy REAL 4 -999 estimated standard deviation in c1flxR8
-gc1flxR8Fill dimensionless REAL 4 -999 estimated filling factor at R8
-gc1flxR9 Jy REAL 4 -999 Flux inside r = 9
-gc1flxR9Err Jy REAL 4 -999 estimated error is c1flxR9
-gc1flxR9Std Jy REAL 4 -999 estimated standard deviation in c1flxR9
-gc1flxR9Fill dimensionless REAL 4 -999 estimated filling factor at R9
-gc1flxR10 Jy REAL 4 -999 Flux inside r = 10
-gc1flxR10Err Jy REAL 4 -999 estimated error is c1flxR10
-gc1flxR10Std Jy REAL 4 -999 estimated standard deviation in c1flxR10
-gc1flxR10Fill dimensionless REAL 4 -999 estimated filling factor at R10
+gc6flxR1 Jy REAL 4 -999 Flux inside r = 1
+gc6flxR1Err Jy REAL 4 -999 estimated error is c1flxR1
+gc6flxR1Std Jy REAL 4 -999 estimated standard deviation in c1flxR1
+gc6flxR1Fill dimensionless REAL 4 -999 estimated filling factor at R1
+gc6flxR2 Jy REAL 4 -999 Flux inside r = 2
+gc6flxR2Err Jy REAL 4 -999 estimated error is c1flxR2
+gc6flxR2Std Jy REAL 4 -999 estimated standard deviation in c1flxR2
+gc6flxR2Fill dimensionless REAL 4 -999 estimated filling factor at R1
+gc6flxR3 Jy REAL 4 -999 Flux inside r = 3
+gc6flxR3Err Jy REAL 4 -999 estimated error is c1flxR3
+gc6flxR3Std Jy REAL 4 -999 estimated standard deviation in c1flxR3
+gc6flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
+gc6flxR4 Jy REAL 4 -999 Flux inside r = 4
+gc6flxR4Err Jy REAL 4 -999 estimated error is c1flxR4
+gc6flxR4Std Jy REAL 4 -999 estimated standard deviation in c1flxR4
+gc6flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
+gc6flxR5 Jy REAL 4 -999 Flux inside r = 5
+gc6flxR5Err Jy REAL 4 -999 estimated error is c1flxR5
+gc6flxR5Std Jy REAL 4 -999 estimated standard deviation in c1flxR5
+gc6flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
+gc6flxR6 Jy REAL 4 -999 Flux inside r = 6
+gc6flxR6Err Jy REAL 4 -999 estimated error is c1flxR6
+gc6flxR6Std Jy REAL 4 -999 estimated standard deviation in c1flxR6
+gc6flxR6Fill dimensionless REAL 4 -999 estimated filling factor at R6
+gc6flxR7 Jy REAL 4 -999 Flux inside r = 7
+gc6flxR7Err Jy REAL 4 -999 estimated error is c1flxR7
+gc6flxR7Std Jy REAL 4 -999 estimated standard deviation in c1flxR7
+gc6flxR7Fill dimensionless REAL 4 -999 estimated filling factor at R7
+gc6flxR8 Jy REAL 4 -999 Flux inside r = 8
+gc6flxR8Err Jy REAL 4 -999 estimated error is c1flxR8
+gc6flxR8Std Jy REAL 4 -999 estimated standard deviation in c1flxR8
+gc6flxR8Fill dimensionless REAL 4 -999 estimated filling factor at R8
+gc6flxR9 Jy REAL 4 -999 Flux inside r = 9
+gc6flxR9Err Jy REAL 4 -999 estimated error is c1flxR9
+gc6flxR9Std Jy REAL 4 -999 estimated standard deviation in c1flxR9
+gc6flxR9Fill dimensionless REAL 4 -999 estimated filling factor at R9
+gc6flxR10 Jy REAL 4 -999 Flux inside r = 10
+gc6flxR10Err Jy REAL 4 -999 estimated error is c1flxR10
+gc6flxR10Std Jy REAL 4 -999 estimated standard deviation in c1flxR10
+gc6flxR10Fill dimensionless REAL 4 -999 estimated filling factor at R10
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt (revision 37475)
@@ -13,42 +13,42 @@
gstackMetaID + from StackObjectThin
----------------
-gc1flxR1 + cmf : APER_FLUX_1
-gc1flxR1Err + cmf : APER_FLUX_ERR_1
-gc1flxR1Std - cmf : APER_FLUX_STDEV_1 : ** badly defined in cmf
-gc1flxR1Fill + cmf : APER_FILL_1
-gc1flxR2 + cmf : APER_FLUX_2
-gc1flxR2Err + cmf : APER_FLUX_ERR_2
-gc1flxR2Std - cmf : APER_FLUX_STDEV_2 : ** badly defined in cmf
-gc1flxR2Fill + cmf : APER_FILL_2
-gc1flxR3 + cmf : APER_FLUX_3
-gc1flxR3Err + cmf : APER_FLUX_ERR_3
-gc1flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
-gc1flxR3Fill + cmf : APER_FILL_3
-gc1flxR4 + cmf : APER_FLUX_4
-gc1flxR4Err + cmf : APER_FLUX_ERR_4
-gc1flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
-gc1flxR4Fill + cmf : APER_FILL_4
-gc1flxR5 + cmf : APER_FLUX_5
-gc1flxR5Err + cmf : APER_FLUX_ERR_5
-gc1flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
-gc1flxR5Fill + cmf : APER_FILL_5
-gc1flxR6 + cmf : APER_FLUX_6
-gc1flxR6Err + cmf : APER_FLUX_ERR_6
-gc1flxR6Std - cmf : APER_FLUX_STDEV_6 : ** badly defined in cmf
-gc1flxR6Fill + cmf : APER_FILL_6
-gc1flxR7 + cmf : APER_FLUX_7
-gc1flxR7Err + cmf : APER_FLUX_ERR_7
-gc1flxR7Std - cmf : APER_FLUX_STDEV_7 : ** badly defined in cmf
-gc1flxR7Fill + cmf : APER_FILL_7
-gc1flxR8 + cmf : APER_FLUX_8
-gc1flxR8Err + cmf : APER_FLUX_ERR_8
-gc1flxR8Std - cmf : APER_FLUX_STDEV_8 : ** badly defined in cmf
-gc1flxR8Fill + cmf : APER_FILL_8
-gc1flxR9 + cmf : APER_FLUX_9
-gc1flxR9Err + cmf : APER_FLUX_ERR_9
-gc1flxR9Std - cmf : APER_FLUX_STDEV_9 : ** badly defined in cmf
-gc1flxR9Fill + cmf : APER_FILL_9
-gc1flxR10 - cmf : APER_FLUX_10 ** does not exist in cmf
-gc1flxR10Err - cmf : APER_FLUX_ERR_10 ** does not exist in cmf
-gc1flxR10Std - cmf : APER_FLUX_STDEV_10 ** does not exist in cmf
-gc1flxR10Fill - cmf : APER_FILL_10 ** does not exist in cmf
+gc6flxR1 + cmf : APER_FLUX_1
+gc6flxR1Err + cmf : APER_FLUX_ERR_1
+gc6flxR1Std - cmf : APER_FLUX_STDEV_1 : ** badly defined in cmf
+gc6flxR1Fill + cmf : APER_FILL_1
+gc6flxR2 + cmf : APER_FLUX_2
+gc6flxR2Err + cmf : APER_FLUX_ERR_2
+gc6flxR2Std - cmf : APER_FLUX_STDEV_2 : ** badly defined in cmf
+gc6flxR2Fill + cmf : APER_FILL_2
+gc6flxR3 + cmf : APER_FLUX_3
+gc6flxR3Err + cmf : APER_FLUX_ERR_3
+gc6flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
+gc6flxR3Fill + cmf : APER_FILL_3
+gc6flxR4 + cmf : APER_FLUX_4
+gc6flxR4Err + cmf : APER_FLUX_ERR_4
+gc6flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
+gc6flxR4Fill + cmf : APER_FILL_4
+gc6flxR5 + cmf : APER_FLUX_5
+gc6flxR5Err + cmf : APER_FLUX_ERR_5
+gc6flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
+gc6flxR5Fill + cmf : APER_FILL_5
+gc6flxR6 + cmf : APER_FLUX_6
+gc6flxR6Err + cmf : APER_FLUX_ERR_6
+gc6flxR6Std - cmf : APER_FLUX_STDEV_6 : ** badly defined in cmf
+gc6flxR6Fill + cmf : APER_FILL_6
+gc6flxR7 + cmf : APER_FLUX_7
+gc6flxR7Err + cmf : APER_FLUX_ERR_7
+gc6flxR7Std - cmf : APER_FLUX_STDEV_7 : ** badly defined in cmf
+gc6flxR7Fill + cmf : APER_FILL_7
+gc6flxR8 + cmf : APER_FLUX_8
+gc6flxR8Err + cmf : APER_FLUX_ERR_8
+gc6flxR8Std - cmf : APER_FLUX_STDEV_8 : ** badly defined in cmf
+gc6flxR8Fill + cmf : APER_FILL_8
+gc6flxR9 + cmf : APER_FLUX_9
+gc6flxR9Err + cmf : APER_FLUX_ERR_9
+gc6flxR9Std - cmf : APER_FLUX_STDEV_9 : ** badly defined in cmf
+gc6flxR9Fill + cmf : APER_FILL_9
+gc6flxR10 - cmf : APER_FLUX_10 ** does not exist in cmf
+gc6flxR10Err - cmf : APER_FLUX_ERR_10 ** does not exist in cmf
+gc6flxR10Std - cmf : APER_FLUX_STDEV_10 ** does not exist in cmf
+gc6flxR10Fill - cmf : APER_FILL_10 ** does not exist in cmf
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8 (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8 (revision 37475)
@@ -13,44 +13,44 @@
gstackMetaID dimensionless BIGINT 8 NA stack identifier
----------------------------------------------------------------------------------------
-gc2flxR1 Jy REAL 4 -999 Flux inside r = 1
-gc2flxR1Err Jy REAL 4 -999 estimated error is c2flxR1
-gc2flxR1Std Jy REAL 4 -999 estimated standard deviation in c2flxR1
-gc2flxR1Fill dimensionless REAL 4 -999 estimated filling factor at R1
-gc2flxR2 Jy REAL 4 -999 Flux inside r = 2
-gc2flxR2Err Jy REAL 4 -999 estimated error is c2flxR2
-gc2flxR2Std Jy REAL 4 -999 estimated standard deviation in c2flxR2
-gc2flxR2Fill dimensionless REAL 4 -999 estimated filling factor at R1
-gc2flxR3 Jy REAL 4 -999 Flux inside r = 3
-gc2flxR3Err Jy REAL 4 -999 estimated error is c2flxR3
-gc2flxR3Std Jy REAL 4 -999 estimated standard deviation in c2flxR3
-gc2flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
-gc2flxR4 Jy REAL 4 -999 Flux inside r = 4
-gc2flxR4Err Jy REAL 4 -999 estimated error is c2flxR4
-gc2flxR4Std Jy REAL 4 -999 estimated standard deviation in c2flxR4
-gc2flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
-gc2flxR5 Jy REAL 4 -999 Flux inside r = 5
-gc2flxR5Err Jy REAL 4 -999 estimated error is c2flxR5
-gc2flxR5Std Jy REAL 4 -999 estimated standard deviation in c2flxR5
-gc2flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
-gc2flxR6 Jy REAL 4 -999 Flux inside r = 6
-gc2flxR6Err Jy REAL 4 -999 estimated error is c2flxR6
-gc2flxR6Std Jy REAL 4 -999 estimated standard deviation in c2flxR6
-gc2flxR6Fill dimensionless REAL 4 -999 estimated filling factor at R6
-gc2flxR7 Jy REAL 4 -999 Flux inside r = 7
-gc2flxR7Err Jy REAL 4 -999 estimated error is c2flxR7
-gc2flxR7Std Jy REAL 4 -999 estimated standard deviation in c2flxR7
-gc2flxR7Fill dimensionless REAL 4 -999 estimated filling factor at R7
-gc2flxR8 Jy REAL 4 -999 Flux inside r = 8
-gc2flxR8Err Jy REAL 4 -999 estimated error is c2flxR8
-gc2flxR8Std Jy REAL 4 -999 estimated standard deviation in c2flxR8
-gc2flxR8Fill dimensionless REAL 4 -999 estimated filling factor at R8
-gc2flxR9 Jy REAL 4 -999 Flux inside r = 9
-gc2flxR9Err Jy REAL 4 -999 estimated error is c2flxR9
-gc2flxR9Std Jy REAL 4 -999 estimated standard deviation in c2flxR9
-gc2flxR9Fill dimensionless REAL 4 -999 estimated filling factor at R9
-gc2flxR10 Jy REAL 4 -999 Flux inside r = 10
-gc2flxR10Err Jy REAL 4 -999 estimated error is c2flxR10
-gc2flxR10Std Jy REAL 4 -999 estimated standard deviation in c2flxR10
-gc2flxR10Fill dimensionless REAL 4 -999 estimated filling factor at R10
+gc8flxR1 Jy REAL 4 -999 Flux inside r = 1
+gc8flxR1Err Jy REAL 4 -999 estimated error is c2flxR1
+gc8flxR1Std Jy REAL 4 -999 estimated standard deviation in c2flxR1
+gc8flxR1Fill dimensionless REAL 4 -999 estimated filling factor at R1
+gc8flxR2 Jy REAL 4 -999 Flux inside r = 2
+gc8flxR2Err Jy REAL 4 -999 estimated error is c2flxR2
+gc8flxR2Std Jy REAL 4 -999 estimated standard deviation in c2flxR2
+gc8flxR2Fill dimensionless REAL 4 -999 estimated filling factor at R1
+gc8flxR3 Jy REAL 4 -999 Flux inside r = 3
+gc8flxR3Err Jy REAL 4 -999 estimated error is c2flxR3
+gc8flxR3Std Jy REAL 4 -999 estimated standard deviation in c2flxR3
+gc8flxR3Fill dimensionless REAL 4 -999 estimated filling factor at R3
+gc8flxR4 Jy REAL 4 -999 Flux inside r = 4
+gc8flxR4Err Jy REAL 4 -999 estimated error is c2flxR4
+gc8flxR4Std Jy REAL 4 -999 estimated standard deviation in c2flxR4
+gc8flxR4Fill dimensionless REAL 4 -999 estimated filling factor at R4
+gc8flxR5 Jy REAL 4 -999 Flux inside r = 5
+gc8flxR5Err Jy REAL 4 -999 estimated error is c2flxR5
+gc8flxR5Std Jy REAL 4 -999 estimated standard deviation in c2flxR5
+gc8flxR5Fill dimensionless REAL 4 -999 estimated filling factor at R5
+gc8flxR6 Jy REAL 4 -999 Flux inside r = 6
+gc8flxR6Err Jy REAL 4 -999 estimated error is c2flxR6
+gc8flxR6Std Jy REAL 4 -999 estimated standard deviation in c2flxR6
+gc8flxR6Fill dimensionless REAL 4 -999 estimated filling factor at R6
+gc8flxR7 Jy REAL 4 -999 Flux inside r = 7
+gc8flxR7Err Jy REAL 4 -999 estimated error is c2flxR7
+gc8flxR7Std Jy REAL 4 -999 estimated standard deviation in c2flxR7
+gc8flxR7Fill dimensionless REAL 4 -999 estimated filling factor at R7
+gc8flxR8 Jy REAL 4 -999 Flux inside r = 8
+gc8flxR8Err Jy REAL 4 -999 estimated error is c2flxR8
+gc8flxR8Std Jy REAL 4 -999 estimated standard deviation in c2flxR8
+gc8flxR8Fill dimensionless REAL 4 -999 estimated filling factor at R8
+gc8flxR9 Jy REAL 4 -999 Flux inside r = 9
+gc8flxR9Err Jy REAL 4 -999 estimated error is c2flxR9
+gc8flxR9Std Jy REAL 4 -999 estimated standard deviation in c2flxR9
+gc8flxR9Fill dimensionless REAL 4 -999 estimated filling factor at R9
+gc8flxR10 Jy REAL 4 -999 Flux inside r = 10
+gc8flxR10Err Jy REAL 4 -999 estimated error is c2flxR10
+gc8flxR10Std Jy REAL 4 -999 estimated standard deviation in c2flxR10
+gc8flxR10Fill dimensionless REAL 4 -999 estimated filling factor at R10
-- repeat for other filters with appropriate leading prefex.
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt (revision 37475)
@@ -13,42 +13,42 @@
gstackMetaID + from StackObjectThin
----------------
-gc2flxR1 + cmf : APER_FLUX_1
-gc2flxR1Err + cmf : APER_FLUX_ERR_1
-gc2flxR1Std - cmf : APER_FLUX_STDEV_1 : ** badly defined in cmf
-gc2flxR1Fill + cmf : APER_FILL_1
-gc2flxR2 + cmf : APER_FLUX_2
-gc2flxR2Err + cmf : APER_FLUX_ERR_2
-gc2flxR2Std - cmf : APER_FLUX_STDEV_2 : ** badly defined in cmf
-gc2flxR2Fill + cmf : APER_FILL_2
-gc2flxR3 + cmf : APER_FLUX_3
-gc2flxR3Err + cmf : APER_FLUX_ERR_3
-gc2flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
-gc2flxR3Fill + cmf : APER_FILL_3
-gc2flxR4 + cmf : APER_FLUX_4
-gc2flxR4Err + cmf : APER_FLUX_ERR_4
-gc2flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
-gc2flxR4Fill + cmf : APER_FILL_4
-gc2flxR5 + cmf : APER_FLUX_5
-gc2flxR5Err + cmf : APER_FLUX_ERR_5
-gc2flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
-gc2flxR5Fill + cmf : APER_FILL_5
-gc2flxR6 + cmf : APER_FLUX_6
-gc2flxR6Err + cmf : APER_FLUX_ERR_6
-gc2flxR6Std - cmf : APER_FLUX_STDEV_6 : ** badly defined in cmf
-gc2flxR6Fill + cmf : APER_FILL_6
-gc2flxR7 + cmf : APER_FLUX_7
-gc2flxR7Err + cmf : APER_FLUX_ERR_7
-gc2flxR7Std - cmf : APER_FLUX_STDEV_7 : ** badly defined in cmf
-gc2flxR7Fill + cmf : APER_FILL_7
-gc2flxR8 + cmf : APER_FLUX_8
-gc2flxR8Err + cmf : APER_FLUX_ERR_8
-gc2flxR8Std - cmf : APER_FLUX_STDEV_8 : ** badly defined in cmf
-gc2flxR8Fill + cmf : APER_FILL_8
-gc2flxR9 + cmf : APER_FLUX_9
-gc2flxR9Err + cmf : APER_FLUX_ERR_9
-gc2flxR9Std - cmf : APER_FLUX_STDEV_9 : ** badly defined in cmf
-gc2flxR9Fill + cmf : APER_FILL_9
-gc2flxR10 - cmf : APER_FLUX_10 ** does not exist in cmf
-gc2flxR10Err - cmf : APER_FLUX_ERR_10 ** does not exist in cmf
-gc2flxR10Std - cmf : APER_FLUX_STDEV_10 ** does not exist in cmf
-gc2flxR10Fill - cmf : APER_FILL_10 ** does not exist in cmf
+gc8flxR1 + cmf : APER_FLUX_1
+gc8flxR1Err + cmf : APER_FLUX_ERR_1
+gc8flxR1Std - cmf : APER_FLUX_STDEV_1 : ** badly defined in cmf
+gc8flxR1Fill + cmf : APER_FILL_1
+gc8flxR2 + cmf : APER_FLUX_2
+gc8flxR2Err + cmf : APER_FLUX_ERR_2
+gc8flxR2Std - cmf : APER_FLUX_STDEV_2 : ** badly defined in cmf
+gc8flxR2Fill + cmf : APER_FILL_2
+gc8flxR3 + cmf : APER_FLUX_3
+gc8flxR3Err + cmf : APER_FLUX_ERR_3
+gc8flxR3Std - cmf : APER_FLUX_STDEV_3 : ** badly defined in cmf
+gc8flxR3Fill + cmf : APER_FILL_3
+gc8flxR4 + cmf : APER_FLUX_4
+gc8flxR4Err + cmf : APER_FLUX_ERR_4
+gc8flxR4Std - cmf : APER_FLUX_STDEV_4 : ** badly defined in cmf
+gc8flxR4Fill + cmf : APER_FILL_4
+gc8flxR5 + cmf : APER_FLUX_5
+gc8flxR5Err + cmf : APER_FLUX_ERR_5
+gc8flxR5Std - cmf : APER_FLUX_STDEV_5 : ** badly defined in cmf
+gc8flxR5Fill + cmf : APER_FILL_5
+gc8flxR6 + cmf : APER_FLUX_6
+gc8flxR6Err + cmf : APER_FLUX_ERR_6
+gc8flxR6Std - cmf : APER_FLUX_STDEV_6 : ** badly defined in cmf
+gc8flxR6Fill + cmf : APER_FILL_6
+gc8flxR7 + cmf : APER_FLUX_7
+gc8flxR7Err + cmf : APER_FLUX_ERR_7
+gc8flxR7Std - cmf : APER_FLUX_STDEV_7 : ** badly defined in cmf
+gc8flxR7Fill + cmf : APER_FILL_7
+gc8flxR8 + cmf : APER_FLUX_8
+gc8flxR8Err + cmf : APER_FLUX_ERR_8
+gc8flxR8Std - cmf : APER_FLUX_STDEV_8 : ** badly defined in cmf
+gc8flxR8Fill + cmf : APER_FILL_8
+gc8flxR9 + cmf : APER_FLUX_9
+gc8flxR9Err + cmf : APER_FLUX_ERR_9
+gc8flxR9Std - cmf : APER_FLUX_STDEV_9 : ** badly defined in cmf
+gc8flxR9Fill + cmf : APER_FILL_9
+gc8flxR10 - cmf : APER_FLUX_10 ** does not exist in cmf
+gc8flxR10Err - cmf : APER_FLUX_ERR_10 ** does not exist in cmf
+gc8flxR10Std - cmf : APER_FLUX_STDEV_10 ** does not exist in cmf
+gc8flxR10Fill - cmf : APER_FILL_10 ** does not exist in cmf
Index: /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra
===================================================================
--- /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra (revision 37474)
+++ /trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra (revision 37475)
@@ -1,4 +1,5 @@
objID dimensionless BIGINT 8 NA ODM object identifier
+unique_psps_st_id dimensionless BIGINT 8 NA unique ipptopsps id
ippObjID dimensionless BIGINT 8 NA object ID generated by IPP
randomStackObjID dimensionless BIGINT 8 NA random stack id