Changeset 32192

Timestamp:

Aug 25, 2011, 1:05:26 PM (15 years ago)

Author:

rhenders

Message:

primary key on StackDetection is now on objID only; duplicates will be rejected.

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -385 +385 @@
         self.updateStackTypeID("StackDetection")
         self.updateDvoIDs("StackDetection")
-        sql = "ALTER TABLE StackDetection ADD PRIMARY KEY (objID, stackDetectID)"
-        self.scratchDb.execute(sql)
-
+        sql = "ALTER IGNORE TABLE StackDetection ADD PRIMARY KEY (objID)"
+        self.scratchDb.execute(sql)
+  
         if self.stackType == "DEEP_STACK": 
 
@@ -394 +394 @@
                    SET instFlux = 2*b.PSF_INST_FLUX_SIG \
                    WHERE instFlux IS NULL \
+                   AND a.ippDetectID = b.IPP_IDET  \
                    AND b.PSF_INST_FLUX_SIG IS NOT NULL"
             self.scratchDb.execute(sql)
-            #    instFlux = 2*PSF_INST_FLUX_SIG
             
         self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "instFlux")
@@ -591 +591 @@
         imageID = self.scratchDb.getImageIDFromExternID(self.header['SOURCEID'], self.header['IMAGEID'])
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
-        sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
+        sql = "UPDATE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
                a.ippObjID = b.ippObjID, \
                a.stackDetectID = b.detectID, \