Commit 4ebe2592 authored by Lynch, Vickie's avatar Lynch, Vickie
Browse files

Refs #25747 predict integer peaks

parent 7ca16e8f
......@@ -339,7 +339,7 @@ void PredictSatellitePeaks::predictOffsets(
int indexModulatedVector, V3D offsets, int &maxOrder, V3D &hkl,
HKLFilterWavelength &lambdaFilter, bool &includePeaksInRange,
bool &includeOrderZero, vector<vector<int>> &AlreadyDonePeaks) {
if (offsets == V3D(0, 0, 0))
if (offsets == V3D(0, 0, 0) && !includeOrderZero)
return;
const Kernel::DblMatrix &UB = Peaks->sample().getOrientedLattice().getUB();
IPeak &peak1 = Peaks->getPeak(0);
......@@ -396,7 +396,7 @@ void PredictSatellitePeaks::predictOffsetsWithCrossTerms(
HKLFilterWavelength &lambdaFilter, bool &includePeaksInRange,
bool &includeOrderZero, vector<vector<int>> &AlreadyDonePeaks) {
if (offsets1 == V3D(0, 0, 0) && offsets2 == V3D(0, 0, 0) &&
offsets3 == V3D(0, 0, 0))
offsets3 == V3D(0, 0, 0) && !includeOrderZero)
return;
const Kernel::DblMatrix &UB = Peaks->sample().getOrientedLattice().getUB();
IPeak &peak1 = Peaks->getPeak(0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment