Skip to content

Commit 25fe349

Browse files
Merge pull request #37850 from mantidproject/EWM6559_PDCalibration_masking_defect-main
PDCalibration: mask empty event lists
2 parents 6540848 + 274f122 commit 25fe349

File tree

5 files changed

+339
-223
lines changed

5 files changed

+339
-223
lines changed

Framework/Algorithms/src/CreateSampleWorkspace.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ EventWorkspace_sptr CreateSampleWorkspace::createEventWorkspace(int numPixels, i
384384

385385
const double hourInSeconds = 60 * 60;
386386
for (int wi = 0; wi < numPixels + numMonitors; wi++) {
387+
// TODO: Can I think of *any* reason that "wi" is not the index actually used by this loop body?!
388+
387389
EventList &el = retVal->getSpectrum(workspaceIndex);
388390
for (int i = 0; i < numBins; ++i) {
389391
// create randomised events within the bin to match the number required -

Framework/Algorithms/src/FitPeaks.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,7 @@ void FitPeaks::processInputFitRanges() {
755755
double left_w_bound = peakWindowX[ipeak * 2];
756756
double right_w_bound = peakWindowX[ipeak * 2 + 1];
757757
double center = peakCenterX[ipeak];
758+
758759
if (!(left_w_bound < center && center < right_w_bound)) {
759760
std::stringstream errss;
760761
errss << "Workspace index " << wi << " has incompatible peak window "

0 commit comments

Comments
 (0)