Changeset 36754 for trunk/psphot/src

Timestamp:

May 16, 2014, 9:15:12 AM (12 years ago)

Author:

bills

Message:

skip sources with too low SN that cause the radius range to go negative

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotGalaxyShape.c (modified) (4 diffs)

trunk/psphot/src/psphot.h

@@ -547 +547 @@
 bool psphotGalaxyShapeSource (pmPCMdata *pcm, pmSource *source, pmSourceGalaxyFits *galaxyFits, psImageMaskType maskVal, int psfSize, bool saveResults);
 psphotGalaxyShapeOptions *psphotGalaxyShapeOptionsAlloc();
-void psphotGalaxyShapeOptionsSet(pmSource *source, pmSourceGalaxyFits *galaxyFits, psphotGalaxyShapeOptions *defaultOptions);
+bool psphotGalaxyShapeOptionsSet(pmSource *source, pmSourceGalaxyFits *galaxyFits, psphotGalaxyShapeOptions *defaultOptions);
 
 bool psphotRadialProfileWings (pmConfig *config, const pmFPAview *view, const char *filerule);

trunk/psphot/src/psphotGalaxyShape.c

@@ -259 +259 @@
         psF32 *PAR = pcm->modelConv->params->data.F32;
 
-        // double check that the guess is carried along...
+        pmSourceGalaxyFits *galaxyFits = pmSourceGalaxyFitsAlloc();
+
+        // set the options for this source
+        if (!psphotGalaxyShapeOptionsSet(source, galaxyFits, opt)) {
+            // this source won't work
+            psFree(pcm);
+            psFree(galaxyFits);
+            continue;
+        }
+
         if (!source->galaxyFits) {
             source->galaxyFits = psArrayAllocEmpty(1);
         }
-        pmSourceGalaxyFits *galaxyFits = pmSourceGalaxyFitsAlloc();
         psArrayAdd(source->galaxyFits, 1, galaxyFits);
         psFree(galaxyFits);
-
-        // set the options for this source
-        psphotGalaxyShapeOptionsSet(source, galaxyFits, opt);
 
         // I have some source guess (e0, e1, e2)
@@ -414 +419 @@
     psMemSetDeallocator(opt, (psFreeFunc) psphotGalaxyShapeOptionsFree);
     
-#ifdef notdef
-    opt->fRmajorMin = 0.5;
-    opt->fRmajorMax = 2.0;
-    opt->fRmajorDel = 0.1;
-    opt->fRminorMin = 0.5;
-    opt->fRminorMax = 2.0;
-    opt->fRminorDel = 0.1;
-    opt->snMinAllTrials = 20;      // for sources with cff SN < 20 ...
-    opt->reduceTrialsFactor = 2; // cut the number of trials in half (double the deltas)
-#endif
-
     return opt;
 }
 
-void psphotGalaxyShapeOptionsSet(pmSource *source, pmSourceGalaxyFits *galaxyFits, psphotGalaxyShapeOptions *options)
+bool psphotGalaxyShapeOptionsSet(pmSource *source, pmSourceGalaxyFits *galaxyFits, psphotGalaxyShapeOptions *options)
 {
     // XXX: put these in recipe
@@ -437 +431 @@
     float f_min = 1 - options->NSigma * f_del;
     float f_max = 1 + options->NSigma * f_del;
+
+    // if f_min goes negative skip this object
+    if (f_min < 0) return false;
 
     galaxyFits->fRmajorMin = f_min;
@@ -444 +441 @@
     galaxyFits->fRminorMax = f_max;
     galaxyFits->fRminorDel = f_del;
-}
-
+
+    return true;
+}
+