Skip to content

Commit

Permalink
Refs #10224. Considered the extreme case.
Browse files Browse the repository at this point in the history
On branch bugfix/10224_findpeaks_bug
  (use "git reset HEAD <file>..." to unstage)

      modified:   ../Mantid/Framework/Algorithms/src/FitPeak.cpp
  • Loading branch information
wdzhou committed Sep 30, 2014
1 parent eda2e61 commit 83e69ff
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Code/Mantid/Framework/Algorithms/src/FitPeak.cpp
Expand Up @@ -399,8 +399,18 @@ namespace Algorithms
MantidVec& dataE = purePeakWS->dataE(0);

dataX.assign(vecX.begin() + i_minFitX, vecX.begin() + i_maxFitX+1);
dataY.assign(vecY.begin() + i_minFitX, vecY.begin() + i_maxFitX+1);
dataE.assign(vecE.begin() + i_minFitX, vecE.begin() + i_maxFitX+1);
size_t ishift = i_maxFitX+1;
if (ishift < vecY.size())
{
dataY.assign(vecY.begin() + i_minFitX, vecY.begin() + i_maxFitX+1);
dataE.assign(vecE.begin() + i_minFitX, vecE.begin() + i_maxFitX+1);
}
else
{
dataY.assign(vecY.begin() + i_minFitX, vecY.end());
dataE.assign(vecE.begin() + i_minFitX, vecE.end());
}


return purePeakWS;
}
Expand Down

0 comments on commit 83e69ff

Please sign in to comment.