Changeset 36716

Timestamp:

May 1, 2014, 1:46:56 PM (12 years ago)

Author:

heather

Message:

stacks stackmeta not happy

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (10 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -84 +84 @@
            self.logger.infoPair ("finding fits file for: ","g.00000")
            gfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, gstackID)
+           self.gfits = gfits
        if rstackID > 0:    
            self.logger.infoPair ("finding fits file for: ","r.00000")
            rfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, rstackID)
+           self.rfits = rfits
        if istackID > 0:    
            self.logger.infoPair ("finding fits file for: ","i.00000")
            ifits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, istackID)
+           self.ifits = ifits
        if zstackID > 0:    
            self.logger.infoPair ("finding fits file for: ","z.00000")
            zfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, zstackID)
+           self.zfits = zfits
        if ystackID > 0:    
            self.logger.infoPair ("finding fits file for: ","y.00000")
            yfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, ystackID)
+           self.yfits = yfits
 
        #from each of those get self.gheader, self.rheader, etc.
@@ -104 +109 @@
                    self.logger.errorPair("could not read FITS PHU for ",gstackID)
                    raise
+               self.gheader = gheader
        if rstackID > 0:        
            if rfits:
@@ -110 +116 @@
                    self.logger.errorPair("could not read FITS PHU for ",rstackID)
                    raise
+               self.rheader = rheader
        if istackID > 0:        
            if ifits:
@@ -116 +123 @@
                    self.logger.errorPair("could not read FITS PHU for ",istackID)
                    raise
+               self.iheader = iheader
        if zstackID > 0:
            if zfits:
@@ -122 +130 @@
                    self.logger.errorPair("could not read FITS PHU for ",zstackID)
                    raise
+               self.zheader = zheader
        if ystackID > 0: 
            if yfits:
@@ -128 +137 @@
                    self.logger.errorPair("could not read FITS PHU for ",ystackID)
                    raise
-
+               self.yheader = yheader
        # get stack meta data
+       self.gstackID = gstackID
+       self.rstackID = rstackID
+       self.istackID = istackID     
+       self.zstackID = zstackID
+       self.ystackID = ystackID
+
        metastackid = -999
        if gstackID > 0:
@@ -180 +195 @@
        # self.skycell = str( (tessID * (10000 * 1000)) + (int(self.projectioncell) * 1000) + cellID )
 
-       ##self.analysisVer = meta[2];
+       self.analysisVer = meta[2];
 
        #self.expTime = gpc1Db.getStackExpTime(self.id)
-       ##self.expTime = self.header['EXPTIME']
-
+       
        # delete PSPS tables
        self.scratchDb.dropTable("gStackMeta")
@@ -224 +238 @@
 
        # create an output filename, which is {stackID}.FITS
+       self.logger.infoPair( "self.id", self.id)
+       self.logger.infoPair ("self.localOutPath",self.localOutPath)
        self.outputFitsFile = "%08d.FITS" % self.id
        self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
-
+       self.logger.infoPair("self.outputFitsFile",self.outputFitsFile)
+       
        # set some constants
        self.historyModNum = "0"
@@ -491 +508 @@
     Populates the StackMeta table, mainly from dictionary values found in IPP FITS header
     '''
-    def populateStackMeta(self):
+    def populateStackMeta(self,filter):
 
         self.logger.infoPair("Procesing table", "StackMeta")
@@ -971 +988 @@
         # dec is reserved in MySQL, so STILTS replaces if with dec_, which is not the name of 
         # the column in PSPS
-        self.scratchDb.execute("ALTER TABLE StackObject CHANGE dec_ `dec` double")
+        ## we don't have that in stacks anymore (it is now gdec/rdec/etc)
+        ##self.scratchDb.execute("ALTER TABLE StackObject CHANGE dec_ `dec` double")
 
         return True