Changeset 38057 for branches/eam_branches/ipp-20150112/psphot/src/psphotGalaxyParams.c

Timestamp:

Mar 29, 2015, 5:55:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotGalaxyParams.c (modified) (4 diffs)

branches/eam_branches/ipp-20150112/psphot/src

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

branches/eam_branches/ipp-20150112/psphot/src/psphotGalaxyParams.c

@@ -152 +152 @@
 
 // set this to 0 to run without threading
-# if (0)            
+# if (1)            
             if (!psThreadJobAddPending(job)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
@@ -270 +270 @@
     badModel |= PM_MODEL_PCM_FAIL_GUESS;
 
+    badModel |= PM_MODEL_STATUS_LIMITS;
+
     pmModelType sersicModelType = pmModelClassGetType("PS_MODEL_SERSIC");
 
@@ -334 +336 @@
         if (!sersicModel) SKIP (Nskip8);
         if (sersicModel->flags & badModel) SKIP (Nskip8);
+
+        // check out the model params and skip those that are too large
+        psF32 *PAR = sersicModel->params->data.F32;
+        psF32 Xo = PAR[PM_PAR_XPOS];
+        psF32 Yo = PAR[PM_PAR_YPOS];
+        psF32 Io = PAR[PM_PAR_I0];
+        //
+        // The half light radius to the major axis of the model
+        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, sersicModel->class->useReff);
+        if (axes.major >= 100) SKIP (Nskip8);
+
+        source->extpars->ghalfLightRadius = axes.major;
         Next ++;
 
@@ -353 +367 @@
             // do we need this?
             source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
-#ifdef notdef
-#endif
-        }
-
-
-        psF32 *PAR = sersicModel->params->data.F32;
-        psF32 Xo = PAR[PM_PAR_XPOS];
-        psF32 Yo = PAR[PM_PAR_YPOS];
-        psF32 Io = PAR[PM_PAR_I0];
-        // For now: set the half light radius to the major axis of the model
-        psEllipseAxes axes = pmPSF_ModelToAxes (PAR, sersicModel->class->useReff);
-        source->extpars->ghalfLightRadius = axes.major;
+        }
+
+
         // and we will integrate out to 2 * half light radius
         psF32 R = 2 * axes.major;

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp