Index: /trunk/ippToPsps/config/tables.P2.vot
===================================================================
--- /trunk/ippToPsps/config/tables.P2.vot (revision 36714)
+++ /trunk/ippToPsps/config/tables.P2.vot (revision 36715)
@@ -18,5 +18,5 @@
filter identifier
-
+
camera identifier
Index: /trunk/ippToPsps/config/tables.ST.vot
===================================================================
--- /trunk/ippToPsps/config/tables.ST.vot (revision 36714)
+++ /trunk/ippToPsps/config/tables.ST.vot (revision 36715)
@@ -4161,5 +4161,6 @@
estimated filling factor at R10
-
+
+
Index: /trunk/ippToPsps/jython/gpc1db.py
===================================================================
--- /trunk/ippToPsps/jython/gpc1db.py (revision 36714)
+++ /trunk/ippToPsps/jython/gpc1db.py (revision 36715)
@@ -398,5 +398,5 @@
# print "staring stack stage cmf"
-
+ #self.logger.infoPair("in stackstagecmf - sql is: ", sql)
# get single path base for the directory containing all cmf files, one of which is hopefully for our stack_id
try:
@@ -524,14 +524,22 @@
AND filter = '" + filter + "' \
AND sky_id = %d" % skyID
-
- try:
- rs = self.executeQuery(sql)
- rs.first()
- return rs.getInt()
-
+
+# self.logger.infoPair("sql",sql)
+
+ try:
+ rs = self.executeQuery(sql)
+
except:
self.logger.exception("can't query for stackid in DVO")
self.logger.infoPair("failed sql:", sql)
- return -999
-
- return 0
+ return 0
+
+ rs.first()
+ try:
+ stackid = rs.getInt(1)
+ self.logger.infoPair("found stack_ID", stackid)
+ except:
+ stackid = -999
+ self.logger.infoPair("using stack_ID",stackid)
+
+ return stackid
Index: /trunk/ippToPsps/jython/stackbatch.py
===================================================================
--- /trunk/ippToPsps/jython/stackbatch.py (revision 36714)
+++ /trunk/ippToPsps/jython/stackbatch.py (revision 36715)
@@ -57,5 +57,5 @@
# self.printline = 0
# # self.testprint()
- self.logger.infoPair("did I get", "here");
+# self.logger.infoPair("did I get", "here");
self.stackType = "DEEP_STACK" # TODO
## = stuff I commented out for pv2 stacks
@@ -65,60 +65,86 @@
# get a list of stackIDs
self.logger.infoPair ("getting stackID for: ","g.00000")
- self.gstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "g.00000")
+ gstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "g.00000")
self.logger.infoPair ("getting stackID for: ","r.00000")
- self.rstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "r.00000")
+ rstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "r.00000")
self.logger.infoPair ("getting stackID for: ","i.00000")
- self.istackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "i.00000")
+ istackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "i.00000")
self.logger.infoPair ("getting stackID for: ","z.00000")
- self.zstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "z.00000")
+ zstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "z.00000")
self.logger.infoPair ("getting stackID for: ","y.00000")
- self.ystackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "y.00000")
-
+ ystackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "y.00000")
+ # self.logger.infoPair("g stackID ",gstackID)
+ # self.logger.infoPair("r stackID ",rstackID)
+ # self.logger.infoPair("i stackID ",istackID)
+ # self.logger.infoPair("z stackID ",zstackID)
+ # self.logger.infoPair("y stackID ",ystackID)
+ # raise
# from each stackget fits name from getStackStageCmf
- self.logger.infoPair ("finding fits file for: ","g.00000")
- self.gfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, gstackID)
- self.logger.infoPair ("finding fits file for: ","r.00000")
- self.rfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, rstackID)
- self.logger.infoPair ("finding fits file for: ","i.00000")
- self.ifits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, istackID)
- self.logger.infoPair ("finding fits file for: ","z.00000")
- self.zfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, zstackID)
- self.logger.infoPair ("finding fits file for: ","y.00000")
- self.yfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, ystackID)
+ if gstackID > 0:
+ self.logger.infoPair ("finding fits file for: ","g.00000")
+ gfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, gstackID)
+ if rstackID > 0:
+ self.logger.infoPair ("finding fits file for: ","r.00000")
+ rfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, rstackID)
+ if istackID > 0:
+ self.logger.infoPair ("finding fits file for: ","i.00000")
+ ifits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, istackID)
+ if zstackID > 0:
+ self.logger.infoPair ("finding fits file for: ","z.00000")
+ zfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, zstackID)
+ if ystackID > 0:
+ self.logger.infoPair ("finding fits file for: ","y.00000")
+ yfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, ystackID)
#from each of those get self.gheader, self.rheader, etc.
-
- if self.gfits:
- self.gheader = self.gfits.getPrimaryHeader()
- if not self.gheader:
- self.logger.errorPair("could not read FITS PHU for ",gstackID)
+ if gstackID > 0:
+ if gfits:
+ gheader = gfits.getPrimaryHeader()
+ if not gheader:
+ self.logger.errorPair("could not read FITS PHU for ",gstackID)
+ raise
+ if rstackID > 0:
+ if rfits:
+ rheader = rfits.getPrimaryHeader()
+ if not rheader:
+ self.logger.errorPair("could not read FITS PHU for ",rstackID)
+ raise
+ if istackID > 0:
+ if ifits:
+ iheader = ifits.getPrimaryHeader()
+ if not iheader:
+ self.logger.errorPair("could not read FITS PHU for ",istackID)
+ raise
+ if zstackID > 0:
+ if zfits:
+ zheader = zfits.getPrimaryHeader()
+ if not zheader:
+ self.logger.errorPair("could not read FITS PHU for ",zstackID)
+ raise
+ if ystackID > 0:
+ if yfits:
+ yheader = yfits.getPrimaryHeader()
+ if not yheader:
+ self.logger.errorPair("could not read FITS PHU for ",ystackID)
+ raise
+
+ # get stack meta data
+ metastackid = -999
+ if gstackID > 0:
+ metastackid = gstackID
+ if rstackID > 0:
+ metastackid = rstackID
+ if istackID > 0:
+ metastackid = istackID
+ if zstackID > 0:
+ metastackid = zstackID
+ if ystackID > 0:
+ metastackid = ystackID
+ #there is probably a better way to do this
+ if metastackid < 0:
+ self.logger.errorPair("can't find any stack ids...?? ","??")
raise
-
- if self.rfits:
- self.rheader = self.rfits.getPrimaryHeader()
- if not self.rheader:
- self.logger.errorPair("could not read FITS PHU for ",rstackID)
- raise
-
- if self.ifits:
- self.iheader = self.ifits.getPrimaryHeader()
- if not self.iheader:
- self.logger.errorPair("could not read FITS PHU for ",istackID)
- raise
-
- if self.zfits:
- self.zheader = self.zfits.getPrimaryHeader()
- if not self.zheader:
- self.logger.errorPair("could not read FITS PHU for ",zstackID)
- raise
-
- if self.yfits:
- self.yheader = self.yfits.getPrimaryHeader()
- if not self.yheader:
- self.logger.errorPair("could not read FITS PHU for ",ystackID)
- raise
-
- # get stack meta data
- meta = self.gpc1Db.getStackStageMeta(self.gstackID)
+
+ meta = self.gpc1Db.getStackStageMeta(metastackid)
## this should be ok - it takes a stack_id and returns filter/skycell etc.
@@ -128,7 +154,7 @@
raise
- ##self.filter = meta[0];
- ##self.filter = self.filter[0:1]
- ##self.filterID = self.scratchDb.getFilterID(self.filter)
+ #self.filter = meta[0];
+ #self.filter = self.filter[0:1]
+ #self.filterID = self.scratchDb.getFilterID(self.filter)
self.skycell = meta[1];
@@ -138,5 +164,5 @@
# we need 1133.081 for skycell, but store as an int, so instead store 1133081
# projection cell is just the 1133 bit
- # this is how it should be done
+ # This Is how it should be done
#self.projectioncell = self.skycell[8:12]
#self.skycell = self.skycell[8:]
@@ -205,5 +231,5 @@
# insert what we know about this stack batch into the stack table
- self.ippToPspsDb.insertStackMeta(self.batchID, "grizy" , self.stackType)
+ self.ippToPspsDb.insertStackMeta(self.batchID, "x" , self.stackType)
# insert sourceID/imageID combo so DVO can look it up