Changeset 31284 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Apr 14, 2011, 3:16:00 PM (15 years ago)

Author:

rhenders

Message:

Added moments (weak-lensing stuff)

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -9 +9 @@
 import logging.config
 
+'''
+StackBatch class
+'''
 class StackBatch(Batch):
 
@@ -19 +22 @@
                "stack", 
                inputFile, 
-               "MD04") # TODO
-
-       self.logger.info("StackBatch constructor. Creating batch from: ''" + inputFile + "'")
+               "ThreePi") # TODO
+
+       self.logger.info("StackBatch constructor. Creating batch from: '" + inputFile + "'")
 
        # obs time makes no sense except for nightly stacks
@@ -35 +38 @@
 
        # create an output filename, which is {filterID}{skycellID}.FITS
-       self.outputFitsFile = "%s%07d.FITS" % (self.filter, int(self.skycell));
-       self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile);
+       self.outputFitsFile = "%s%07d.FITS" % (self.filter, int(self.skycell))
+       self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
 
        # set some constants
        self.dataRelease = "1"
-       self.stackVer = "1"
        self.historyModNum = "0"
 
@@ -241 +243 @@
                ippDetectID \
                ,skyCellID \
-               ,stackVer \
                ,obsTime \
                ,xPos \
@@ -258 +259 @@
                ,infoFlag \
                ,psfCf \
+               ,momentXX \
+               ,momentXY \
+               ,momentYY \
+               ,momentM3C \
+               ,momentM3S \
+               ,momentM4C \
+               ,momentM4S \
+               ,momentR1 \
+               ,momentRH \
                ,nFrames \
                ,assocDate \
@@ -265 +275 @@
                IPP_IDET \
                ," + self.skycell + " \
-               ," + self.stackVer + " \
                ," + self.header['MJD-OBS'] + " \
                ,X_PSF \
@@ -282 +291 @@
                ,FLAGS << 32 | FLAGS2 \
                ,PSF_QF \
+               ,MOMENTS_XX \
+               ,MOMENTS_XY \
+               ,MOMENTS_YY \
+               ,MOMENTS_M3C \
+               ,MOMENTS_M3S \
+               ,MOMENTS_M4C \
+               ,MOMENTS_M4S \
+               ,MOMENTS_R1 \
+               ,MOMENTS_RH \
                ,N_FRAMES \
-               ," + self.dateStr + " \
+               , '" + self.dateStr + "' \
                ," + self.historyModNum + " \
                FROM SkyChip_psf"
@@ -434 +452 @@
 logging.config.fileConfig("logging.conf")
 logger = logging.getLogger("stackbatch")
+logger.info("Starting")
 sky_id = 299 # TODO
 gpc1Db = Gpc1Db(logger)
@@ -445 +464 @@
     stackBatch.createEmptyPspsTables()
     stackBatch.importIppTables("")
-#    stackBatch.populatePspsTables()
- #   stackBatch.fudgeIDs()
-  #  stackBatch.reportNullsInAllPspsTables(False)
-  #  stackBatch.replaceAllPspsNulls("-999")  
-  #  stackBatch.exportPspsTablesToFits()
-  #  stackBatch.writeBatchManifest()
-  #  stackBatch.createTarball()
-  #  stackBatch.publishToDatastore()
+    stackBatch.populatePspsTables()
+    stackBatch.fudgeIDs()
+    stackBatch.reportNullsInAllPspsTables(False)
+    #    stackBatch.replaceAllPspsNulls("-999")  
+    stackBatch.exportPspsTablesToFits()
+    stackBatch.writeBatchManifest()
+    #stackBatch.createTarball()
+    #stackBatch.publishToDatastore()
 
     i = i + 1
     if i > 0: break # TODO just doing one filter for now
 
+logger.info("Finished")