Changeset 36375 for trunk/psModules/src/objects/models

Timestamp:

Dec 10, 2013, 2:55:11 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/models/pmModel_DEV.c (modified) (1 diff)
• psModules/src/objects/models/pmModel_EXP.c (modified) (3 diffs)
• psModules/src/objects/models/pmModel_SERSIC.c (modified) (1 diff)

trunk/psModules/src/objects/models/pmModel_DEV.c

@@ -269 +269 @@
 
     // Mxx, Mxy, Myy define the elliptical shape, but Mrf defines the width 
-    float scale = moments->Mrf / axes.major;
+    // the factor of 2.3 comes from Table 1 of Graham and Driver (2005)
+    float scale = moments->Mrf / axes.major / 2.3;
     axes.major *= scale;
     axes.minor *= scale;

trunk/psModules/src/objects/models/pmModel_EXP.c

@@ -63 +63 @@
 // 0.5 PIX: the parameters are defined in terms of pixel coords, so the incoming pixcoords
 // values need to be pixel coords
+//
+
+// Notes on changing kappa value from 1.70056 to 1.678
+// I'm using a functional form f(x,y) = Io exp(-kappa (r / r_e)).  
+// The article by Graham & Driver (2005) uses a form Ie exp(-bn [(r / r_e) -1]) 
+// which is equal to Ie exp(-bn (r / r_e)) exp(bn).  
+// Thus, my Io = Ie exp(bn) and my kappa is their bn.
+// My value of kappa is 1.700, their value for bn is 1.678., so I am off by a small amount there (1.5%).  
+
+
+#define KAPPA_EXP 1.678
+#define OLD_KAPP_EXP 1.70056
+
 
 // Lax parameter limits
@@ -109 +122 @@
     // for EXP, we can hard-wire kappa(1):
     // float index = 1.0;
-    float kappa = 1.70056;
+    float kappa = KAPPA_EXP;
 
     // sqrt(z) is r
@@ -318 +331 @@
 
     // static value for EXP:
-    float kappa = 1.70056;
+    float kappa = KAPPA_EXP;
 
     // f = Io exp(-kappa*sqrt(z)) -> sqrt(z) = ln(Io/f) / kappa

trunk/psModules/src/objects/models/pmModel_SERSIC.c

@@ -75 +75 @@
 
 // Lax parameter limits
-static float paramsMinLax[] = { -1.0e3, 1.0e-2, -100, -100, 0.001, 0.001, -1.0, 0.1 };
+static float paramsMinLax[] = { -1.0e3, 1.0e-2, -100, -100, 0.001, 0.001, -1.0, 0.0625 };
 static float paramsMaxLax[] = { 1.0e5, 1.0e9, 1.0e5, 1.0e5, 100, 100, 1.0, 1.0 };