Context Navigation

← Previous Change
Next Change →

psphotFitSourcesLinear.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/psphot

Files:

: 3 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/psphotFitSourcesLinear.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/czw_branch/20120906/psphot
- Property svn:mergeinfo changed
  /branches/eam_branches/ipp-20120905/psphot (added) merged: 34408-34409,34415-34416,34428,34466,34565,34570,34575,34735,34747

branches/czw_branch/20120906/psphot/src

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20120905/psphot/src (added)	merged: 34408-34409,34415-34416,34428,34466,34570,34575,34735,34747
/trunk/psphot/src (added)	merged: 34418,34429,34492-34493,34528,34540,34542,34559-34560,34704,34708,34721,34750

branches/czw_branch/20120906/psphot/src/psphotFitSourcesLinear.c

-              r34404
+              r34772
         model->params->data.F32[PM_PAR_I0] = norm->data.F32[i];
         model->dparams->data.F32[PM_PAR_I0] = errors->data.F32[i];
+        if (norm->data.F32[i] < MIN_VALID_FLUX) {
+          fprintf (stderr, "fit out of bounds for %f,%f : %f\n", source->peak->xf, source->peak->yf, norm->data.F32[i]);
+          model->params->data.F32[PM_PAR_I0] = MIN_VALID_FLUX;
+        }
         // clear the 'mark' pixels so the subtraction covers the full window