Changeset 33701

Timestamp:

Apr 4, 2012, 12:33:07 PM (14 years ago)

Author:

rhenders

Message:

changes to calculation of color errors; now populting ng, nr, ni etc; now not assuming 5 filters in cps file - using count found in Photcodes table

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -55 +55 @@
        self.dvoObjects = DvoObjects(self.logger, self.config, self.scratchDb.dbName)
 
-
        # create an output filename, which is {dvoINDEX}.FITS
        self.outputFitsFile = "%08d.FITS" % self.id
@@ -105 +104 @@
             if code < 0: continue
             filters.append([code, filter])
-        
+    
+        # get a count of the available filters
+        filterCount = len(filters)
+
+        self.logger.infoPair("Available filters", filters)
+
         # the 'code' now defines the order in the cps file that the mags are listed for a given filter
         for filter in filters:
 
             sql = "UPDATE Object \
-                   JOIN " + cpsTable + " AS cps ON (cps.row = (Object.row*5)-" + str(filter[0]) + ") \
+                   JOIN " + cpsTable + " AS cps ON (cps.row = (Object.row*" + str(filterCount) + ")-" + str(filter[0]) + ") \
                    SET \
-                   " + filter[1] + "MeanMag = MAG, \
-                   " + filter[1] + "MeanMagErr = MAG_ERR"
+                   n" + filter[1] + " = NCODE \
+                   ," + filter[1] + "MeanMag = MAG \
+                   ," + filter[1] + "MeanMagErr = MAG_ERR"
 
             self.scratchDb.execute(sql)
@@ -128 +133 @@
                ,izMeanColor = (iMeanMag - zMeanMag) \
                ,zyMeanColor = (zMeanMag - yMeanMag) \
-               ,grMeanColorErr = (gMeanMagErr - rMeanMagErr) \
-               ,riMeanColorErr = (rMeanMagErr - iMeanMagErr) \
-               ,izMeanColorErr = (iMeanMagErr - zMeanMagErr) \
-               ,zyMeanColorErr = (zMeanMagErr - yMeanMagErr) \
+               ,grMeanColorErr = SQRT(POW(gMeanMagErr,2) + POW(rMeanMagErr,2)) \
+               ,riMeanColorErr = SQRT(POW(rMeanMagErr,2) + POW(iMeanMagErr,2)) \
+               ,izMeanColorErr = SQRT(POW(iMeanMagErr,2) + POW(zMeanMagErr,2)) \
+               ,zyMeanColorErr = SQRT(POW(zMeanMagErr,2) + POW(yMeanMagErr,2)) \
                    "
         try: