Changeset 35551 for branches/eam_branches/ipp-20130419/psModules/src/objects/pmPSF.c

Timestamp:

May 9, 2013, 11:32:28 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmPSF.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/psModules/src/objects/pmPSF.c

@@ -342 +342 @@
     PS_ASSERT_PTR_NON_NULL(modelPar, axes);
 
-    bool useReff = true;
+    bool useReff = false;
     useReff |= (type == pmModelClassGetType ("PS_MODEL_SERSIC"));
     useReff |= (type == pmModelClassGetType ("PS_MODEL_DEV"));
@@ -386 +386 @@
     psEllipseShape shape = psEllipseAxesToShape (axes);
 
-    bool useReff = true;
-    useReff |= pmModelClassGetType ("PS_MODEL_SERSIC");
-    useReff |= pmModelClassGetType ("PS_MODEL_DEV");
-    useReff |= pmModelClassGetType ("PS_MODEL_EXP");
+    bool useReff = false;
+    useReff |= ( type == pmModelClassGetType ("PS_MODEL_SERSIC"));
+    useReff |= ( type == pmModelClassGetType ("PS_MODEL_DEV"));
+    useReff |= ( type == pmModelClassGetType ("PS_MODEL_EXP"));
 
     if (useReff) {
         modelPar[PM_PAR_SXX] = shape.sx;
         modelPar[PM_PAR_SYY] = shape.sy;
-        modelPar[PM_PAR_SXY] = shape.sxy; // XXX NEED factor of 2 here for correct angle conversion
+        modelPar[PM_PAR_SXY] = shape.sxy * 2.0; // XXX NEED factor of 2 here for correct angle conversion
     } else {
         modelPar[PM_PAR_SXX] = shape.sx * M_SQRT2;