Changeset 38958 for trunk/ippToPsps/jython/detectionbatch.py

Timestamp:

Oct 24, 2015, 2:20:15 PM (11 years ago)

Author:

eugene

Message:

adjust md5sum code to put options into single location; test for AP_NPIX before trying to use in diffbatch; apply static plate scale in stackbatch; add FW source X,Y, ccdID

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (19 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -46 +46 @@
 
        super(DetectionBatch, self).__init__(
-               logger,
-               config,
-               skychunk,
-               gpc1Db,
-               ippToPspsDb,
-               scratchDb,
-               camID,
-               batchID,
-               "P2", 
-               gpc1Db.getCameraStageSmf(camID,skychunk.P2_smf_version))
+           logger,
+           config,
+           skychunk,
+           gpc1Db,
+           ippToPspsDb,
+           scratchDb,
+           camID,
+           batchID,
+           "P2", 
+           gpc1Db.getCameraStageSmf(camID,skychunk.P2_smf_version))
 
        # get camera meta data
@@ -109 +109 @@
            self.logger.errorPair("Could not get", "FILTERID")
            raise
-       
+           
        # MJD-OBS is the exposure start, EXTIME / 172800 = (EXPTIME sec / 84600 sec/day) / 2
        self.obsTime = float(self.header['MJD-OBS']) + (float(self.header['EXPTIME']) / 172800.0)
-    
+       
        ## MEH md5sum options test 
-       self.md5sum = None
        self.md5sum = self.fits.getMd5sum()
-       #self.md5sum = self.fits.getMd5sumShell()
-       #self.md5sum = self.fits.getMd5sumFile()
-  
+       
        # set up some defauts
        self.totalNumPhotoRef = 0
-
 
        self.filter = self.header['FILTERID'][0:1]
@@ -198 +194 @@
         self.scratchDb.updateFilterID("FrameMeta", self.filter)
         self.scratchDb.updateAllRows("FrameMeta", "processingVersion", str(self.skychunk.processingVersion))
+        return True
 
     '''
@@ -344 +341 @@
         self.scratchDb.execute(sql)
 
+        print "---- inserted ImageMeta into mysql"
+
         self.scratchDb.updateRecalStats(tableName, header['IMAGEID'], str(pltscale));
         self.scratchDb.updateFilterID(tableName, self.filter)
         self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
 
+        print "---- updated things"
+
         if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO'])
         self.scratchDb.replaceNullsInThisColumn(tableName, "polyOrder", "0")
 
+        print "---- completed ImageMeta"
+        return True
+
     '''
     Populates the ImageDetEffMeta table for this OTA
     '''
     def populateImageDetEffMetaTablePart1(self, ota, header):
+        print "---- *** populate ImageDetEffMetaTablePart1"
         ippTableName = ota + "_deteff"
         tableName = "ImageDetEffMeta_" + ota
@@ -384 +389 @@
 
         # for loop
+        return True
 
     '''
@@ -389 +395 @@
     '''
     def populateImageDetEffMetaTablePart2(self, ota):
+        print "---- *** populate ImageDetEffMetaTablePart2"
+
         ippTableName = ota + "_deteff"
         tableName = "ImageDetEffMeta_" + ota
 
-              # ok, this is a bit tricky - Ideally I just want this all in one table, however, the way the table is layed out is 90 degrees from how I want it.
+        # ok, this is a bit tricky - Ideally I just want this all in one table, however, the way the table is layed out is 90 degrees from how I want it.
         # the steps out of this mess are as follows:
         # give an index to XYxy_deteff (already done, called table_index)
@@ -424 +432 @@
                           self.logger.errorPair('failed sql: ', sql)
                           raise
+        return True
                
 
@@ -552 +561 @@
         # we don't delete these anymore
         results['NULLINSTFLUX'] = 0;
+        return True
 
     '''
@@ -580 +590 @@
 
         self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
+        return True
+
     '''
     Populates the SkinnyObject table for this OTA
@@ -607 +619 @@
 
         self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
+        return True
 
     '''
@@ -641 +654 @@
             
         # populate ImageMeta
+        # XXX EAM 20151024 : 
         if not self.populateImageMetaTable(chipname, header):
             self.logger.infoPair("skipping chip: ", chipname)
@@ -647 +661 @@
         self.updateImageID("ImageMeta_" + chipname, x, y) 
 
+        # XXX EAM 20151024 : problem is here?
         self.populateImageDetEffMetaTablePart1(chipname, header)
         self.updateImageID("ImageDetEffMeta_" + chipname, x, y)
@@ -693 +708 @@
         return True
 
-
     '''
     Applies indexes to the IPP tables
@@ -722 +736 @@
 
         self.logger.infoPair("created indexes on", "IPP tables")      
+        return True
+
 
     '''
@@ -771 +787 @@
 
         self.scratchDb.execute(sql)
+        return True
 
     '''
@@ -786 +803 @@
             self.logger.errorPair('failed sql',sql)
             raise
+        return True
         
     '''
@@ -1004 +1022 @@
 
         print "duplicates found: ", str(Nduplicates)
+        return True
 
     '''
@@ -1012 +1031 @@
         sql = "UPDATE " + tableName + " SET imageID = %d%d%d" % (self.expID, x, y) 
         self.scratchDb.execute(sql)
+        return True
 
     '''
@@ -1022 +1042 @@
             if table.name == "FrameMeta": self.scratchDb.reportNulls(table.name, showPartials)
             else: self.scratchDb.reportNulls(table.name + "_XY33", showPartials)
-
+        return True
 
     '''