Changeset 40809

Timestamp:

Jun 20, 2019, 4:14:36 PM (7 years ago)

Author:

eugene

Message:

do not let crazy model axis values trigger an assert -- set extreme aspect-ratio objects to NAN

Location:

trunk/psphot/src

Files:

• psphotFullForceSummary.c (modified) (1 diff)
• psphotFullForceSummaryReadout.c (modified) (2 diffs)

trunk/psphot/src/psphotFullForceSummary.c

@@ -301 +301 @@
         // there is now only a single chip (multiple readouts?). loop over it and process
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
- //           psLogMsg ("psphotFullForceSummary", 5, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+          // psLogMsg ("psphotFullForceSummary", 5, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-//                psLogMsg ("psphotFullForceSummary", 6, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+              // psLogMsg ("psphotFullForceSummary", 6, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
                 if (! readout->data_exists) { continue; }
 

trunk/psphot/src/psphotFullForceSummaryReadout.c

@@ -1 +1 @@
 #include "psphotInternal.h"
-
 
 typedef struct {
@@ -637 +636 @@
                 // now save the model parameters in the model structure
 
-                pmPSF_AxesToModel (model->params->data.F32, axes, model->class->useReff);
+                // a crazy model can raise an assert in psEllise
+                if ((fabs(axes.major) > 10000 * fabs(axes.minor)) || (fabs(axes.minor) > 10000 * fabs(axes.major))) {
+                  model->params->data.F32[PM_PAR_SXX] = NAN;
+                  model->params->data.F32[PM_PAR_SYY] = NAN;
+                  model->params->data.F32[PM_PAR_SXY] = NAN;
+                } else {
+                  pmPSF_AxesToModel (model->params->data.F32, axes, model->class->useReff);
+                }
 
                 model->mag = -2.5 * log10(flux0);