Changeset 36326

Timestamp:

Nov 30, 2013, 1:34:15 PM (13 years ago)

Author:

eugene

Message:

add flags, new model status bits, new source mode2 bits

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

• pmModelFuncs.h (modified) (1 diff)
• pmSourceFitModel.c (modified) (1 diff)
• pmSourceFitPCM.c (modified) (1 diff)
• pmSourceFitSet.c (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (1 diff)
• pmSourceMasks.h (modified) (1 diff)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmModelFuncs.h

@@ -36 +36 @@
 
 typedef enum {
-    PM_MODEL_STATUS_NONE         = 0x00, ///< model fit not yet attempted, no other info
-    PM_MODEL_STATUS_FITTED       = 0x01, ///< model fit completed
-    PM_MODEL_STATUS_NONCONVERGE  = 0x02, ///< model fit did not converge
-    PM_MODEL_STATUS_OFFIMAGE     = 0x04, ///< model fit drove out of range
-    PM_MODEL_STATUS_BADARGS      = 0x08, ///< model fit called with invalid args
-    PM_MODEL_STATUS_LIMITS       = 0x10, ///< model parameters hit limits
-    PM_MODEL_STATUS_WEAK_FIT     = 0x20, ///< model fit met loose tolerance, but not tight tolerance
+    PM_MODEL_STATUS_NONE           = 0x000, ///< model fit not yet attempted, no other info
+    PM_MODEL_STATUS_FITTED         = 0x001, ///< model fit completed
+    PM_MODEL_STATUS_NONCONVERGE    = 0x002, ///< model fit did not converge
+    PM_MODEL_STATUS_OFFIMAGE       = 0x004, ///< model fit drove out of range
+    PM_MODEL_STATUS_BADARGS        = 0x008, ///< model fit called with invalid args
+    PM_MODEL_STATUS_LIMITS         = 0x010, ///< model parameters hit limits
+    PM_MODEL_STATUS_WEAK_FIT       = 0x020, ///< model fit met loose tolerance, but not tight tolerance
+    PM_MODEL_STATUS_NAN_CHISQ      = 0x040, ///< model fit failed with a NAN chisq 
+    PM_MODEL_SERSIC_PCM_FAIL_GUESS = 0x080, ///< sersic model fit failed on the initial moments-based guess
+    PM_MODEL_SERSIC_PCM_FAIL_GRID  = 0x100, ///< sersic model fit failed on the grid search
+    PM_MODEL_PCM_FAIL_GUESS        = 0x200, ///< non-sersic model fit failed on the initial moments-based guess
 } pmModelStatus;
 

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitModel.c

@@ -282 +282 @@
     // set the model success or failure status
     model->flags |= PM_MODEL_STATUS_FITTED;
-    if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+    if (!fitStatus) {
+        if (isnan(myMin->value)) {
+          model->flags |= PM_MODEL_STATUS_NAN_CHISQ;
+        } else {
+          model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+        }
+    }
 
     if (myMin->chisqConvergence) {

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitPCM.c

@@ -122 +122 @@
     // set the model success or failure status
     pcm->modelConv->flags |= PM_MODEL_STATUS_FITTED;
-    if (!fitStatus) pcm->modelConv->flags |= PM_MODEL_STATUS_NONCONVERGE;
+
+    if (!fitStatus) {
+        if (isnan(myMin->value)) {
+            pcm->modelConv->flags |= PM_MODEL_STATUS_NAN_CHISQ;
+        } else {
+            pcm->modelConv->flags |= PM_MODEL_STATUS_NONCONVERGE;
+        }
+    }
 
     if (myMin->chisqConvergence) {

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitSet.c

@@ -352 +352 @@
         // set the model success or failure status
         model->flags |= PM_MODEL_STATUS_FITTED;
-        if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+        if (!fitStatus) {
+          if (isnan(myMin->value)) {
+            model->flags |= PM_MODEL_STATUS_NAN_CHISQ;
+          } else {
+            model->flags |= PM_MODEL_STATUS_NONCONVERGE;
+          }
+        }
 
         // models can go insane: reject these

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -893 +893 @@
 
             // EAM : adding for PV2 outputs:
-            @>PS1_SV2@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLAGS", PS_DATA_S32, "type for chosen EXT_MODEL",   source->modelEXT ? source->modelEXT->type : -1);
+            @>PS1_SV2@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLAGS", PS_DATA_S16, "model fit flags (pmModelStatus)", source->modelEXT ? source->modelEXT->flags : 0);
 
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "POSANGLE",   0, "position angle at source (degrees)",         posAngle);

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceMasks.h

@@ -56 +56 @@
     PM_SOURCE_MODE2_DIFF_SELF_MATCH       = 0x00000800, ///< positive detection match is probably this source 
     PM_SOURCE_MODE2_SATSTAR_PROFILE       = 0x00001000, ///< saturated source is modeled with a radial profile
+
+    PM_SOURCE_MODE2_ECONTOUR_FEW_PTS      = 0x00002000, ///< too few points to measure the elliptical contour
+    PM_SOURCE_MODE2_RADBIN_NAN_CENTER     = 0x00004000, ///< radial bins failed with too many NaN center bin
+    PM_SOURCE_MODE2_PETRO_NAN_CENTER      = 0x00008000, ///< petrosian radial bins failed with too many NaN center bin
+    PM_SOURCE_MODE2_PETRO_NO_PROFILE      = 0x00010000, ///< petrosian not build because radial bins missing
+
+    PM_SOURCE_MODE2_PETRO_INSIG_RATIO     = 0x00020000, ///< insignificant measurement of petrosian ratio
+    PM_SOURCE_MODE2_PETRO_RATIO_ZEROBIN   = 0x00040000, ///< petrosian ratio in the 0th bin (likely bad)
+    
+    PM_SOURCE_MODE2_EXT_FITS_RUN          = 0x00080000, ///< we attempted to run extended fits on this source
+    PM_SOURCE_MODE2_EXT_FITS_FAIL         = 0x00100000, ///< at least one of the model fits failed
+    PM_SOURCE_MODE2_EXT_FITS_RETRY        = 0x00200000, ///< one of the model fits was re-tried with new window
+    PM_SOURCE_MODE2_EXT_FITS_NONE         = 0x00400000, ///< ALL of the model fits failed
+    
+    
 } pmSourceMode2;