Changeset 31357

Timestamp:

Apr 22, 2011, 4:20:43 PM (15 years ago)

Author:

rhenders

Message:

now checking if this exposure has already been processed before proceeding

File:

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

trunk/ippToPsps/jython/detectionbatch.py

@@ -58 +58 @@
 
        self.totalNumPhotoRef = 0
+
+       # get filterID using init table
+       self.filter = self.header['FILTERID'][0:1]
+
+       # insert what we know about this stack batch into the stack table
+       self.ippToPspsDb.insertDetectionMeta(self.batchID, self.expID, self.filter)
+
 
     '''
@@ -490 +497 @@
     def populatePspsTables(self):
 
-        # get filterID using init table
-        self.filter = self.header['FILTERID'][0:1]
-
         self.populateFrameMeta()
      
@@ -592 +596 @@
         self.scratchDb.stmt.execute(sql)
 
+    '''
+    Checks whether this batch has already been processed and published
+    '''
+    def alreadyProcessed(self):
+
+        return self.ippToPspsDb.alreadyProcessed("detection", "exp_id", self.expID)
 
 
@@ -621 +631 @@
     #file = "detdemo.fits" 
     detectionBatch = DetectionBatch(logger, camID, file, True)
-    detectionBatch.createEmptyPspsTables()
-    detectionBatch.importIppTables("XY33\.psf")
-    if detectionBatch.populatePspsTables():
-        detectionBatch.exportPspsTablesToFits("([a-zA-Z]+)")
-        detectionBatch.writeBatchManifest()
-        detectionBatch.reportNullsInAllPspsTables(False)
-        #detectionBatch.createTarball()
-        #detectionBatch.publishToDatastore()
-
+
+    if not detectionBatch.alreadyProcessed():
+
+        detectionBatch.createEmptyPspsTables()
+        detectionBatch.importIppTables("XY33\.psf")
+        if detectionBatch.populatePspsTables():
+            detectionBatch.exportPspsTablesToFits("([a-zA-Z]+)")
+            detectionBatch.writeBatchManifest()
+            detectionBatch.reportNullsInAllPspsTables(False)
+            #detectionBatch.createTarball()
+            #detectionBatch.publishToDatastore()
+    
     i = i+1
     if i > 0: break