From 83be13b514c1936a5c21237a69c90ffb51aa6745 Mon Sep 17 00:00:00 2001
From: Edoardo Franzoso <efranzos@cern.ch>
Date: Wed, 26 Feb 2025 10:50:58 +0100
Subject: [PATCH] moved RichHitMapsMonitor from Panoptes to Moore
---
.../Panoptes/python/Panoptes/commissioning.py | 2 +-
Rich/RichOnlineMonitors/CMakeLists.txt | 1 -
.../src/RichHitMapsMonitor.cpp | 427 ------------------
3 files changed, 1 insertion(+), 429 deletions(-)
delete mode 100644 Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp
diff --git a/Rich/Panoptes/python/Panoptes/commissioning.py b/Rich/Panoptes/python/Panoptes/commissioning.py
index 95c41b046..d6ac1ed40 100644
--- a/Rich/Panoptes/python/Panoptes/commissioning.py
+++ b/Rich/Panoptes/python/Panoptes/commissioning.py
@@ -14,8 +14,8 @@ from PyConf.Algorithms import HltRoutingBitsFilter, OdinTypesFilter
from PyConf.Algorithms import Rich__Future__Mon__BankSizes as BankSizes
from PyConf.Algorithms import Rich__Future__Mon__BXTypeMonitors as BXTypeMonitors
from PyConf.Algorithms import Rich__Future__Mon__DataTuple as DataTuple
-from PyConf.Algorithms import Rich__Future__Mon__HitMaps as HitMaps
from PyConf.Algorithms import Rich__Future__Mon__TAEMonitor as TAEMonitor
+from PyConf.Algorithms import Rich__Future__Rec__Moni__HitMaps as HitMaps
from PyConf.application import default_raw_banks, make_odin
from PyConf.control_flow import CompositeNode, NodeLogic
from PyConf.tonic import configurable
diff --git a/Rich/RichOnlineMonitors/CMakeLists.txt b/Rich/RichOnlineMonitors/CMakeLists.txt
index f08c6052d..f38d8dc24 100644
--- a/Rich/RichOnlineMonitors/CMakeLists.txt
+++ b/Rich/RichOnlineMonitors/CMakeLists.txt
@@ -16,7 +16,6 @@ Rich/RichOnlineMonitors
gaudi_add_module(RichOnlineMonitors
SOURCES
src/RichDataTuple.cpp
- src/RichHitMapsMonitor.cpp
src/RichBXTypeMonitor.cpp
src/RichTAEMonitor.cpp
src/RichBankSizesMonitor.cpp
diff --git a/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp b/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp
deleted file mode 100644
index 3ced84f58..000000000
--- a/Rich/RichOnlineMonitors/src/RichHitMapsMonitor.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/*****************************************************************************\
-* (c) Copyright 2000-2026 CERN for the benefit of the LHCb Collaboration *
-* *
-* This software is distributed under the terms of the GNU General Public *
-* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". *
-* *
-* In applying this licence, CERN does not waive the privileges and immunities *
-* granted to it by virtue of its status as an Intergovernmental Organization *
-* or submit itself to any jurisdiction. *
-\*****************************************************************************/
-
-// base class
-#include "RichFutureRecBase/RichRecHistoAlgBase.h"
-
-// Gaudi Functional
-#include "GaudiAlg/Consumer.h"
-
-// Rich Utils
-#include "RichFutureUtils/RichDecodedData.h"
-#include "RichFutureUtils/RichSmartIDs.h"
-#include "RichRecUtils/RichDetParams.h"
-#include "RichUtils/RichDAQDefinitions.h"
-
-// Rich DAQ
-#include "RichFutureDAQ/RichPDMDBEncodeMapping.h"
-#include "RichFutureDAQ/RichTel40CableMapping.h"
-
-// event
-#include "Event/ODIN.h"
-
-// ROOT
-#include "TString.h"
-
-// STD
-#include <array>
-#include <cmath>
-#include <memory>
-#include <vector>
-
-namespace Rich::Future::Mon {
-
- // Use the functional framework
- using namespace Gaudi::Functional;
-
- /** @class HitMaps HitMaps.h
- *
- * Produces RICH hit maps.
- *
- * @author Chris Jones
- * @date 2021-05-20xs
- */
-
- class HitMaps final : public Consumer<void( const LHCb::ODIN&, //
- const DAQ::DecodedData&, //
- const Rich::Utils::RichSmartIDs&, //
- const DAQ::Tel40CableMapping&, //
- const DAQ::PDMDBEncodeMapping& ), //
- LHCb::DetDesc::usesBaseAndConditions<HistoAlgBase, //
- Rich::Utils::RichSmartIDs, //
- DAQ::Tel40CableMapping, //
- DAQ::PDMDBEncodeMapping>> {
-
- public:
- /// Standard constructor
- HitMaps( const std::string& name, ISvcLocator* pSvcLocator )
- : Consumer( name, pSvcLocator,
- // input data
- { KeyValue{ "ODINLocation", LHCb::ODINLocation::Default },
- KeyValue{ "DecodedDataLocation", DAQ::DecodedDataLocation::Default },
- // input conditions data
- KeyValue{ "RichSmartIDs", Rich::Utils::RichSmartIDs::DefaultConditionKey },
- KeyValue{ "Tel40CableMapping", DAQ::Tel40CableMapping::DefaultConditionKey + "-" + name },
- KeyValue{ "PDMDBEncodeMapping", DAQ::PDMDBEncodeMapping::DefaultConditionKey + "-" + name } } ) {
- // setProperty( "HistoPrint", true ).ignore();
- setProperty( "NBins2DHistos", 500 ).ignore();
- }
-
- /// Initialize
- StatusCode initialize() override {
- return Consumer::initialize().andThen( [&] {
- // create the RICH smartID helper instance
- Rich::Utils::RichSmartIDs::addConditionDerivation( this );
- DAQ::Tel40CableMapping::addConditionDerivation( this );
- DAQ::PDMDBEncodeMapping::addConditionDerivation( this );
- m_start_scan = 0;
- m_stop_scan = 0;
- // m_start_scan = 15;
- // m_stop_scan = 24;
- // m_start_scan = atoi(getenv("RICHSCANSTART"));
- // m_stop_scan = atoi(getenv("RICHSCANSTOP"));
- } );
- }
-
- private:
- // histograms
-
- using DT = LHCb::RichSmartID::DataType;
- using PMTPlotsPerEC = Hist::Array<Hist::H2D<>, LHCb::RichSmartID::MaPMT::RTypePMTsPerEC, DT>;
- using PMTPlotsPerPDM = Hist::Array<PMTPlotsPerEC, LHCb::RichSmartID::MaPMT::ECsPerModule, DT>;
- using PMTPlotsPerMod = Hist::Array<PMTPlotsPerPDM, LHCb::RichSmartID::MaPMT::ModulesPerColumn, DT>;
- using PMTPlotsPerCol = Hist::Array<PMTPlotsPerMod, LHCb::RichSmartID::MaPMT::MaxModuleColumnsAnyPanel, DT>;
- using PMTPlotsPerPanel = Hist::PanelArray<PMTPlotsPerCol>;
- using PMTPlots = Hist::DetArray<PMTPlotsPerPanel>;
-
- /// Hit map for RICH, local coordinates
- mutable Hist::DetArray<Hist::H2D<>> h_hitMaps = { {} };
- /// Pixel based hit map
- mutable Hist::DetArray<Hist::H2D<>> h_pixelMap = { {} };
- mutable Hist::DetArray<Hist::H2D<>> h_pixelMap2 = { {} };
- /// Occupancy vs slotID
- mutable Hist::DetArray<Hist::H2D<>> h_NHitsVsSlotID = { {} };
- /// Occupancy vs bunchID
- mutable Hist::DetArray<Hist::H2D<>> h_NHitsVsBunchID = { {} };
- /// slotID vs tell40 bit
- mutable Hist::DetArray<Hist::H2D<>> h_SlotIDVsBitID = { {} };
- /// bunchID vs tell40 link (i.e. 100 bits)
- mutable Hist::DetArray<Hist::H2D<>> h_BunchIDVsBitID = { {} };
- /// Individual maps for each PMT
- mutable std::unique_ptr<PMTPlots> h_pixelMapsCol;
- /// Individual hits for each PMT
- mutable std::unique_ptr<PMTPlots> h_pixelCol;
- /// nHits
- mutable Hist::DetArray<Hist::H1D<>> h_nHits = { {} };
- mutable Hist::DetArray<Hist::PanelArray<Hist::H1D<>>> h_nHits_side = { {} };
-
- private:
- unsigned int m_start_scan{ 0 };
- unsigned int m_stop_scan{ 0 };
-
- private:
- // properties
-
- /// Fill individual PMT plots
- Gaudi::Property<bool> m_fillVerbosePMTPlots{ this, "VerbosePlots", false, "Create verbose PMT specific hit maps" };
- /// Fill spatial coordiate plots
- Gaudi::Property<bool> m_fillSpacePlots{ this, "SpatialPlots", false, "Create spatial hit maps" };
- /// Fill individual PMT plots
- Gaudi::Property<bool> m_enableOfflinePlots{ this, "OfflinePlots", false, "Enable (large) offline plots" };
-
- protected:
- /// Pre-Book all histograms
- StatusCode prebookHistograms() override {
- bool ok = true;
-
- PD_LOCAL_POSITIONS_X;
- PD_LOCAL_POSITIONS_Y;
-
- // Loop over RICHes
- for ( const auto rich : Rich::detectors() ) {
- if ( m_fillSpacePlots ) {
- ok &= initHist( h_hitMaps[rich], //
- Rich::HistogramID( "localHitMap", rich ), //
- "Local PD Panel Space Point Hit Map", //
- xMinPDLoc[rich], xMaxPDLoc[rich], nBins2D(), //
- yMinPDLoc[rich], yMaxPDLoc[rich], nBins2D(), //
- "Local Panel X", "Local Panel Y" );
- }
- const auto xRange = LHCb::RichSmartID::MaPMT::PDGlobalViewRangeX[rich] + 20;
- const auto xBins = ( 2 * xRange ) + 1;
- const auto yRange = LHCb::RichSmartID::MaPMT::PDGlobalViewRangeY[rich] + 20;
- const auto yBins = ( 2 * yRange ) + 1;
- const float xMax = xRange + 0.5;
- const float yMax = yRange + 0.5;
- ok &= initHist( h_pixelMap[rich], Rich::HistogramID( "PixelMap", rich ), //
- "Global Pixel Map 1", //
- -xMax, xMax, xBins, //
- -yMax, yMax, yBins, //
- "Global Pixel X", "Global Pixel Y" );
- ok &= initHist( h_nHits[rich], Rich::HistogramID( "nHits", rich ), //
- "Number of hits", //
- 0, 35000, 35000, //
- "nHits" ); //
- ok &= initHist( h_pixelMap2[rich], //
- Rich::HistogramID( "PixelMap2", rich ), //
- "Global Pixel Map 2", //
- -xMax, xMax, xBins, //
- -yMax, yMax, yBins, //
- "Global Pixel X", "Global Pixel Y" );
- ok &= initHist( h_NHitsVsSlotID[rich], Rich::HistogramID( "NHitsVsSlotID", rich ), //
- "# of hits Vs slot ID", //
- -0.5, 31.5, 32, //
- -0.5, 1.25e5 - 0.5, 1.25e5, //
- "Slot ID=abs(bxid-1024)%23", "# of hits" );
- ok &= initHist( h_NHitsVsBunchID[rich], Rich::HistogramID( "NHitsVsBunchID", rich ), //
- "# of hits Vs bunch ID", //
- -0.5, 3600 - 0.5, 3600, //
- -0.5, 1.25e5 - 0.5, 1.25e3, //
- "Bunch ID", "# of hits" );
- if ( m_enableOfflinePlots ) {
- /*ok &= initHist( h_NHitsVsBunchID[rich], //
- Rich::HistogramID( "NHitsVsBunchID", rich ), //
- "# of hits Vs bunch ID", //
- -0.5, 3600 - 0.5, 3600, //
- -0.5, 1.25e5 - 0.5, 1.25e4, //
- "Bunch ID", "# of hits" );*/
- ok &= initHist( h_SlotIDVsBitID[rich], Rich::HistogramID( "SlotIDVsBitID", rich ), //
- "Slot ID Vs global bit ID", //
- -0.5, 2e5 - 0.5, 2e5, //
- -0.5, 32 - 0.5, 32, //
- "bit ID", "Slot ID=abs(bxid-1024)%23" );
- ok &= initHist( h_BunchIDVsBitID[rich], Rich::HistogramID( "BunchIDVsBitID", rich ), //
- "Bunch ID Vs global bit ID", //
- -0.5, 2e5 - 0.5, 2e3, //
- -0.5, 3564 - 0.5, 3564, //
- "bit ID", "Bunch ID" );
- }
-
- if ( m_fillVerbosePMTPlots ) {
- if ( !h_pixelMapsCol.get() ) { h_pixelMapsCol = std::make_unique<PMTPlots>(); }
- if ( !h_pixelCol.get() ) { h_pixelCol = std::make_unique<PMTPlots>(); }
- for ( const auto side : Rich::sides() ) {
- ok &= initHist( h_nHits_side[rich][side],
- Rich::HistogramID( Form( "nHits_RICH%d_Side%d", rich, side ), rich, side ), //
- "Number of hits", //
- 0, 3500, 3500, //
- "nHits" ); //
- for ( DT iCol = 0; iCol < LHCb::RichSmartID::MaPMT::ModuleColumnsPerPanel[rich]; ++iCol ) {
- for ( DT iPDM = 0; iPDM < LHCb::RichSmartID::MaPMT::ModulesPerColumn; ++iPDM ) {
- for ( DT iEC = 0; iEC < LHCb::RichSmartID::MaPMT::ECsPerModule; ++iEC ) {
- for ( DT iPMT = 0; iPMT < LHCb::RichSmartID::MaPMT::RTypePMTsPerEC; ++iPMT ) {
- if ( rich == Rich::Rich2 && iPDM != 2 && iPDM != 3 && iPMT > 0 ) { continue; }
- // temporary correction for RICH2 col number in title. remove when using DD4HEP
-#ifdef USE_DD4HEP
- const DT iColCorr = 0u;
-#else
- const DT iColCorr = ( rich == Rich::Rich2 ? 1 : 0 );
-#endif
- const auto pmt = ( 1000 * ( iCol + iColCorr ) ) + ( 100 * iPDM ) + ( 10 * iEC ) + iPMT;
- ok &= initHist( ( *h_pixelMapsCol )[rich][side][iCol][iPDM][iEC][iPMT], //
- Rich::HistogramID( Form( "PMTHitMap%05u", pmt ), rich, side ), //
- Form( "COL%02u_PDM%u_EC%u_PMT%u Hit Map", iCol + iColCorr, iPDM, iEC, iPMT ), //
- -0.5, LHCb::RichSmartID::MaPMT::PixelsPerRow - 0.5,
- LHCb::RichSmartID::MaPMT::PixelsPerRow, //
- -0.5, LHCb::RichSmartID::MaPMT::PixelsPerCol - 0.5,
- LHCb::RichSmartID::MaPMT::PixelsPerCol, //
- "Pixel Row", "Pixel Column" );
- ok &= initHist( ( *h_pixelCol )[rich][side][iCol][iPDM][iEC][iPMT], //
- Rich::HistogramID( Form( "PMTHits%05u", pmt ), rich, side ), //
- Form( "COL%02u_PDM%u_EC%u_PMT%u Hits", iCol + iColCorr, iPDM, iEC, iPMT ), //
- 0, 256, 256, //
- 0, 64, 64, //
- "StepID", "Anode Index" );
- }
- }
- }
- }
- }
- }
- }
-
- return StatusCode{ ok };
- }
-
- private:
- /// Get the plot for a specific PMT
- inline auto& getPMTPlot( const LHCb::RichSmartID id ) const {
- // extract some parameters
- const auto rich = id.rich();
- const auto side = id.panel();
- const auto iCol = id.panelLocalModuleColumn();
- const auto iPDM = id.columnLocalModuleNum();
- const auto iEC = id.elementaryCell();
- const auto iPMT = id.pdNumInEC();
- // sanity check before using as array indices
- assert( h_pixelMapsCol.get() );
- auto& plts = ( *h_pixelMapsCol );
- // return plot reference
- return plts.at( rich ).at( side ).at( iCol ).at( iPDM ).at( iEC ).at( iPMT );
- }
-
- inline auto& getPMTHitsPlot( const LHCb::RichSmartID id ) const {
- // extract some parameters
- const auto rich = id.rich();
- const auto side = id.panel();
- const auto iCol = id.panelLocalModuleColumn();
- const auto iPDM = id.columnLocalModuleNum();
- const auto iEC = id.elementaryCell();
- const auto iPMT = id.pdNumInEC();
- // sanity check before using as array indices
- assert( h_pixelCol.get() );
- auto& plts = ( *h_pixelCol );
- // return plot reference
- return plts.at( rich ).at( side ).at( iCol ).at( iPDM ).at( iEC ).at( iPMT );
- }
-
- public:
- /// Functional operator
- void operator()( const LHCb::ODIN& odin, //
- const DAQ::DecodedData& data, //
- const Rich::Utils::RichSmartIDs& smartIDsHelper, //
- const DAQ::Tel40CableMapping& tel40Maps, //
- const DAQ::PDMDBEncodeMapping& pdmdbMaps ) const override {
-
- // local buffers
- auto hb_SlotIDVsBitID = h_SlotIDVsBitID.buffer();
- auto hb_BunchIDVsBitID = h_BunchIDVsBitID.buffer();
- auto hb_pixelMap = h_pixelMap.buffer();
- auto hb_pixelMap2 = h_pixelMap2.buffer();
- auto hb_hitMaps = h_hitMaps.buffer();
-
- //// Get bxID
- const auto bunchID = odin.bunchId();
- const int slotID = std::abs( bunchID - 1024 ) % 23;
- //// Get value of stepID
- const auto stepID = odin.calibrationStep();
-
- int thDAC_ID = 0;
- // Get value of thDAC_ID according to scan values
- if ( m_start_scan > m_stop_scan ) {
- thDAC_ID = m_start_scan - stepID;
- } else if ( m_start_scan < m_stop_scan ) {
- thDAC_ID = stepID + m_start_scan;
- }
-
- // Loop over RICHes
- for ( const auto rich : Rich::detectors() ) {
- // data for this RICH
- unsigned int nHits = 0;
- const auto& rD = data[rich];
- // sides per RICH
- for ( const auto side : Rich::sides() ) {
- const auto& pD = rD[side];
- // data for this side
- unsigned int nHitsSide = 0;
- // PD modules per side
- for ( const auto& mD : pD ) {
- // PDs per module
- for ( const auto& PD : mD ) {
-
- // PD ID
- const auto pdID = PD.pdID();
- if ( pdID.isValid() ) {
-
- // Vector of SmartIDs
- const auto& rawIDs = PD.smartIDs();
-
- // Do we have any hits
- if ( !rawIDs.empty() ) {
-
- // loop over hits
- for ( const auto id : rawIDs ) {
-
- ++nHits;
- ++nHitsSide;
-
- if ( m_enableOfflinePlots ) {
- const auto& anodeData = pdmdbMaps.anodeData( id );
- const auto& tel40Data = tel40Maps.tel40Data( id, anodeData.pdmdb, anodeData.frame );
- // FixMe : Another horrid set of magic numbers that require documentation
- const auto bitID =
- 1e5 * static_cast<int>( id.panel() ) +
- 100 * ( 24 * ( tel40Data.sourceID.data() & 0x3F ) + tel40Data.connector.data() ) +
- anodeData.bit.data();
- ++hb_SlotIDVsBitID[rich][{ bitID, slotID }];
- ++hb_BunchIDVsBitID[rich][{ bitID, bunchID }];
- }
-
- if ( m_fillVerbosePMTPlots ) {
- ++( getPMTHitsPlot( id )[{ thDAC_ID, id.anodeIndex() }] );
- ++( getPMTPlot( id )[{ id.ecLocalPMTFrameX(), id.ecLocalPMTFrameY() }] );
- }
-
- const auto iGlobalX = id.ecGlobalPMTFrameX() - id.panel() * 220;
- const auto iGlobalX2 = id.ecGlobalPMTFrameX2() - id.panel() * 220;
- const auto iGlobalY = id.ecGlobalPMTFrameY();
- if ( id.isHTypePMT() ) {
- // For large H type PMTs fill a group of 4 corresponding to the effective smaller pixels
- for ( int i = 0; i < 2; ++i ) {
- for ( int j = 0; j < 2; ++j ) {
- ++hb_pixelMap[rich][{ iGlobalX + i, iGlobalY + j }];
- ++hb_pixelMap2[rich][{ iGlobalX2 + i, iGlobalY + j }];
- }
- }
- } else {
- if ( Rich::Rich1 == rich ) {
- // FixMe : These horrid conversions again (also in BX type monitor)
- if ( 0 == side ) {
- auto convertX = []( const auto x ) { return ( -1 * ( x + 3 - 89 - 21 ) ) + 89 + 21; };
- auto convertY = []( const auto y ) { return -( y + 1 ); };
- ++hb_pixelMap[rich][{ convertY( iGlobalY ), convertX( iGlobalX ) }];
- ++hb_pixelMap2[rich][{ convertY( iGlobalY ), convertX( iGlobalX2 ) }];
- } else {
- auto convertX = []( const auto x ) { return x + 3; };
- auto convertY = []( const auto y ) { return y + 1; };
- ++hb_pixelMap[rich][{ convertY( iGlobalY ), convertX( iGlobalX ) }];
- ++hb_pixelMap2[rich][{ convertY( iGlobalY ), convertX( iGlobalX2 ) }];
- }
- } else {
- auto convertX = []( const auto x ) { return x + 1; };
- auto convertY = []( const auto y ) { return y; };
- ++hb_pixelMap[rich][{ convertX( iGlobalX ), convertY( iGlobalY ) }];
- ++hb_pixelMap2[rich][{ convertX( iGlobalX2 ), convertY( iGlobalY ) }];
- }
- }
-
- if ( m_fillSpacePlots ) {
- // get the spatial coordiates
- const auto gPos = smartIDsHelper.globalPosition( id );
- // info() << "ID " << id << endmsg;
- // info() << "gPos " << gPos << endmsg;
- const auto lPos = smartIDsHelper.globalToPDPanel( gPos );
- // info() << "lPos " << lPos << endmsg;
- ++hb_hitMaps[rich][{ lPos.x(), lPos.y() }];
- }
-
- } // hit loop
-
- } // PD has hits
-
- } // PDID is valid
-
- } // PDs
- } // modules
- if ( m_fillVerbosePMTPlots ) { ++h_nHits_side[rich][side][nHitsSide]; }
- } // panels
- ++h_NHitsVsSlotID[rich][{ slotID, nHits }];
- ++h_NHitsVsBunchID[rich][{ bunchID, nHits }];
- // if ( m_enableOfflinePlots ) { ++h_NHitsVsBunchID[rich][{ bunchID, nHits }]; }
- ++h_nHits[rich][nHits];
- } // RICHes
- }
- };
-
- // Declaration of the Algorithm Factory
- DECLARE_COMPONENT( HitMaps )
-
-} // namespace Rich::Future::Mon
--
GitLab