Changeset 32286 for trunk/ippToPsps

Timestamp:

Sep 2, 2011, 12:05:34 AM (15 years ago)

Author:

rhenders

Message:

now using a stored procedure to calculate likelihoods. much, much faster than using the cursor, as previously

File:

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

trunk/ippToPsps/jython/detectionbatch.py

@@ -406 +406 @@
                ,psfWidMinor \
                ,psfTheta \
+               ,psfLikelihood \
                ,psfCf \
                ,momentXX \
@@ -437 +438 @@
                ,PSF_MINOR \
                ,PSF_THETA \
+               ,psfLikelihood(EXT_NSIGMA) \
                ,PSF_QF \
                ,MOMENTS_XX \
@@ -459 +461 @@
         self.scratchDb.execute(sql)
 
+        # update cosmic ray and extended likelihoods
+        sql="UPDATE " + pspsTableName + " SET extendedLikelihood = 0, crLikelihood = 1.0 - psfLikelihood WHERE sgSep <= 0"
+        self.scratchDb.execute(sql)
+        sql="UPDATE " + pspsTableName + " SET crLikelihood = 0, extendedLikelihood = 1.0 - psfLikelihood WHERE sgSep > 0"
+        self.scratchDb.execute(sql)
+
+        # remove detections will NULL inst flux or NULL peak ADU
         results['NULLINSTFLUX'] = self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "instFlux")
         results['NULLPEAKADU'] = self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "peakADU")
@@ -566 +575 @@
 
         self.scratchDb.execute(sql)
-
-    '''
-    Generates psf, cosmic ray and extended source likelihoods
-    '''
-    def populateLikelihoods(self, tableName):
-
-        sql = "SELECT ippDetectID, psfLikelihood, crLikelihood, extendedLikelihood, sgSep FROM " + tableName
-        rs = self.scratchDb.executeUpdatableQuery(sql)
-
-        sqrt2 = Math.sqrt(2)
-
-        while rs.next():
-
-            sgSep = rs.getDouble(5)
-            psfLikelihood = Erf.erfc(Math.abs(sgSep)/sqrt2)
-        
-            if sgSep > 0:
-                crLikelihood = 0
-                extendedLikelihood = 1.0 - psfLikelihood
-            else:
-                crLikelihood = 1.0 - psfLikelihood
-                extendedLikelihood = 0
-
-            # update columns
-            rs.updateDouble(2, psfLikelihood )
-            rs.updateDouble(3, crLikelihood )
-            rs.updateDouble(4, extendedLikelihood )
-
-            # now 'commit' to database
-            rs.updateRow();
 
 
@@ -685 +664 @@
                 results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + ota, "objID")
                 self.updateImageID("Detection_" + ota, x, y) 
-                self.populateLikelihoods("Detection_" + ota)
                 rowCount = self.scratchDb.getRowCount("Detection_" + ota) 
                 self.logger.info("| %5s | %13d | %13d | %13d | %13d | %13d | %13d |",