Index: /trunk/ippToPsps/config/tables.DF.vot
===================================================================
--- /trunk/ippToPsps/config/tables.DF.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.DF.vot (revision 38763)
@@ -81,5 +81,5 @@
Linear transformation matrix element between image pixel y and declination.
-
+
Data release version.
@@ -289,5 +289,5 @@
Information flag bitmask indicating details of the photometry. Values listed in DetectionFlags3.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.DO.vot
===================================================================
--- /trunk/ippToPsps/config/tables.DO.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.DO.vot (revision 38763)
@@ -93,5 +93,5 @@
Maximum PSF weighted fraction of pixels totally unmasked from y filter detections.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.FG.vot
===================================================================
--- /trunk/ippToPsps/config/tables.FG.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.FG.vot (revision 38763)
@@ -21,5 +21,5 @@
Unique stack identifier.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.FO.vot
===================================================================
--- /trunk/ippToPsps/config/tables.FO.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.FO.vot (revision 38763)
@@ -24,5 +24,5 @@
Internal database batch identifier.
-
+
Data release version.
@@ -523,5 +523,5 @@
Internal database batch identifier.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.FW.vot
===================================================================
--- /trunk/ippToPsps/config/tables.FW.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.FW.vot (revision 38763)
@@ -96,5 +96,5 @@
Linear transformation matrix element between image pixel y and declination.
-
+
Data release version.
@@ -253,5 +253,5 @@
Information flag bitmask indicating details of the photometry. Values listed in DetectionFlags3.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.OB.vot
===================================================================
--- /trunk/ippToPsps/config/tables.OB.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.OB.vot (revision 38763)
@@ -45,5 +45,5 @@
Internal DVO region identifier.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.P2.vot
===================================================================
--- /trunk/ippToPsps/config/tables.P2.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.P2.vot (revision 38763)
@@ -147,5 +147,5 @@
Internal database batch identifier.
-
+
Data release version.
@@ -361,5 +361,5 @@
Polynomial coefficient for the astrometric fit component (x^0 y^2) for focal plane M.
-
+
Data release version.
@@ -542,5 +542,5 @@
Information flag bitmask indicating details of the photometry. Values listed in DetectionFlags3.
-
+
Data release version.
Index: /trunk/ippToPsps/config/tables.ST.vot
===================================================================
--- /trunk/ippToPsps/config/tables.ST.vot (revision 38762)
+++ /trunk/ippToPsps/config/tables.ST.vot (revision 38763)
@@ -110,5 +110,5 @@
Linear transformation matrix element between image pixel y and declination.
-
+
Data release version.
@@ -158,5 +158,5 @@
Internal DVO region identifier.
-
+
Data release version.
Index: /trunk/ippToPsps/jython/detectionbatch.py
===================================================================
--- /trunk/ippToPsps/jython/detectionbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/detectionbatch.py (revision 38763)
@@ -179,5 +179,5 @@
self.scratchDb.updateAllRows("FrameMeta", "surveyID", str(self.surveyID))
self.scratchDb.updateFilterID("FrameMeta", self.filter)
- self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows("FrameMeta", "processingVersion", str(self.skychunk.processingVersion))
'''
@@ -296,5 +296,5 @@
self.scratchDb.updateFilterID(tableName, self.filter)
- self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO'])
self.scratchDb.replaceNullsInThisColumn(tableName, "polyOrder", "0")
@@ -460,5 +460,5 @@
sqlLine.group("infoFlag", "FLAGS")
sqlLine.group("infoFlag2", "FLAGS2")
- sqlLine.group("dataRelease", str(self.skychunk.dataRelease))
+ sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
@@ -518,5 +518,5 @@
self.scratchDb.execute(sql)
- self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
'''
Populates the SkinnyObject table for this OTA
@@ -545,5 +545,5 @@
self.scratchDb.execute(sql)
- self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
'''
Index: /trunk/ippToPsps/jython/diffbatch.py
===================================================================
--- /trunk/ippToPsps/jython/diffbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/diffbatch.py (revision 38763)
@@ -185,5 +185,5 @@
- self.dataRelease = skychunk.dataRelease;
+ self.processingVersion = skychunk.processingVersion;
@@ -236,5 +236,5 @@
self.scratchDb.updateAllRows("DiffMeta_"+str(num), "surveyID", str(self.surveyID))
self.scratchDb.updateFilterID("DiffMeta_"+str(num), self.filterName[num][0])
- self.scratchDb.updateAllRows("DiffMeta_"+str(num), "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows("DiffMeta_"+str(num), "processingVersion", str(self.skychunk.processingVersion))
self.logger.infoPair("DiffMeta_"+str(num),"done")
@@ -339,5 +339,5 @@
sqlLine.group("DinfoFlag", "FLAGS")
sqlLine.group("DinfoFlag2", "FLAGS2")
- sqlLine.group("dataRelease", str(self.skychunk.dataRelease))
+ sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
Index: /trunk/ippToPsps/jython/diffobjectbatch.py
===================================================================
--- /trunk/ippToPsps/jython/diffobjectbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/diffobjectbatch.py (revision 38763)
@@ -292,5 +292,5 @@
sqlLine.group("dvoRegionID", "CAT_ID")
# sqlLine.group("skycellID", "SKYCELL_ID")
- sqlLine.group("dataRelease", "'" + str(self.skychunk.dataRelease) + "'")
+ sqlLine.group("processingVersion", "'" + str(self.skychunk.processingVersion) + "'")
sqlLine.group("objInfoFlag", "FLAGS")
sqlLine.group("qualityFlag", "FLAGS >> 24 & 0xFF")
Index: /trunk/ippToPsps/jython/forcedobjectbatch.py
===================================================================
--- /trunk/ippToPsps/jython/forcedobjectbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/forcedobjectbatch.py (revision 38763)
@@ -334,4 +334,5 @@
sqlLine.group("randomForcedObjID", "RAND("+str(self.batchID)+")")
sqlLine.group("nDetections", "'0'")
+ sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
@@ -363,4 +364,5 @@
sqlLine.group("batchID", "batchID")
sqlLine.group("nDetections", "nDetections")
+ sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
sql = sqlLine.makeRaw(") SELECT ", " FROM ForcedMeanObject")
Index: /trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- /trunk/ippToPsps/jython/forcedwarpbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/forcedwarpbatch.py (revision 38763)
@@ -279,5 +279,5 @@
# self.scratchDb.updateFilterID("ForcedWarpMeta", self.filterID)
self.scratchDb.updateFilterID("ForcedWarpMeta_"+forcedWarpID,self.filterName[num][0])
- self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "dataRelease", str(self.skychunk.dataRelease))
+ self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "processingVersion", str(self.skychunk.processingVersion))
#self.tablesToExport.append("ForcedWarpMeta")
@@ -379,5 +379,5 @@
sqlLine.group("FinfoFlag","FLAGS")
sqlLine.group("FinfoFlag2","FLAGS2")
- sqlLine.group("dataRelease",str(self.skychunk.dataRelease))
+ sqlLine.group("processingVersion",str(self.skychunk.processingVersion))
print "got here too"
@@ -393,5 +393,5 @@
- # insert the per-object data (IDs, random stack ID, dataRelease, etc)
+ # insert the per-object data (IDs, random stack ID, processingVersion, etc)
#self.selectDvoObjIDs()
self.logger.infoPair("inserting dvo info: find imageID","from externID")
Index: /trunk/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- /trunk/ippToPsps/jython/ipptopspsdb.py (revision 38762)
+++ /trunk/ippToPsps/jython/ipptopspsdb.py (revision 38763)
@@ -1147,5 +1147,5 @@
self.skychunk.basePath = rs.getString(11)
- self.skychunk.dataRelease = rs.getInt(12)
+ self.skychunk.processingVersion = rs.getInt(12)
self.skychunk.deleteLocal = rs.getInt(13)
Index: /trunk/ippToPsps/jython/objectbatch.py
===================================================================
--- /trunk/ippToPsps/jython/objectbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/objectbatch.py (revision 38763)
@@ -370,5 +370,5 @@
sqlLine.group("projectionID", "PROJECTION_ID")
sqlLine.group("skycellID", "SKYCELL_ID")
- sqlLine.group("dataRelease", "'" + str(self.skychunk.dataRelease) + "'")
+ sqlLine.group("processingVersion", "'" + str(self.skychunk.processingVersion) + "'")
sqlLine.group("objInfoFlag", "FLAGS")
sqlLine.group("qualityFlag", "FLAGS >> 24 & 0xFF")
Index: /trunk/ippToPsps/jython/skychunk.py
===================================================================
--- /trunk/ippToPsps/jython/skychunk.py (revision 38762)
+++ /trunk/ippToPsps/jython/skychunk.py (revision 38763)
@@ -55,5 +55,5 @@
self.logger.infoPair("Publishing to PSPS as survey", self.pspsSurvey)
self.logger.infoPair("Loading epoch", self.epoch)
- self.logger.infoPair("Data release", "%d" % self.dataRelease)
+ self.logger.infoPair("Processing Version (aka, PV3 = 3, SAS39 = 39)", "%d" % self.processingVersion)
for batchType in self.batchTypes: self.logger.infoPair("Queuing batch type", batchType)
except:
Index: /trunk/ippToPsps/jython/stackbatch.py
===================================================================
--- /trunk/ippToPsps/jython/stackbatch.py (revision 38762)
+++ /trunk/ippToPsps/jython/stackbatch.py (revision 38763)
@@ -252,5 +252,6 @@
sqlLine.group("skyCellID", str(self.skycellID))
sqlLine.group("photoCalID", photoCalID)
- sqlLine.group("analysisVer", str(self.analysisVer))
+ sqlLine.group("analysisVer", str(self.analysisVer))
+ sqlLine.group("completMag", self.getKeyFloat(header, "%.8f", 'FLIMIT'))
sqlLine.group("expTime", self.getKeyFloat(header, "%.5f", 'EXPTIME'))
sqlLine.group("psfModelID", psfmodel)
@@ -270,5 +271,5 @@
sqlLine.group("pc002001", self.getKeyFloat(header, "%.8e", 'PC002001'))
sqlLine.group("pc002002", self.getKeyFloat(header, "%.8e", 'PC002002'))
- sqlLine.group("dataRelease", str(self.skychunk.dataRelease))
+ sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
sql = sqlLine.make(") VALUES ( ", ")")
@@ -288,5 +289,5 @@
self.logger.infoPair("Procesing table", "StackObjectThin")
- # insert the per-object data (IDs, random stack ID, dataRelease, etc)
+ # insert the per-object data (IDs, random stack ID, processingVersion, etc)
self.selectDvoObjIDs()
@@ -363,5 +364,5 @@
# sqlLine.group("a."+filter+"skyErr", "b.SKY_SIGMA / " + str(exptime))
sqlLine.group("a."+filter+"infoFlag", "b.FLAGS")
- sqlLine.group("a."+filter+"infoFlag2", "b.FLAGS2 | a."+filter+"infoFlag2")
+ sqlLine.group("a."+filter+"infoFlag2", "b.FLAGS2")
sqlLine.group("a."+filter+"nFrames", "b.N_FRAMES")
@@ -1066,5 +1067,5 @@
'''
select objID (psps object ID) from dvo restricted to this set of imageIDs. also insert
- ippObjID and several constants (for a skycell): surveyID, skyCellId, dataRelease
+ ippObjID and several constants (for a skycell): surveyID, skyCellId, processingVersion
'''
def selectDvoObjIDs(self):
@@ -1085,5 +1086,5 @@
# sqlLine.group("projectionID", "'" + str(self.projectionID) + "'")
# sqlLine.group("skyCellID", "'" + str(self.skycellID) + "'")
- # sqlLine.group("dataRelease", "'" + str(self.skychunk.dataRelease) + "'")
+ # sqlLine.group("processingVersion", "'" + str(self.skychunk.processingVersion) + "'")
# sqlLine.group("randomStackObjID", "FLOOR(RAND()*9223372036854775807)")
@@ -1122,5 +1123,5 @@
, projectionID = '" + str(self.projectionID) + "'\
, skycellID = '" + str(self.skycellID) + "'\
- , dataRelease = '" + str(self.skychunk.dataRelease) +"'"
+ , processingVersion = '" + str(self.skychunk.processingVersion) +"'"
try: self.scratchDb.execute(sql)