Changeset 35044 for branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py

Timestamp:

Jan 24, 2013, 11:38:15 AM (13 years ago)

Author:

eugene

Message:

drop ImageMeta_ tables before reading headers, or they can be left behind, only set ccdID to non-zero if chipname is like XYnn

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py (modified) (4 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py

@@ -231 +231 @@
         tableName = "ImageMeta_" + ota
         
+        # XXX we drop the table above so it is not left behind on failure
         # drop then re-create table
-        self.scratchDb.dropTable(tableName)
+        # self.scratchDb.dropTable(tableName)
         sql = "CREATE TABLE " + tableName + " LIKE ImageMeta"
         try: self.scratchDb.execute(sql)
         except: pass
+        if (ota[0:2] == "XY"): ccdID = ota[2:4]
+        else: ccdID = 0
 
         # insert image metadata into table
@@ -302 +305 @@
                ) VALUES ( \
                " + str(self.expID) + " \
-               ," + ota[2:4] + " \
+               ," + str(ccdID) + " \
                ," + str(self.bias) + " \
                ," + str(self.biasScat) + " \
@@ -602 +605 @@
     def alterPspsTablesChip(self, chipname, extname, x, y):
 
+        # drop the ImageMeta_ table first, or we can leave an invalid table behind
+        tableName = "ImageMeta_" + chipname
+        
+        # drop then re-create table
+        self.scratchDb.dropTable(tableName)
+
         # load corresponding header into memory
         header = self.fits.findAndReadHeader(extname)
@@ -714 +723 @@
     '''
     def populatePspsTablesChip(self, chipname, x, y, results, tables):
+        # XXX EAM NOTE: drop tables (Detection_, SkinnyObject_, DetectionCalib_, Detection_) here so
+        # they do not polute the db?
+        # XXX or put an explicit drop at the end of the loop?
+
         #self.logger.infoTitle("Processing " + chipname)
         # this is a bit crude: if the chip is not present, this test will fail and the chip