diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp index 6826892dce5a75187d5030f996ae27d8792832c3..e29608a53266f8c3591a20538be63d33381d4a77 100644 --- a/Framework/DataObjects/src/Peak.cpp +++ b/Framework/DataObjects/src/Peak.cpp @@ -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_binCount(0), m_GoniometerMatrix(3, 3, true), 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>()) { convention = Kernel::ConfigService::Instance().getString("Q.convention"); this->setInstrument(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_binCount(0), m_GoniometerMatrix(goniometer), 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>()) { convention = Kernel::ConfigService::Instance().getString("Q.convention"); if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8) @@ -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_binCount(0), m_GoniometerMatrix(3, 3, true), 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>()) { convention = Kernel::ConfigService::Instance().getString("Q.convention"); this->setInstrument(m_inst); @@ -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_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(3, 3, true), 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>()) { convention = Kernel::ConfigService::Instance().getString("Q.convention"); this->setInstrument(m_inst); @@ -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_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(goniometer), 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>()) { convention = Kernel::ConfigService::Instance().getString("Q.convention"); if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8) diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp index fdee8ab4ea91f2ca52c37206d79674c3cf89a59e..abc0cf3ba36150ad0fdaca124fb9614b9922dfb4 100644 --- a/Framework/DataObjects/src/PeakColumn.cpp +++ b/Framework/DataObjects/src/PeakColumn.cpp @@ -294,6 +294,9 @@ const void *PeakColumn::void_pointer(size_t index) const { } else if (m_name == "RunNumber") { value = peak.getRunNumber(); return boost::get<int>(&value); + } else if (m_name == "PeakNumber") { + value = peak.getRunNumber(); + return boost::get<int>(&value); } else if (m_name == "DetID") { value = peak.getDetectorID(); return boost::get<int>(&value);