Changeset 33098 for branches/meh_branches/ppsub_test/ippToPsps/jython/scratchdb.py

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/scratchdb.py (modified) (3 diffs)

branches/meh_branches/ppsub_test/ippToPsps/jython/scratchdb.py

@@ -41 +41 @@
 
     '''
+    Creates a stored procedure for psfLikelihood. This uses an implementation of the complimentary error function taken from Numerical Recipes in C.
+    '''
+    def createPsfLikelihoodFunction(self):
+
+        sql = "DROP FUNCTION IF EXISTS `psfLikelihood`"
+        try:
+            self.execute(sql)
+        except:
+            self.logger.errorPair("Could not drop stored procedure", "psfLikelihood")
+            return False
+
+        sql = "CREATE FUNCTION `psfLikelihood`(x REAL) RETURNS REAL \
+               DETERMINISTIC \
+               COMMENT 'Returns the psfLikelihood using the complimentary error function with fractional error everywhere less than 1.2 x 10-7. From Numerical Recipes in C' \
+               BEGIN \
+               DECLARE ans REAL; \
+               DECLARE t REAL; \
+               DECLARE z REAL; \
+               SET x = ABS(x) / 1.4142135623731; \
+               SET z=ABS(x); \
+               SET t=1.0 / (1.0 + 0.5*z); \
+               SET ans = t * EXP(-z*z-1.26551223+t*(1.00002368+t*(.37409196+t*(.09678418+t*(-.18628806+t*(.27886807+t*(-1.13520398+t*(1.48851587+t*(-.82215223+t*.17087277))))))))); \
+               IF x < 0.0 THEN \
+               SET ans = 2.0 - ans; \
+               END IF; \
+               RETURN ans; \
+               END"
+
+        try:
+            self.execute(sql)
+            self.logger.debugPair("Installed stored procedure", "psfLikelihood")
+            return True
+        except:
+            self.logger.errorPair("Could not install stored procedure", "psfLikelihood")
+            return False
+
+    '''
     Gets survey ID for this survey name
     '''
@@ -55 +92 @@
 
         return surveyID
+
+    '''
+    Gets filter ID for this filter name
+    '''
+    def getFilterID(self, name):
+     
+        sql = "SELECT filterID FROM Filter WHERE filterType = '" + name + "'"
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            filterID = rs.getInt(1)
+        except:
+            self.logger.errorPair("No filter ID found for filter", name)
+            filterID = -1
+
+        return filterID
 
     ''' 
@@ -137 +190 @@
         
     '''
+    Checks whether the astrometric solution is ok for this chip
+    TODO the value of 50 for numAstroRef is hardcoded here, but this should be temporary anyway
+    '''
+    def astrometricSolutionOK(self, ota):
+
+        sql = "SELECT numAstroRef FROM ImageMeta_" + ota
+
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            if rs.getInt(1) < 50:
+                self.logger.debug("Bad astrometric solution for",  ota)
+                return False
+            else:
+                return True
+        except:
+            self.logger.debug("Unable to check astrometric solution")
+
+        return True
+
+    '''
     Have we already imported this DVO table?
     '''