Skip to content
Snippets Groups Projects
Commit 22898a71 authored by Lynch, Vickie's avatar Lynch, Vickie
Browse files

Refs #24466 start at 0

parent 7aa10edd
No related branches found
No related tags found
No related merge requests found
...@@ -310,8 +310,8 @@ void OptimizeCrystalPlacement::exec() { ...@@ -310,8 +310,8 @@ void OptimizeCrystalPlacement::exec() {
} }
} }
Instrument_const_sptr instr = peaks->getPeak(0).getInstrument(); // offset of previous sample position so should start at 0
V3D sampPos = instr->getSample()->getPos(); V3D sampPos = V3D(0., 0., 0.);
oss << ",SampleXOffset=" << sampPos.X() << ",SampleYOffset=" << sampPos.Y() oss << ",SampleXOffset=" << sampPos.X() << ",SampleYOffset=" << sampPos.Y()
<< ",SampleZOffset=" << sampPos.Z(); << ",SampleZOffset=" << sampPos.Z();
...@@ -377,7 +377,7 @@ void OptimizeCrystalPlacement::exec() { ...@@ -377,7 +377,7 @@ void OptimizeCrystalPlacement::exec() {
//------------------------- Get/Report Results ------------------ //------------------------- Get/Report Results ------------------
double chisq = fit_alg->getProperty("OutputChi2overDoF"); double chisq = fit_alg->getProperty("OutputChi2overDoF");
std::cout << "Fit finished. Status=" g_log.notice() << "Fit finished. Status="
<< (std::string)fit_alg->getProperty("OutputStatus") << '\n'; << (std::string)fit_alg->getProperty("OutputStatus") << '\n';
setProperty("Chi2overDoF", chisq); setProperty("Chi2overDoF", chisq);
...@@ -449,7 +449,7 @@ void OptimizeCrystalPlacement::exec() { ...@@ -449,7 +449,7 @@ void OptimizeCrystalPlacement::exec() {
UBinv.Invert(); UBinv.Invert();
UBinv /= (2 * M_PI); UBinv /= (2 * M_PI);
for (int i = 0; i < outPeaks->getNumberPeaks(); ++i) { for (int i = 0; i < outPeaks->getNumberPeaks(); ++i) {
auto peak = outPeaks->getPeak(i); auto &peak = outPeaks->getPeak(i);
peak.setSamplePos(peak.getSamplePos() + newSampPos); peak.setSamplePos(peak.getSamplePos() + newSampPos);
int RunNum = peak.getRunNumber(); int RunNum = peak.getRunNumber();
std::string RunNumStr = std::to_string(RunNum); std::string RunNumStr = std::to_string(RunNum);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment