From 49f6f6f2d59205e61d6253832ace363036efcacf Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Wed, 9 Feb 2022 15:07:03 +0000 Subject: [PATCH 1/2] update git ignore file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ebd849acd..b40db0290 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ InstallArea build.* run .clang-format -setup.*.vars \ No newline at end of file +setup.*.vars +cache_preload.cmake -- GitLab From 9a6e8665f25ce20908007fa64be7f0733c4d3f12 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Mon, 21 Mar 2022 15:55:09 +0000 Subject: [PATCH 2/2] Adapt to change in smartIDsHelper.globalPosition API --- Rich/RichOnlineMonitors/src/RichDataTuple.cpp | 3 +-- Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Rich/RichOnlineMonitors/src/RichDataTuple.cpp b/Rich/RichOnlineMonitors/src/RichDataTuple.cpp index 85e72f965..a90c9c679 100644 --- a/Rich/RichOnlineMonitors/src/RichDataTuple.cpp +++ b/Rich/RichOnlineMonitors/src/RichDataTuple.cpp @@ -287,8 +287,7 @@ namespace Rich::Future::Mon { m_tell40bit.emplace_back( 100 * ( 24 * ( tel40Data.sourceID.data() & 0x3F ) + tel40Data.connector.data() ) + anodeData.bit.data() ); - Gaudi::XYZPoint gPos; - smartIDsHelper.globalPosition( id, gPos ); + const auto gPos = smartIDsHelper.globalPosition( id ); const auto lPos = smartIDsHelper.globalToPDPanel( gPos ); m_spaceLocX.emplace_back( lPos.X() ); m_spaceLocY.emplace_back( lPos.Y() ); diff --git a/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp b/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp index 69e9f1f1a..cf54142c9 100644 --- a/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp +++ b/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp @@ -385,14 +385,12 @@ namespace Rich::Future::Mon { if ( m_fillSpacePlots ) { // get the spatial coordiates - Gaudi::XYZPoint gPos; + const auto gPos = smartIDsHelper.globalPosition( id ); // info() << "ID " << id << endmsg; - if ( smartIDsHelper.globalPosition( id, gPos ) ) { - // info() << "gPos " << gPos << endmsg; - const auto lPos = smartIDsHelper.globalToPDPanel( gPos ); - // info() << "lPos " << lPos << endmsg; - fillHisto( h_hitMaps[rich], lPos.x(), lPos.y() ); - } + // info() << "gPos " << gPos << endmsg; + const auto lPos = smartIDsHelper.globalToPDPanel( gPos ); + // info() << "lPos " << lPos << endmsg; + fillHisto( h_hitMaps[rich], lPos.x(), lPos.y() ); } } // hit loop -- GitLab