Skip to content
Snippets Groups Projects
Commit 887a2c21 authored by Moore's avatar Moore
Browse files

fix monitor extraction

parent 5e001abd
No related branches found
No related tags found
No related merge requests found
...@@ -354,13 +354,13 @@ void JSONGeometryParser::validateAndRetrieveGeometry( ...@@ -354,13 +354,13 @@ void JSONGeometryParser::validateAndRetrieveGeometry(
; ;
m_jsonDetectorBanks = moveToUniquePtrVec(jsonDetectorBanks); m_jsonDetectorBanks = moveToUniquePtrVec(jsonDetectorBanks);
auto instrMonitors = moveToUniquePtrVec(getAllMonitors(instrument)); auto instrMonitors = getAllMonitors(instrument);
auto entryMonitors = moveToUniquePtrVec(getAllMonitors(entry)); auto entryMonitors = getAllMonitors(entry);
instrMonitors.insert(instrMonitors.end(),
std::make_move_iterator(entryMonitors.begin()),
std::make_move_iterator(entryMonitors.end()));
m_jsonMonitors = moveToUniquePtrVec(instrMonitors);
auto jsonChoppers = getAllChoppers(instrument); auto jsonChoppers = getAllChoppers(instrument);
m_jsonMonitors = std::move(instrMonitors);
std::move(entryMonitors.begin(), entryMonitors.end(),
std::back_inserter(m_jsonMonitors));
m_jsonChoppers = moveToUniquePtrVec(jsonChoppers); m_jsonChoppers = moveToUniquePtrVec(jsonChoppers);
m_root = std::make_unique<Json::Value>(std::move(root)); m_root = std::make_unique<Json::Value>(std::move(root));
......
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