Context Navigation

← Previous Change
Next Change →

psphotModelBackground.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/psphotModelBackground.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/psphotModelBackground.c

-              r33963
+              r34772
     psImageBinning *binning = psphotBackgroundBinning(readout->image, config); // Image binning parameters
     pmReadout *model = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL", inFPA, binning, index);
     pmReadout *modelStdev = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL.STDEV", inFPA, binning, index);
+    pmReadout *model = pmFPAGenerateReadout(config, view, psphotGetFilerule("PSPHOT.BACKMDL"), inFPA, binning, index);
+    pmReadout *modelStdev = pmFPAGenerateReadout(config, view, psphotGetFilerule("PSPHOT.BACKMDL.STDEV"), inFPA, binning, index);
     if (!psphotModelBackgroundReadout(model->image, modelStdev->image, model->analysis, readout, binning, config, false)) {