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

Refs #21752 fix SaveReflections test

parent 1aada00f
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Framework/DataObjects/src/Peak.cpp
+ 5
− 5
View file @ 3d99c4d9
...@@ -49,7 +49,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, ...@@ -49,7 +49,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst,
: m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0), : m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0),
m_binCount(0), m_GoniometerMatrix(3, 3, true), m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0), m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakNumber(0),
m_peakShape(boost::make_shared<NoShape>()) { m_peakShape(boost::make_shared<NoShape>()) {
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst); this->setInstrument(m_inst);
...@@ -76,7 +76,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, ...@@ -76,7 +76,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst,
: m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0), : m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0),
m_binCount(0), m_GoniometerMatrix(goniometer), m_binCount(0), m_GoniometerMatrix(goniometer),
m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0), m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakNumber(0),
m_peakShape(boost::make_shared<NoShape>()) { m_peakShape(boost::make_shared<NoShape>()) {
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8) if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8)
...@@ -99,7 +99,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID, ...@@ -99,7 +99,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID,
: m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0), : m_H(0), m_K(0), m_L(0), m_intensity(0), m_sigmaIntensity(0),
m_binCount(0), m_GoniometerMatrix(3, 3, true), m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0), m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakNumber(0),
m_peakShape(boost::make_shared<NoShape>()) { m_peakShape(boost::make_shared<NoShape>()) {
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst); this->setInstrument(m_inst);
...@@ -121,7 +121,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID, ...@@ -121,7 +121,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID,
: m_H(HKL[0]), m_K(HKL[1]), m_L(HKL[2]), m_intensity(0), : m_H(HKL[0]), m_K(HKL[1]), m_L(HKL[2]), m_intensity(0),
m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(3, 3, true), m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0), m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakNumber(0),
m_peakShape(boost::make_shared<NoShape>()) { m_peakShape(boost::make_shared<NoShape>()) {
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst); this->setInstrument(m_inst);
...@@ -145,7 +145,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID, ...@@ -145,7 +145,7 @@ Peak::Peak(const Geometry::Instrument_const_sptr &m_inst, int m_detectorID,
: m_H(HKL[0]), m_K(HKL[1]), m_L(HKL[2]), m_intensity(0), : m_H(HKL[0]), m_K(HKL[1]), m_L(HKL[2]), m_intensity(0),
m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(goniometer), m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(goniometer),
m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0), m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakNumber(0),
m_peakShape(boost::make_shared<NoShape>()) { m_peakShape(boost::make_shared<NoShape>()) {
convention = Kernel::ConfigService::Instance().getString("Q.convention"); convention = Kernel::ConfigService::Instance().getString("Q.convention");
if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8) if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8)
......
Framework/DataObjects/src/PeakColumn.cpp
+ 3
− 0
View file @ 3d99c4d9
...@@ -294,6 +294,9 @@ const void *PeakColumn::void_pointer(size_t index) const { ...@@ -294,6 +294,9 @@ const void *PeakColumn::void_pointer(size_t index) const {
} else if (m_name == "RunNumber") { } else if (m_name == "RunNumber") {
value = peak.getRunNumber(); value = peak.getRunNumber();
return boost::get<int>(&value); return boost::get<int>(&value);
} else if (m_name == "PeakNumber") {
value = peak.getRunNumber();
return boost::get<int>(&value);
} else if (m_name == "DetID") { } else if (m_name == "DetID") {
value = peak.getDetectorID(); value = peak.getDetectorID();
return boost::get<int>(&value); return boost::get<int>(&value);
......
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