Changeset 35651

Timestamp:

Jun 11, 2013, 9:33:18 AM (13 years ago)

Author:

eugene

Message:

replace code which converts the PAR[SXX,SXY,SYY] values to shape and then axes with calls to pmModelParamsToAxes; disable TEST1 and STRAIL models (never really finished)

Location:

branches/eam_branches/ipp-20130509/psphot/src

Files:

• models/pmModel_STRAIL.c (modified) (1 diff)
• models/pmModel_TEST1.c (modified) (1 diff)
• psphotModelGroupInit.c (modified) (1 diff)
• psphotOutput.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/psphot/src/models/pmModel_STRAIL.c

@@ -563 +563 @@
     // convert to shape terms (SXX,SYY,SXY)
     // XXX user-defined value for limit?
-    if (!pmPSF_FitToModel (PAR, 0.1)) {
+    bool useReff = pmModelUseReff (model->type);
+    if (!pmPSF_FitToModel (PAR, 0.1, useReff)) {
         psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo);
         return false;

branches/eam_branches/ipp-20130509/psphot/src/models/pmModel_TEST1.c

@@ -264 +264 @@
     // convert to shape terms (SXX,SYY,SXY)
     // XXX user-defined value for limit?
-    if (!pmPSF_FitToModel (PAR, 0.1)) {
+    bool useReff = pmModelUseReff (model->type);
+    if (!pmPSF_FitToModel (PAR, 0.1, useReff)) {
         psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo);
         return false;

branches/eam_branches/ipp-20130509/psphot/src/psphotModelGroupInit.c

@@ -4 +4 @@
 // psModule/src/objects/models
 
-# include "models/pmModel_TEST1.c"
-# include "models/pmModel_STRAIL.c"
+// # include "models/pmModel_TEST1.c"
+// # include "models/pmModel_STRAIL.c"
 
 static pmModelClass userModels[] = {
-    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1, NULL},
-    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL, NULL},
+    // {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1, NULL},
+    // {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL, NULL},
 };
 

branches/eam_branches/ipp-20130509/psphot/src/psphotOutput.c

@@ -379 +379 @@
         psF32 *outPar = source->modelEXT->params->data.F32;
 
-        psEllipseShape shape;
-
-        shape.sx  = outPar[PM_PAR_SXX] / M_SQRT2;
-        shape.sy  = outPar[PM_PAR_SYY] / M_SQRT2;
-        shape.sxy = outPar[PM_PAR_SXY];
-
-        psEllipsePol pol = pmPSF_ModelToFit (outPar);
+        bool useReff = pmModelUseReff (source->modelEXT->type);
+
+        psEllipseAxes axes1;
+        pmModelParamsToAxes (&axes1, outPar[PM_PAR_SXX], outPar[PM_PAR_SXY], outPar[PM_PAR_SYY], useReff);
+
+        psEllipsePol pol = pmPSF_ModelToFit (outPar, useReff);
         inPar[PM_PAR_E0] = pol.e0;
         inPar[PM_PAR_E1] = pol.e1;
         inPar[PM_PAR_E2] = pol.e2;
-        pmPSF_FitToModel (inPar, 0.1);
-
-        psEllipseAxes axes1 = psEllipseShapeToAxes (shape, 20.0);
+        pmPSF_FitToModel (inPar, 0.1, useReff);
+
         psEllipseAxes axes2 = psEllipsePolToAxes(pol, 0.1);