Changeset 34615 for trunk/ippToPsps/jython/objectbatch.py

Timestamp:

Oct 26, 2012, 5:15:52 PM (14 years ago)

Author:

heather

Message:

schema change sa10

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -114 +114 @@
         for filter in filters:
 
-            sql = "UPDATE Object \
-                   JOIN " + cpsTable + " AS cps ON (cps.row = (Object.row*" + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
+            sql = "UPDATE Object JOIN \
+                   " + cpsTable + " AS cps ON (cps.row = (Object.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
                    SET \
                    n" + filter[1] + " = NCODE \
@@ -122 +122 @@
                    ," + filter[1] + "MeanKronMag = MAG_KRON \
                    ," + filter[1] + "MeanKronMagErr = MAG_KRON_ERR \
-                   ," + filter[1] + "StackPSFFlux = FLUX_PSF \
-                   ," + filter[1] + "StackPSFFluxErr = FLUX_PSF_ERR \
+                   ," + filter[1] + "StackPSFMag = -2.5 * log10(FLUX_PSF) + 8.9 \
+                   ," + filter[1] + "StackPSFMagErr = FLUX_PSF_ERR / FLUX_PSF \
                    ," + filter[1] + "StackKronMag = -2.5 * log10(FLUX_KRON) + 8.9 \
                    ," + filter[1] + "StackKronMagErr = FLUX_KRON_ERR / FLUX_KRON \
                    ," + filter[1] + "20pct = MAG_20/1000 \
                    ," + filter[1] + "80pct = MAG_80/1000 \
-                   ," + filter[1] + "Flags = FLAGS "  
-                   
+                   ," + filter[1] + "Flags = FLAGS  \
+                   ," + filter[1] + "StackDetectID = STACK_ID"
+
+            #stackDetectID needs to be filled still for SA10 - currently at STACK_ID for test purposes
+            # everthing should be correctly calculated as mags for SA10       
+            #self.logger.info(sql)
+            self.scratchDb.execute(sql)
+
+        self.logger.infoPair("Calculating nDetections from", "n[filters]")
+        for filter in filters:
+            # now do a sum of n[filters], but do not include the ones with -999
+            sql = "UPDATE Object \
+                   SET nDetections = nDetections + n" + filter[1] + " \
+                   WHERE n" + filter[1] + " != -999"
+            self.scratchDb.execute(sql)
             
-            self.scratchDb.execute(sql)
+
+
 
         # now set to null all MeanMagErr values > 0.5 (cut set by Gene, 2012-04-12)
@@ -204 +218 @@
                ,decErr \
                ,nDetections \
-               ,extra \
+               ,qfPerfect \
                ,sgSep \
                ,dataRelease \