Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/stackbatch.py

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/stackbatch.py

@@ -243 +243 @@
             cnt=cnt+1
             
-        sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND b.PSF_FWHM "+psfCondition     
+        sql=sql+"WHERE a.ippDetectID=b.IPP_IDET AND  "+psfCondition     
         self.scratchDb.execute(sql)
 
@@ -303 +303 @@
             modelLong = model;
 
+        #does it have the EXT_COVAR in there?
+
+        sql = "DESCRIBE SkyChip_xfit 'EXT_COVAR_%'"
+        rs = self.scratchDb.executeQuery(sql)
+        rs.first()
+        hasResult = rs.next()
+        if hasResult:
+           print "EXT_COVARs exist"
+        else:
+           print "No EXT_COVARS here"
+
+        ext_covar_sql = ""
+  
+        if (hasResult):
+            ext_covar_sql = ", "+modelLong+"Covar11=b.EXT_COVAR_00_00,  \
+            "+modelLong+"Covar12=b.EXT_COVAR_00_01,  \
+            "+modelLong+"Covar13=b.EXT_COVAR_00_02,  \
+            "+modelLong+"Covar14=b.EXT_COVAR_00_03,  \
+            "+modelLong+"Covar15=b.EXT_COVAR_00_04,  \
+            "+modelLong+"Covar16=b.EXT_COVAR_00_05,  \
+            "+modelLong+"Covar17=b.EXT_COVAR_00_06,  \
+            "+modelLong+"Covar22=b.EXT_COVAR_01_01,  \
+            "+modelLong+"Covar23=b.EXT_COVAR_01_02,  \
+            "+modelLong+"Covar24=b.EXT_COVAR_01_03,  \
+            "+modelLong+"Covar25=b.EXT_COVAR_01_04,  \
+            "+modelLong+"Covar26=b.EXT_COVAR_01_05,  \
+            "+modelLong+"Covar27=b.EXT_COVAR_01_06,  \
+            "+modelLong+"Covar33=b.EXT_COVAR_02_02,  \
+            "+modelLong+"Covar34=b.EXT_COVAR_02_03,  \
+            "+modelLong+"Covar35=b.EXT_COVAR_02_04,  \
+            "+modelLong+"Covar36=b.EXT_COVAR_02_05,  \
+            "+modelLong+"Covar37=b.EXT_COVAR_02_06,  \
+            "+modelLong+"Covar44=b.EXT_COVAR_03_03,  \
+            "+modelLong+"Covar45=b.EXT_COVAR_03_04,  \
+            "+modelLong+"Covar46=b.EXT_COVAR_03_05,  \
+            "+modelLong+"Covar47=b.EXT_COVAR_03_06,  \
+            "+modelLong+"Covar55=b.EXT_COVAR_04_04,  \
+            "+modelLong+"Covar56=b.EXT_COVAR_04_05,  \
+            "+modelLong+"Covar57=b.EXT_COVAR_04_06,  \
+            "+modelLong+"Covar66=b.EXT_COVAR_05_05,  \
+            "+modelLong+"Covar67=b.EXT_COVAR_05_06,  \
+            "+modelLong+"Covar77=b.EXT_COVAR_06_06"
+       
+        
+
+
         sql = "UPDATE StackModelFit AS a, SkyChip_xfit AS b SET \
         "+model+"Radius=b.EXT_WIDTH_MAJ,  \
@@ -308 +354 @@
         "+model+"FluxErr=ABS(b.EXT_INST_MAG_SIG) * POW(10, -0.4 * b.EXT_INST_MAG) / " + str(self.expTime) + " / 1.085736, \
         "+model+"Ab=b.EXT_WIDTH_MAJ/b.EXT_WIDTH_MIN, \
-        "+model+"Phi=b.EXT_THETA,  \
-        "+modelLong+"Covar11=b.EXT_COVAR_00_00,  \
-        "+modelLong+"Covar12=b.EXT_COVAR_00_01,  \
-        "+modelLong+"Covar13=b.EXT_COVAR_00_02,  \
-        "+modelLong+"Covar14=b.EXT_COVAR_00_03,  \
-        "+modelLong+"Covar15=b.EXT_COVAR_00_04,  \
-        "+modelLong+"Covar16=b.EXT_COVAR_00_05,  \
-        "+modelLong+"Covar17=b.EXT_COVAR_00_06,  \
-        "+modelLong+"Covar22=b.EXT_COVAR_01_01,  \
-        "+modelLong+"Covar23=b.EXT_COVAR_01_02,  \
-        "+modelLong+"Covar24=b.EXT_COVAR_01_03,  \
-        "+modelLong+"Covar25=b.EXT_COVAR_01_04,  \
-        "+modelLong+"Covar26=b.EXT_COVAR_01_05,  \
-        "+modelLong+"Covar27=b.EXT_COVAR_01_06,  \
-        "+modelLong+"Covar33=b.EXT_COVAR_02_02,  \
-        "+modelLong+"Covar34=b.EXT_COVAR_02_03,  \
-        "+modelLong+"Covar35=b.EXT_COVAR_02_04,  \
-        "+modelLong+"Covar36=b.EXT_COVAR_02_05,  \
-        "+modelLong+"Covar37=b.EXT_COVAR_02_06,  \
-        "+modelLong+"Covar44=b.EXT_COVAR_03_03,  \
-        "+modelLong+"Covar45=b.EXT_COVAR_03_04,  \
-        "+modelLong+"Covar46=b.EXT_COVAR_03_05,  \
-        "+modelLong+"Covar47=b.EXT_COVAR_03_06,  \
-        "+modelLong+"Covar55=b.EXT_COVAR_04_04,  \
-        "+modelLong+"Covar56=b.EXT_COVAR_04_05,  \
-        "+modelLong+"Covar57=b.EXT_COVAR_04_06,  \
-        "+modelLong+"Covar66=b.EXT_COVAR_05_05,  \
-        "+modelLong+"Covar67=b.EXT_COVAR_05_06,  \
-        "+modelLong+"Covar77=b.EXT_COVAR_06_06   \
+        "+model+"Phi=b.EXT_THETA  \
+        "+ext_covar_sql+"  \
         WHERE a.ippDetectID=b.IPP_IDET AND b.MODEL_TYPE = '"+ippModelType+"'"
 
+        print sql
         self.scratchDb.execute(sql)
 
         # sersic fit has an extra parameter
-        if ippModelType == "PS_MODEL_SERSIC":
+        if (ippModelType == "PS_MODEL_SERSIC" and hasResult > 0):
             sql = "UPDATE StackModelFit AS a, SkyChip_xfit AS b SET \
             "+modelLong+"Covar18=b.EXT_COVAR_00_07,  \
@@ -633 +653 @@
 
         # TODO temporarily loading 1st convolved fluxes into unconvolved fields
+
+        #This assumes that there are 3 different fluxs, the first is unconv, and the 2nd and 3rd are convolved. If there are more than 3 fluxes it will break.   
+        # If there are more than 3 types of fluxes, we should do a count to find out how many there are and adjust this accordingly (make it more robust)
+
         self.logger.infoPair("Adding fluxes", "un-convolved")
-        self.updateApFlxs("", "IS NULL")
+        self.updateApFlxs("", "((b.table_index -1) % 3 = 0)")
         self.logger.infoPair("Adding fluxes", "1st convolved")
-        self.updateApFlxs("c1", "< 7.0")
+        self.updateApFlxs("c1", "((b.table_index -1) % 3 = 1)")
         self.logger.infoPair("Adding fluxes", "2nd convolved")
-        self.updateApFlxs("c2", "> 7.0")
+        self.updateApFlxs("c2", "((b.table_index -1) % 3 = 2)")
 
         self.logger.infoPair("Adding", "petrosians for extended sources")
@@ -645 +669 @@
         ,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 +677 @@
         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")