Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/stackbatch.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippToPsps/jython/stackbatch.py (modified) (16 diffs)

branches/eam_branches/ipp-20110906/ippToPsps/jython/stackbatch.py

@@ -19 +19 @@
 '''
 StackBatch class
+
+This class, a sub-class of Batch, processes single stack skycells in the form of IPP cmf files
+
 '''
 class StackBatch(Batch):
@@ -31 +34 @@
                  gpc1Db,
                  ippToPspsDb,
-                 stackID):
+                 stackID,
+                 batchID):
 
        super(StackBatch, self).__init__(
@@ -40 +44 @@
                ippToPspsDb,
                stackID,
+               batchID,
                "ST", 
                gpc1Db.getStackStageCmf(stackID))
@@ -56 +61 @@
        self.filter = self.filter[0:1]
        self.skycell = meta[1];
-       # TODO HACK fix this
+
+       # skycell is, eg "skycell.1133.081"
+       # 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
+       #self.projectioncell = self.skycell[8:12]
+       #self.skycell = self.skycell[8:]
+       #self.skycell = self.skycell.replace(".", "")
+       #self.projectioncell = self.skycell[8:12]
+
+       # TODO this is the wrong way, but is consistent with SkyCell table in IN data
        self.skycell = self.skycell[8:12]
-       # mangling e.g. 0683.043 into 0683043 for now until we have a schema change
-       #self.skycell = self.skycell.replace(".", "")
+       self.projectioncell = self.skycell
+
        self.analysisVer = meta[2];
 
@@ -81 +96 @@
        self.scratchDb.dropTable("SkyChip_xsrc")
 
-       # create an output filename, which is {filterID}{skycellID}.FITS
+       # create an output filename, which is {stackID}.FITS
        self.outputFitsFile = "%08d.FITS" % self.id
        self.outputFitsPath = "%s/%s" % (self.localOutPath, self.outputFitsFile)
@@ -94 +109 @@
        if not self.useFullTables:
            self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
-
 
        # dump stuff to log
@@ -100 +114 @@
        self.logger.infoPair("Stack type", "%s" % self.stackType)
        self.logger.infoPair("Skycell", "%s" % self.skycell)
+       self.logger.infoPair("Projectioncell", "%s" % self.projectioncell)
        self.logger.infoPair("Filter", "%s" % self.filter)
-
-
 
     '''
@@ -251 +264 @@
         ,expTime \
         ,psfModelID \
+        ,psfFwhm_mean \
+        ,psfFwhm_max \
         ,ctype1 \
         ,ctype2 \
@@ -270 +285 @@
         ," + str(self.expTime) + " \
         ,'" + self.safeDictionaryAccess(self.header, 'PSFMODEL') + "' \
+        ,'" + self.safeDictionaryAccess(self.header, 'FWHM_MAJ') + "' \
+        ,'" + self.safeDictionaryAccess(self.header, 'FW_MJ_UQ') + "' \
         ,'" + self.header['CTYPE1'] + "' \
         ,'" + self.header['CTYPE2'] + "' \
@@ -301 +318 @@
                ippDetectID \
                ,skyCellID \
+               ,projectionCellID \
                ,obsTime \
                ,xPos \
@@ -315 +333 @@
                ,psfWidMinor \
                ,psfTheta \
+               ,psfLikelihood \
                ,infoFlag \
                ,psfCf \
@@ -339 +358 @@
                IPP_IDET \
                ," + self.skycell + " \
+               ," + self.projectioncell + " \
                ," + self.header['MJD-OBS'] + " \
                ,X_PSF \
@@ -353 +373 @@
                ,PSF_MINOR \
                ,PSF_THETA \
+               ,psfLikelihood(EXT_NSIGMA) \
                ,FLAGS << 32 | FLAGS2 \
                ,PSF_QF \
@@ -531 +552 @@
                objID \
                ,ippObjID \
+               ,projectionCellID \
                ) \
                SELECT \
                DISTINCT objID \
                ,ippObjID \
+               ,projectionCellID \
                FROM StackDetection"
         self.scratchDb.execute(sql)
@@ -573 +596 @@
         self.scratchDb.createIndex("StackModelFit", "ippDetectID")
 
+        return True
+
     '''
     Applies indexes to the IPP tables
@@ -583 +608 @@
         self.scratchDb.createIndex("SkyChip_xrad", "IPP_IDET")
         self.scratchDb.createIndex("SkyChip_xsrc", "IPP_IDET")
+
+        return True
 
     '''