Changeset 36192 for branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py

Timestamp:

Oct 9, 2013, 4:06:09 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20130904/ippToPsps

Files:

• . (modified) (1 prop)
• jython/stackbatch.py (modified) (2 diffs)

branches/eam_branches/ipp-20130904/ippToPsps/jython/stackbatch.py

@@ -645 +645 @@
         ,petRadiusErr=b.PETRO_RADIUS_ERR \
         ,petFlux=POW(10.0, -0.4 * b.PETRO_MAG) /" + str(self.expTime) + " \
-        ,petFluxErr=ABS(b.PETRO_MAG_ERR) * POW(10.0, (-0.4*b.PETRO_MAG)) / " + str(self.expTime) + " / 1.085736  \
+        ,petFluxErr=-999  \
         ,petR50=b.PETRO_RADIUS_50 \
         ,petR50Err=b.PETRO_RADIUS_50_ERR \
@@ -653 +653 @@
         WHERE a.ippDetectID=b.IPP_IDET"
         self.scratchDb.execute(sql)
+
+        self.logger.infoPair("Adding", "petFluxErr for non nulls")
+        sql = "UPDATE StackApFlx as a, SkyChip_xsrc AS b SET \
+        petFluxErr=ABS(b.PETRO_MAG_ERR) * POW(10.0, (-0.4*b.PETRO_MAG)) / " + str(self.expTime) + " / 1.085736  \
+        WHERE a.ippDetectID=b.IPP_IDET \
+        AND (b.PETRO_MAG_ERR is not NULL AND b.PETRO_MAG is not NULL AND PETRO_MAG_ERR < 1000.0)"
+        # added this because when the petromagerr is crazy large (10^29 it out of ranges the flux err calc)
+        self.logger.infoPair("sql", sql)
+        self.scratchDb.execute(sql)
+
+
 
         self.logger.infoPair("adding"," PrimaryF to stackApFlx")