Changeset 37200 for branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

Timestamp:

Aug 7, 2014, 6:21:58 AM (12 years ago)

Author:

eugene

Message:

add platescale; fix ra,dec; change likelihood to chisq (for now)

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py (modified) (5 diffs)

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

@@ -428 +428 @@
             sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
             sqlLine.group("a."+filter+"KronRad",       "b.MOMENTS_R1 * 2.5")
+            sqlLine.group("a."+filter+"PlateScale",    "b.PLTSCALE")
 
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
@@ -519 +520 @@
                       
         sqlLine.group("a." + filter + model + "Radius",    "b.EXT_WIDTH_MAJ")
-        sqlLine.group("a." + filter + model + "Ab",        "b.EXT_WIDTH_MAJ/b.EXT_WIDTH_MIN")
-        sqlLine.group("a." + filter + model + "Phi",       "b.EXT_THETA")
+        sqlLine.group("a." + filter + model + "Ab",        "b.EXT_WIDTH_MIN/b.EXT_WIDTH_MAJ")
+        sqlLine.group("a." + filter + model + "Phi",       "DEGREES(b.EXT_THETA)")
 
         sqlLine.group("a." + filter + model + "RadiusErr", "b.EXT_WIDTH_MAJ_ERR") # these are not correctly defined.
@@ -526 +527 @@
         sqlLine.group("a." + filter + model + "PhiErr",    "b.EXT_THETA_ERR") # these are not correctly defined.
 
+        sqlLine.group("a." + filter + model + "Chisq",     "b.EXT_CHISQ / b.EXT_NDOF")
+
+        # I have raExp = X_EXT
+
         # XXX this is tricky: RA_EXT is not defined, but X_EXT is...
-        # sqlLine.group("a." + filter + model + "RaOff",     "b.X_EXT")
-        # sqlLine.group("a." + filter + model + "DecOff",    "b.Y_EXT")
-        # sqlLine.group("a." + filter + model + "RaErr",     "b.X_EXT_SIG * b.PLTSCALE")
-        # sqlLine.group("a." + filter + model + "DecErr",    "b.Y_EXT_SIG * b.PLTSCALE")
+        sqlLine.group("a." + filter + model + "Ra",        "b.X_EXT")
+        sqlLine.group("a." + filter + model + "Dec",       "b.Y_EXT")
+        sqlLine.group("a." + filter + model + "RaErr",     "b.X_EXT_SIG") # need to modify by platescale
+        sqlLine.group("a." + filter + model + "DecErr",    "b.Y_EXT_SIG")
 
         # sersic fit has an extra parameter
@@ -547 +552 @@
 
         # insert detection information for each filter based on the DVO contents
+        # XXX since I already have extracted StackObjectRaw, this is probably faster using that table:
         sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
         sqlLine.group("a." + filter + model + "Mag",       "a." + filter + model + "Mag + b.zp")
         sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
+
+        self.logger.infoPair('sql', sql)     
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair('failed sql',sql)
+            return
+
+        # we have (modulo signs):
+        # gRaExp  = gra  + (X_EXT - gxPos)*gPlateScale / cos(gdec)
+        # gDecExp = gdec + (Y_EXT - gyPos)*gPlateScale
+
+        rawS  = "c." + filter + "PlateScale"
+
+        extR  = "a." + filter + model + "Ra"
+        rawR  = "b." + filter + "ra"
+        rawX  = "c." + filter + "xPos"
+
+        extD  = "a." + filter + model + "Dec"
+        rawD  = "b." + filter + "dec"
+        rawY  = "c." + filter + "yPos"
+
+        # dRA / dX = -PlateScale
+        # b.+filter+ra  - (a.+filter+model+Ra - c.+filter+xPos)*c.+filter+PlateScale / cos(+filter+dec)
+        # extR = rawR - (extR - rawX)*rawS / 3600.0 / cos(rawD)
+
+        # dDEC / dY = +PlateScale
+        # b.+filter+dec + (a.+filter+model+Dec - c.+filter+xPos)*c.+filter+PlateScale / cos(+filter+dec)
+        # extD = rawD + (extD - rawY)*rawS / 3600.0
+
+        # insert detection information for each filter based on the DVO contents
+        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, StackObjectThin as b, StackObjectRaw as c SET ")
+        sqlLine.group(extR, rawR + " - (" + extR + " - " + rawX + ")*" + rawS + " / 3600.0 / cos(radians(" + rawD + "))")
+        sqlLine.group(extD, rawD + " + (" + extD + " - " + rawY + ")*" + rawS + " / 3600.0")
+        field = "a." + filter + model + "RaErr"
+        sqlLine.group(field, field + "*" + rawS)
+        field = "a." + filter + model + "DecErr"
+        sqlLine.group(field, field + "*" + rawS)
+        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a.objID = c.objID")
 
         self.logger.infoPair('sql', sql)     
@@ -760 +805 @@
         self.scratchDb.execute(sql)
 
+        # instrumental flux, AB mags, Jy:
+        # flux_inst = cts / sec
+        # mag_AB = -2.5*log(flux_inst) + ZP [with appropriate definition of zero point]
+        # mag_AB = -2.5*log(flux_cgs) - 48.6 [by construction with ~Vega flux in V-band]
+        # flux_cgs = ten(-0.4*(mag_AB + 48.6))
+        # flux_cgs = ten(-0.4*((-2.5*log(flux_inst) + ZP) + 48.6))
+        # flux_cgs = flux_inst * ten(-0.4*(ZP + 48.6))
+        # flux_Jy  = flux_cgs * 10^23
+        # flux_Jy  = flux_inst * ten(-0.4*(ZP + 48.6) + 23.0)  [23.0 - 0.4*48.6 = 3.56]
+        # flux_Jy  = flux_inst * ten(-0.4*ZP + 3.56)
+        # flux_Jy  = flux_inst * ten(-0.4*ZP) * 3630.78
+
         # modify flux to apply the zero point
-        # sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
-        # field = filter + prefix + "flxR" + number
-        # sqlLine.group(field,               field         + " * POW(10, 3.56 - 0.4* b.zp)")
-        # sqlLine.group(field + "Err",       field + "err" + " * POW(10, 3.56 - 0.4* b.zp)")
-        # sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
-        # sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
+        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
+        for number in numbers:
+            field = filter + prefix + "flxR" + number
+            sqlLine.group(field,               field         + " * POW(10, 3.56 - 0.4* b.zp)")
+            sqlLine.group(field + "Err",       field + "err" + " * POW(10, 3.56 - 0.4* b.zp)")
+            sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
+        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
 
     '''