Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmModelUtils.c

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)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmModelUtils.c (modified) (4 diffs)

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmModelUtils.c

@@ -39 +39 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -129 +130 @@
 bool pmModelAxesToParams (float *Sxx, float *Sxy, float *Syy, psEllipseAxes axes, bool useReff)  {
 
+    // restrict axex to 0.5 here not below 
+    if (axes.minor < 0.2) axes.minor = 0.2;
+    if (axes.major < 0.2) axes.major = 0.2;
+
     psEllipseShape shape = psEllipseAxesToShape (axes);
 
@@ -137 +142 @@
     // set the shape parameters
     if (useReff) {
-        *Sxx  = PS_MAX(0.5, shape.sx);
-        *Syy  = PS_MAX(0.5, shape.sy);
+        // *Sxx  = PS_MAX(0.5, shape.sx);
+        // *Syy  = PS_MAX(0.5, shape.sy);
+        *Sxx  = shape.sx;
+        *Syy  = shape.sy;
         *Sxy  = shape.sxy * 2.0;
     } else {
-        *Sxx  = PS_MAX(0.5, M_SQRT2*shape.sx);
-        *Syy  = PS_MAX(0.5, M_SQRT2*shape.sy);
+        // *Sxx  = PS_MAX(0.5, M_SQRT2*shape.sx);
+        // *Syy  = PS_MAX(0.5, M_SQRT2*shape.sy);
+        *Sxx  = M_SQRT2*shape.sx;
+        *Syy  = M_SQRT2*shape.sy;
         *Sxy  = shape.sxy;
     }
@@ -190 +199 @@
 
     if (!isfinite(axes.major)) return false;
+    if (axes.major == 0) return false;
     if (!isfinite(axes.minor)) return false;
     if (!isfinite(axes.theta)) return false;
+    if (axes.major == 0) return false;
 
     // Mxx, Mxy, Myy define the elliptical shape, but Mrf defines the width 

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c