Changeset 36215

Timestamp:

Oct 14, 2013, 7:43:03 AM (13 years ago)

Author:

eugene

Message:

use GALAXY_SHAPES as recipe option to trigger galaxy model output; do not truncate sx,sy but rather minor,major

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

• pmModelUtils.c (modified) (2 diffs)
• pmSourceIO.c (modified) (1 diff)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmModelUtils.c

@@ -129 +129 @@
 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 +141 @@
     // 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;
     }

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c

@@ -482 +482 @@
         bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS");
         bool XRAD_OUTPUT = psMetadataLookupBool(&status, recipe, "RADIAL_APERTURES");
-        bool XGAL_OUTPUT = psMetadataLookupBool(&status, recipe, "GALAXY_SHAPE");
+        bool XGAL_OUTPUT = psMetadataLookupBool(&status, recipe, "GALAXY_SHAPES");
 
         // define the EXTNAME values for the different data segments: