Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceOutputs.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmSourceOutputs.c (modified) (3 diffs)

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

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

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

@@ -26 +26 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -108 +108 @@
         }
         if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) {
-            axes = pmPSF_ModelToAxes (PAR, model->type);
+            axes = pmPSF_ModelToAxes (PAR, model->class->useReff);
             outputs->psfMajor = axes.major;
             outputs->psfMinor = axes.minor;
             outputs->psfTheta = axes.theta*PS_DEG_RAD;
+
+            // some models (PS1_V1, QGAUSS) have an extra 'core' parameter
+            outputs->psfCore = NAN;
+            if (model->type == pmModelClassGetType ("PS_MODEL_PS1_V1")) {
+                outputs->psfCore = PAR[PM_PAR_7];
+            }
+            if (model->type == pmModelClassGetType ("PS_MODEL_QGAUSS")) {
+                outputs->psfCore = PAR[PM_PAR_7];
+            }
+
+            outputs->psfMajorFWHM = model->class->modelSetFWHM(model->params, axes.major);
+            outputs->psfMinorFWHM = model->class->modelSetFWHM(model->params, axes.minor);
         } else {
             outputs->psfMajor = NAN;
             outputs->psfMinor = NAN;
             outputs->psfTheta = NAN;
+            outputs->psfCore = NAN;
         }
         outputs->chisq = model->chisq;
         outputs->nDOF = model->nDOF;
         outputs->nPix = model->nPix;
-        outputs->apRadius = source->apRadius;
     } else {
         bool useMoments = pmSourcePositionUseMoments(source);
@@ -138 +150 @@
         outputs->psfMinor = NAN;
         outputs->psfTheta = NAN;
+        outputs->psfCore = NAN;
         outputs->chisq = NAN;
         outputs->nDOF = 0;
         outputs->nPix = 0;
-        outputs->apRadius = NAN;
     }
 

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c