Commit abb123e6 authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Refs #14988. Ran modernize-loop-convert on DataHandling.

parent 1e6af932
...@@ -222,11 +222,11 @@ void AppendGeometryToSNSNexus::exec() { ...@@ -222,11 +222,11 @@ void AppendGeometryToSNSNexus::exec() {
polar_angle.reserve(dets.size()); polar_angle.reserve(dets.size());
azimuthal_angle.reserve(dets.size()); azimuthal_angle.reserve(dets.size());
for (std::size_t i = 0; i < dets.size(); i++) { for (auto &det : dets) {
pixel_id.push_back(dets[i]->getID()); pixel_id.push_back(det->getID());
distance.push_back(dets[i]->getDistance(*sample)); distance.push_back(det->getDistance(*sample));
azimuthal_angle.push_back(dets[i]->getPhi()); azimuthal_angle.push_back(det->getPhi());
polar_angle.push_back(ws->detectorTwoTheta(dets[i])); polar_angle.push_back(ws->detectorTwoTheta(det));
} }
// Write Pixel ID to file // Write Pixel ID to file
......
...@@ -246,17 +246,17 @@ string parentName(IComponent_const_sptr comp, const string &prefix) { ...@@ -246,17 +246,17 @@ string parentName(IComponent_const_sptr comp, const string &prefix) {
*/ */
string parentName(IComponent_const_sptr comp, const vector<string> &names) { string parentName(IComponent_const_sptr comp, const vector<string> &names) {
// handle the special case of the component has the name // handle the special case of the component has the name
for (auto name = names.begin(); name != names.end(); ++name) for (const auto &name : names)
if (name->compare(comp->getName()) == 0) if (name.compare(comp->getName()) == 0)
return (*name); return name;
// find the parent with the correct name // find the parent with the correct name
IComponent_const_sptr parent = comp->getParent(); IComponent_const_sptr parent = comp->getParent();
if (parent) { if (parent) {
// see if this is the parent // see if this is the parent
for (auto name = names.begin(); name != names.end(); ++name) for (const auto &name : names)
if (name->compare(parent->getName()) == 0) if (name.compare(parent->getName()) == 0)
return (*name); return name;
// or recurse // or recurse
return parentName(parent, names); return parentName(parent, names);
...@@ -448,10 +448,9 @@ void CreateChunkingFromInstrument::exec() { ...@@ -448,10 +448,9 @@ void CreateChunkingFromInstrument::exec() {
throw std::runtime_error("Failed to find any banks in the instrument"); throw std::runtime_error("Failed to find any banks in the instrument");
// fill in the table workspace // fill in the table workspace
for (auto group = grouping.begin(); group != grouping.end(); ++group) { for (auto &group : grouping) {
stringstream banks; stringstream banks;
for (auto bank = group->second.begin(); bank != group->second.end(); for (auto bank = group.second.begin(); bank != group.second.end(); ++bank)
++bank)
banks << (*bank) << ","; banks << (*bank) << ",";
// remove the trailing comma // remove the trailing comma
......
...@@ -302,12 +302,12 @@ MantidVecPtr CreateSimulationWorkspace::createBinBoundaries() const { ...@@ -302,12 +302,12 @@ MantidVecPtr CreateSimulationWorkspace::createBinBoundaries() const {
*/ */
void CreateSimulationWorkspace::applyDetectorMapping() { void CreateSimulationWorkspace::applyDetectorMapping() {
size_t wsIndex(0); size_t wsIndex(0);
for (auto iter = m_detGroups.begin(); iter != m_detGroups.end(); ++iter) { for (auto &m_detGroup : m_detGroups) {
ISpectrum *spectrum = m_outputWS->getSpectrum(wsIndex); ISpectrum *spectrum = m_outputWS->getSpectrum(wsIndex);
spectrum->setSpectrumNo( spectrum->setSpectrumNo(
static_cast<specid_t>(wsIndex + 1)); // Ensure a contiguous mapping static_cast<specid_t>(wsIndex + 1)); // Ensure a contiguous mapping
spectrum->clearDetectorIDs(); spectrum->clearDetectorIDs();
spectrum->addDetectorIDs(iter->second); spectrum->addDetectorIDs(m_detGroup.second);
++wsIndex; ++wsIndex;
} }
} }
......
...@@ -148,8 +148,8 @@ void DetermineChunking::exec() { ...@@ -148,8 +148,8 @@ void DetermineChunking::exec() {
string dataDir; string dataDir;
LoadPreNexus lp; LoadPreNexus lp;
lp.parseRuninfo(filename, dataDir, eventFilenames); lp.parseRuninfo(filename, dataDir, eventFilenames);
for (size_t i = 0; i < eventFilenames.size(); i++) { for (auto &eventFilename : eventFilenames) {
BinaryFile<DasEvent> eventfile(dataDir + eventFilenames[i]); BinaryFile<DasEvent> eventfile(dataDir + eventFilename);
// Factor of 2 for compression // Factor of 2 for compression
filesize += static_cast<double>(eventfile.getNumElements()) * 48.0 / filesize += static_cast<double>(eventfile.getNumElements()) * 48.0 /
(1024.0 * 1024.0 * 1024.0); (1024.0 * 1024.0 * 1024.0);
...@@ -326,8 +326,8 @@ std::string DetermineChunking::setTopEntryName(std::string filename) { ...@@ -326,8 +326,8 @@ std::string DetermineChunking::setTopEntryName(std::string filename) {
*/ */
FileType DetermineChunking::getFileType(const string &filename) { FileType DetermineChunking::getFileType(const string &filename) {
// check for prenexus // check for prenexus
for (int i = 0; i < NUM_EXT_PRENEXUS; ++i) { for (const auto &i : PRENEXUS_EXT) {
if (filename.find(PRENEXUS_EXT[i]) != std::string::npos) { if (filename.find(i) != std::string::npos) {
g_log.information() << "Determined \'" << filename g_log.information() << "Determined \'" << filename
<< "\' is a prenexus file\n"; << "\' is a prenexus file\n";
return PRENEXUS_FILE; return PRENEXUS_FILE;
...@@ -335,8 +335,8 @@ FileType DetermineChunking::getFileType(const string &filename) { ...@@ -335,8 +335,8 @@ FileType DetermineChunking::getFileType(const string &filename) {
} }
// check for histogram nexus // check for histogram nexus
for (int i = 0; i < NUM_EXT_HISTO_NEXUS; ++i) { for (const auto &i : HISTO_NEXUS_EXT) {
if (filename.find(HISTO_NEXUS_EXT[i]) != std::string::npos) { if (filename.find(i) != std::string::npos) {
g_log.information() << "Determined \'" << filename g_log.information() << "Determined \'" << filename
<< "\' is a histogram nexus file\n"; << "\' is a histogram nexus file\n";
return HISTO_NEXUS_FILE; return HISTO_NEXUS_FILE;
...@@ -344,8 +344,8 @@ FileType DetermineChunking::getFileType(const string &filename) { ...@@ -344,8 +344,8 @@ FileType DetermineChunking::getFileType(const string &filename) {
} }
// check for event nexus - must be last because a valid extension is ".nxs" // check for event nexus - must be last because a valid extension is ".nxs"
for (int i = 0; i < NUM_EXT_EVENT_NEXUS; ++i) { for (const auto &i : EVENT_NEXUS_EXT) {
if (filename.find(EVENT_NEXUS_EXT[i]) != std::string::npos) { if (filename.find(i) != std::string::npos) {
g_log.information() << "Determined \'" << filename g_log.information() << "Determined \'" << filename
<< "\' is an event nexus file\n"; << "\' is an event nexus file\n";
return EVENT_NEXUS_FILE; return EVENT_NEXUS_FILE;
...@@ -353,8 +353,8 @@ FileType DetermineChunking::getFileType(const string &filename) { ...@@ -353,8 +353,8 @@ FileType DetermineChunking::getFileType(const string &filename) {
} }
// check for isis raw files // check for isis raw files
for (int i = 0; i < NUM_EXT_RAW; ++i) { for (const auto &i : RAW_EXT) {
if (filename.find(RAW_EXT[i]) != std::string::npos) { if (filename.find(i) != std::string::npos) {
g_log.information() << "Determined \'" << filename g_log.information() << "Determined \'" << filename
<< "\' is an ISIS raw file\n"; << "\' is an ISIS raw file\n";
return RAW_FILE; return RAW_FILE;
......
...@@ -107,9 +107,9 @@ void DownloadInstrument::exec() { ...@@ -107,9 +107,9 @@ void DownloadInstrument::exec() {
<< " from the instrument repository" << std::endl; << " from the instrument repository" << std::endl;
} }
for (auto itMap = fileMap.begin(); itMap != fileMap.end(); ++itMap) { for (auto &itMap : fileMap) {
// download a file // download a file
doDownloadFile(itMap->first, itMap->second); doDownloadFile(itMap.first, itMap.second);
} }
setProperty("FileDownloadCount", static_cast<int>(fileMap.size())); setProperty("FileDownloadCount", static_cast<int>(fileMap.size()));
...@@ -180,8 +180,7 @@ DownloadInstrument::StringToStringMap DownloadInstrument::processRepository() { ...@@ -180,8 +180,7 @@ DownloadInstrument::StringToStringMap DownloadInstrument::processRepository() {
std::set<std::string> repoFilenames; std::set<std::string> repoFilenames;
for (Json::ArrayIndex i = 0; i < serverContents.size(); ++i) { for (auto &serverElement : serverContents) {
const auto &serverElement = serverContents[i];
std::string name = serverElement.get("name", "").asString(); std::string name = serverElement.get("name", "").asString();
repoFilenames.insert(name); repoFilenames.insert(name);
Poco::Path filePath(localPath, name); Poco::Path filePath(localPath, name);
...@@ -303,8 +302,8 @@ size_t DownloadInstrument::removeOrphanedFiles( ...@@ -303,8 +302,8 @@ size_t DownloadInstrument::removeOrphanedFiles(
// delete any identified files // delete any identified files
try { try {
for (auto it = filesToDelete.begin(); it != filesToDelete.end(); ++it) { for (const auto &it : filesToDelete) {
Poco::File file(*it); Poco::File file(it);
file.remove(); file.remove();
} }
} catch (Poco::Exception &ex) { } catch (Poco::Exception &ex) {
......
...@@ -29,9 +29,9 @@ void copyLogs(const EventWorkspace_sptr &from, EventWorkspace_sptr &to) { ...@@ -29,9 +29,9 @@ void copyLogs(const EventWorkspace_sptr &from, EventWorkspace_sptr &to) {
// from the logs, get all the properties that don't overwrite any // from the logs, get all the properties that don't overwrite any
// prop. already set in the sink workspace (like 'filename'). // prop. already set in the sink workspace (like 'filename').
auto props = from->mutableRun().getLogData(); auto props = from->mutableRun().getLogData();
for (size_t j = 0; j < props.size(); j++) { for (auto &prop : props) {
if (!to->mutableRun().hasProperty(props[j]->name())) { if (!to->mutableRun().hasProperty(prop->name())) {
to->mutableRun().addLogData(props[j]->clone()); to->mutableRun().addLogData(prop->clone());
} }
} }
} }
...@@ -110,8 +110,8 @@ void EventWorkspaceCollection::setNPeriods( ...@@ -110,8 +110,8 @@ void EventWorkspaceCollection::setNPeriods(
} }
void EventWorkspaceCollection::reserveEventListAt(size_t wi, size_t size) { void EventWorkspaceCollection::reserveEventListAt(size_t wi, size_t size) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->getEventList(wi).reserve(size); i->getEventList(wi).reserve(size);
} }
} }
...@@ -128,8 +128,8 @@ API::Workspace_sptr EventWorkspaceCollection::combinedWorkspace() { ...@@ -128,8 +128,8 @@ API::Workspace_sptr EventWorkspaceCollection::combinedWorkspace() {
final = getSingleHeldWorkspace(); final = getSingleHeldWorkspace();
} else { } else {
auto wsg = boost::make_shared<API::WorkspaceGroup>(); auto wsg = boost::make_shared<API::WorkspaceGroup>();
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
wsg->addWorkspace(m_WsVec[i]); wsg->addWorkspace(i);
} }
final = wsg; final = wsg;
} }
...@@ -160,10 +160,10 @@ EventWorkspaceCollection::getSpectrum(const size_t index) const { ...@@ -160,10 +160,10 @@ EventWorkspaceCollection::getSpectrum(const size_t index) const {
void EventWorkspaceCollection::setSpectrumNumbersFromUniqueSpectra( void EventWorkspaceCollection::setSpectrumNumbersFromUniqueSpectra(
const std::set<int> uniqueSpectra) { const std::set<int> uniqueSpectra) {
// For each workspace, update all the spectrum numbers // For each workspace, update all the spectrum numbers
for (auto ws = m_WsVec.begin(); ws != m_WsVec.end(); ++ws) { for (auto &ws : m_WsVec) {
size_t counter = 0; size_t counter = 0;
for (auto it = uniqueSpectra.begin(); it != uniqueSpectra.end(); ++it) { for (value_type it : uniqueSpectra) {
(*ws)->getSpectrum(counter)->setSpectrumNo(*it); ws->getSpectrum(counter)->setSpectrumNo(it);
++counter; ++counter;
} }
} }
...@@ -171,16 +171,16 @@ void EventWorkspaceCollection::setSpectrumNumbersFromUniqueSpectra( ...@@ -171,16 +171,16 @@ void EventWorkspaceCollection::setSpectrumNumbersFromUniqueSpectra(
void EventWorkspaceCollection::setSpectrumNumberForAllPeriods( void EventWorkspaceCollection::setSpectrumNumberForAllPeriods(
const size_t spectrumNumber, const specid_t specid) { const size_t spectrumNumber, const specid_t specid) {
for (auto ws = m_WsVec.begin(); ws != m_WsVec.end(); ++ws) { for (auto &ws : m_WsVec) {
auto spec = (*ws)->getSpectrum(spectrumNumber); auto spec = ws->getSpectrum(spectrumNumber);
spec->setSpectrumNo(specid); spec->setSpectrumNo(specid);
} }
} }
void EventWorkspaceCollection::setDetectorIdsForAllPeriods( void EventWorkspaceCollection::setDetectorIdsForAllPeriods(
const size_t spectrumNumber, const detid_t id) { const size_t spectrumNumber, const detid_t id) {
for (auto ws = m_WsVec.begin(); ws != m_WsVec.end(); ++ws) { for (auto &ws : m_WsVec) {
auto spec = (*ws)->getSpectrum(spectrumNumber); auto spec = ws->getSpectrum(spectrumNumber);
spec->setDetectorID(id); spec->setDetectorID(id);
} }
} }
...@@ -228,40 +228,40 @@ Kernel::DateAndTime EventWorkspaceCollection::getFirstPulseTime() const { ...@@ -228,40 +228,40 @@ Kernel::DateAndTime EventWorkspaceCollection::getFirstPulseTime() const {
return m_WsVec[0]->getFirstPulseTime(); return m_WsVec[0]->getFirstPulseTime();
} }
void EventWorkspaceCollection::setAllX(Kernel::cow_ptr<MantidVec> &x) { void EventWorkspaceCollection::setAllX(Kernel::cow_ptr<MantidVec> &x) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->setAllX(x); i->setAllX(x);
} }
} }
size_t EventWorkspaceCollection::getNumberEvents() const { size_t EventWorkspaceCollection::getNumberEvents() const {
return m_WsVec[0]->getNumberEvents(); // Should be the sum across all periods? return m_WsVec[0]->getNumberEvents(); // Should be the sum across all periods?
} }
void EventWorkspaceCollection::resizeTo(const size_t size) { void EventWorkspaceCollection::resizeTo(const size_t size) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->resizeTo(size); // Creates the EventLists i->resizeTo(size); // Creates the EventLists
} }
} }
void EventWorkspaceCollection::padSpectra(const std::vector<int32_t> &padding) { void EventWorkspaceCollection::padSpectra(const std::vector<int32_t> &padding) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->padSpectra(padding); // Set detector ids and spectrum numbers i->padSpectra(padding); // Set detector ids and spectrum numbers
} }
} }
void EventWorkspaceCollection::setInstrument( void EventWorkspaceCollection::setInstrument(
const Geometry::Instrument_const_sptr &inst) { const Geometry::Instrument_const_sptr &inst) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->setInstrument(inst); i->setInstrument(inst);
} }
} }
void EventWorkspaceCollection::setMonitorWorkspace( void EventWorkspaceCollection::setMonitorWorkspace(
const boost::shared_ptr<API::MatrixWorkspace> &monitorWS) { const boost::shared_ptr<API::MatrixWorkspace> &monitorWS) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->setMonitorWorkspace( i->setMonitorWorkspace(
monitorWS); // TODO, do we really set the same monitor on all periods??? monitorWS); // TODO, do we really set the same monitor on all periods???
} }
} }
void EventWorkspaceCollection::updateSpectraUsing( void EventWorkspaceCollection::updateSpectraUsing(
const API::SpectrumDetectorMapping &map) { const API::SpectrumDetectorMapping &map) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->updateSpectraUsing(map); i->updateSpectraUsing(map);
} }
} }
...@@ -271,43 +271,43 @@ DataObjects::EventList *EventWorkspaceCollection::getEventListPtr(size_t i) { ...@@ -271,43 +271,43 @@ DataObjects::EventList *EventWorkspaceCollection::getEventListPtr(size_t i) {
} }
void EventWorkspaceCollection::populateInstrumentParameters() { void EventWorkspaceCollection::populateInstrumentParameters() {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->populateInstrumentParameters(); i->populateInstrumentParameters();
} }
} }
void EventWorkspaceCollection::setGeometryFlag(const int flag) { void EventWorkspaceCollection::setGeometryFlag(const int flag) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->mutableSample().setGeometryFlag(flag); i->mutableSample().setGeometryFlag(flag);
} }
} }
void EventWorkspaceCollection::setThickness(const float flag) { void EventWorkspaceCollection::setThickness(const float flag) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->mutableSample().setThickness(flag); i->mutableSample().setThickness(flag);
} }
} }
void EventWorkspaceCollection::setHeight(const float flag) { void EventWorkspaceCollection::setHeight(const float flag) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->mutableSample().setHeight(flag); i->mutableSample().setHeight(flag);
} }
} }
void EventWorkspaceCollection::setWidth(const float flag) { void EventWorkspaceCollection::setWidth(const float flag) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->mutableSample().setWidth(flag); i->mutableSample().setWidth(flag);
} }
} }
void EventWorkspaceCollection::setTitle(std::string title) { void EventWorkspaceCollection::setTitle(std::string title) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
m_WsVec[i]->setTitle(title); i->setTitle(title);
} }
} }
void EventWorkspaceCollection::applyFilter( void EventWorkspaceCollection::applyFilter(
boost::function<void(MatrixWorkspace_sptr)> func) { boost::function<void(MatrixWorkspace_sptr)> func) {
for (size_t i = 0; i < m_WsVec.size(); ++i) { for (auto &i : m_WsVec) {
func(m_WsVec[i]); func(i);
} }
} }
......
...@@ -173,14 +173,12 @@ static string generateMappingfileName(EventWorkspace_sptr &wksp) { ...@@ -173,14 +173,12 @@ static string generateMappingfileName(EventWorkspace_sptr &wksp) {
const string CAL("_CAL"); const string CAL("_CAL");
const size_t CAL_LEN = CAL.length(); // cache to make life easier const size_t CAL_LEN = CAL.length(); // cache to make life easier
vector<string> files; vector<string> files;
for (size_t i = 0; i < dirs.size(); ++i) { for (auto &dir : dirs) {
if ((dirs[i].length() > CAL_LEN) && if ((dir.length() > CAL_LEN) &&
(dirs[i].compare(dirs[i].length() - CAL.length(), CAL.length(), CAL) == (dir.compare(dir.length() - CAL.length(), CAL.length(), CAL) == 0)) {
0)) { if (Poco::File(base.path() + "/" + dir + "/calibrations/" + mapping)
if (Poco::File(base.path() + "/" + dirs[i] + "/calibrations/" + mapping)
.exists()) .exists())
files.push_back(base.path() + "/" + dirs[i] + "/calibrations/" + files.push_back(base.path() + "/" + dir + "/calibrations/" + mapping);
mapping);
} }
} }
...@@ -515,8 +513,8 @@ void FilterEventsByLogValuePreNexus::processProperties() { ...@@ -515,8 +513,8 @@ void FilterEventsByLogValuePreNexus::processProperties() {
m_loadOnlySomeSpectra = (this->m_spectraList.size() > 0); m_loadOnlySomeSpectra = (this->m_spectraList.size() > 0);
// Turn the spectra list into a map, for speed of access // Turn the spectra list into a map, for speed of access
for (auto it = m_spectraList.begin(); it != m_spectraList.end(); it++) for (long long &it : m_spectraList)
spectraLoadMap[*it] = true; spectraLoadMap[it] = true;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Other features // Other features
...@@ -783,8 +781,8 @@ void FilterEventsByLogValuePreNexus::runLoadInstrument( ...@@ -783,8 +781,8 @@ void FilterEventsByLogValuePreNexus::runLoadInstrument(
vector<string> eventExts(EVENT_EXTS, EVENT_EXTS + NUM_EXT); vector<string> eventExts(EVENT_EXTS, EVENT_EXTS + NUM_EXT);
std::reverse(eventExts.begin(), eventExts.end()); std::reverse(eventExts.begin(), eventExts.end());
for (size_t i = 0; i < eventExts.size(); ++i) { for (auto &eventExt : eventExts) {
size_t pos = instrument.find(eventExts[i]); size_t pos = instrument.find(eventExt);
if (pos != string::npos) { if (pos != string::npos) {
instrument = instrument.substr(0, pos); instrument = instrument.substr(0, pos);
break; break;
...@@ -1428,13 +1426,13 @@ void FilterEventsByLogValuePreNexus::unmaskVetoEventIndexes() { ...@@ -1428,13 +1426,13 @@ void FilterEventsByLogValuePreNexus::unmaskVetoEventIndexes() {
size_t numerror = 0; size_t numerror = 0;
PRAGMA_OMP(parallel for schedule(dynamic, 1) ) PRAGMA_OMP(parallel for schedule(dynamic, 1) )
for (int i = 0; i < static_cast<int>(m_vecEventIndex.size()); ++i) { for (unsigned long long &i : m_vecEventIndex) {
PARALLEL_START_INTERUPT_REGION PARALLEL_START_INTERUPT_REGION
uint64_t eventindex = m_vecEventIndex[i]; uint64_t eventindex = i;
if (eventindex > static_cast<uint64_t>(m_numEvents)) { if (eventindex > static_cast<uint64_t>(m_numEvents)) {
uint64_t realeventindex = eventindex & VETOFLAG; uint64_t realeventindex = eventindex & VETOFLAG;
m_vecEventIndex[i] = realeventindex; i = realeventindex;
} }
PARALLEL_END_INTERUPT_REGION PARALLEL_END_INTERUPT_REGION
} }
...@@ -2250,13 +2248,13 @@ void FilterEventsByLogValuePreNexus::setupPixelSpectrumMap( ...@@ -2250,13 +2248,13 @@ void FilterEventsByLogValuePreNexus::setupPixelSpectrumMap(
eventws->getInstrument()->getDetectors(detector_map); eventws->getInstrument()->getDetectors(detector_map);
// Set up // Set up