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

Timestamp:

Oct 31, 2012, 11:54:39 AM (14 years ago)

Author:

bills

Message:

Changes to PSPS table definitions for SA 10.
Detection tables contain all fluxes
Object table contains all magnitudes
Populate DetectionCalib and StackDetectinCalib

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -113 +113 @@
         self.logger.infoPair("Adding magnitudes from", "cps table")
         for filter in filters:
+
+            filterID = self.scratchDb.getFilterID(filter[1])
 
             sql = "UPDATE Object JOIN \
@@ -129 +131 @@
                    ," + filter[1] + "80pct = MAG_80/1000 \
                    ," + 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       
+                   ," + filter[1] + "StackDetectID = (10 * STACK_DETECT_ID) + " + str(filterID)
+
             #self.logger.info(sql)
             self.scratchDb.execute(sql)