Squashed commit of the following:

commit b5a0681d
Author: Titus Mombaecher <titus.mombacher@cern.ch>
Date:   Mon Oct 9 17:10:36 2023 +0200

    Squashed commit of the following:

    commit c543fad2b9955be0c259a1358b51789bc9546cb2
    Author: Gitlab CI <noreply@cern.ch>
    Date:   Mon Oct 9 14:25:54 2023 +0000

        Fixed formatting

        patch generated by https://gitlab.cern.ch/lhcb/Rec/-/jobs/33035907

    commit 1ede6611
    Author: Titus Mombaecher <titus.mombacher@cern.ch>
    Date:   Mon Oct 9 15:53:11 2023 +0200

        add some more correlation histograms and adapt ranges after first PbPb data

commit 1632f0d2
Merge: 83a6aba6 df318559
Author: Titus Mombaecher <titus.mombacher@cern.ch>
Date:   Mon Oct 9 15:48:21 2023 +0200

    Merge branch 'master' of https://gitlab.cern.ch:8443/lhcb/Rec

commit 83a6aba6
Merge: 45847dbc f692608a
Author: Titus Mombaecher <titus.mombacher@cern.ch>
Date:   Thu Oct 5 13:40:15 2023 +0200

    Merge branch 'master' of https://gitlab.cern.ch:8443/lhcb/Rec

commit 45847dbc
Author: Titus Mombaecher <titus.mombacher@cern.ch>
Date:   Wed Sep 27 09:02:46 2023 +0200

    the fix or the wrong naming got lost in earlier merge

commit 2fe14ce6
Author: Andre Gunther <p.gunther@cern.ch>
Date:   Sat Sep 23 18:41:19 2023 +0200

    Redefine ranges for monitoring plots for IFT

Tr/TrackMonitors/src/MonitorDetectorCorrelations.cpp

@@ -31,7 +31,7 @@ private:
       this,
       "VeloScifiHitsCorrelation",
       "VeloScifiHitsCorrelation",
-      {{100, 0, 6000, "Velo Hits"}, {100, 0, 10000, "ScifiHits"}}};
+      {{100, 0, 36000, "Velo Hits"}, {100, 0, 35000, "ScifiHits"}}};
 };
 
 DECLARE_COMPONENT( MonitorDetectorCorrelationsVeloSciFi )
@@ -39,16 +39,17 @@ DECLARE_COMPONENT( MonitorDetectorCorrelationsVeloSciFi )
 class MonitorDetectorCorrelations : public LHCb::Algorithm::Consumer<void(
                                         LHCb::Pr::VP::Hits const&, LHCb::Pr::FT::Hits const&, MuonHitContainer const&,
                                         LHCb::Event::Calo::v2::Clusters const&, LHCb::Event::Calo::Digits const&,
-                                        Rich::Future::DAQ::DecodedData const& )> {
+                                        LHCb::Event::Calo::Digits const&, Rich::Future::DAQ::DecodedData const& )> {
 public:
   MonitorDetectorCorrelations( const std::string& name, ISvcLocator* pSvcLocator )
       : Consumer( name, pSvcLocator,
                   {KeyValue{"VeloHits", ""}, KeyValue{"SciFiHits", ""}, KeyValue{"MuonHits", ""},
-                   KeyValue{"ECALClusters", ""}, KeyValue{"HCALDigits", ""}, KeyValue{"RichPixels", ""}} ) {}
+                   KeyValue{"ECALClusters", ""}, KeyValue{"ECALDigits", ""}, KeyValue{"HCALDigits", ""},
+                   KeyValue{"RichPixels", ""}} ) {}
 
   void operator()( LHCb::Pr::VP::Hits const& velo_hits, LHCb::Pr::FT::Hits const& scifi_hits,
                    MuonHitContainer const& muon_hits, LHCb::Event::Calo::v2::Clusters const& calo_clusters,
-                   LHCb::Event::Calo::Digits const&      hcal_digits,
+                   LHCb::Event::Calo::Digits const& ecal_digits, LHCb::Event::Calo::Digits const& hcal_digits,
                    Rich::Future::DAQ::DecodedData const& rich_hits ) const override {
 
     ++m_velo_scifi_hits_correlation[{velo_hits.size(), scifi_hits.size()}];
@@ -66,10 +67,15 @@ public:
       if ( digit.adc() > m_MinADCHCAL ) { hcal_adc_abovethreshold += digit.adc(); }
     }
 
+    const auto ecaltot = std::accumulate( ecal_digits.begin(), ecal_digits.end(), 0.,
+                                          []( auto init, const auto& digit ) { return init + digit.energy(); } );
+
     ++m_velo_muon_hits_correlation[{velo_hits.size(), n_muon_hits}];
     ++m_scifi_muon_hits_correlation[{scifi_hits.size(), n_muon_hits}];
-    ++m_scifi_hits_ECAL_clusters_correlation[{scifi_hits.size(), nClusters}];
+    ++m_scifi_hits_ECAL_energy_correlation[{scifi_hits.size(), ecaltot}];
     ++m_scifi_hits_HCAL_energy_correlation[{scifi_hits.size(), hcal_adc_abovethreshold}];
+    ++m_ECAL_energy_HCAL_energy_correlation[{ecaltot, hcal_adc_abovethreshold}];
+    ++m_ECAL_energy_ECAL_clusters_correlation[{ecaltot, nClusters}];
     ++m_velo_rich1_hits_correlation[{velo_hits.size(), rich_hits.nTotalHits( Rich::Rich1 )}];
     ++m_scifi_rich1_hits_correlation[{scifi_hits.size(), rich_hits.nTotalHits( Rich::Rich1 )}];
     ++m_scifi_rich2_hits_correlation[{scifi_hits.size(), rich_hits.nTotalHits( Rich::Rich1 )}];
@@ -80,42 +86,52 @@ private:
       this,
       "VeloScifiHitsCorrelation",
       "VeloScifiHitsCorrelation",
-      {{200, 0, 3000, "Velo Hits"}, {200, 0, 10000, "ScifiHits"}}};
+      {{400, 0, 36000, "Velo Hits"}, {400, 0, 35000, "ScifiHits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_velo_muon_hits_correlation{
       this,
       "VeloMuonHitsCorrelation",
       "VeloMuonHitsCorrelation",
-      {{200, 0, 3000, "Velo Hits"}, {200, 0, 1000, "MuonHits"}}};
+      {{400, 0, 36000, "Velo Hits"}, {400, 0, 18000, "MuonHits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_scifi_muon_hits_correlation{
       this,
       "ScifiMuonHitsCorrelation",
       "ScifiMuonHitsCorrelation",
-      {{200, 0, 10000, "SciFi Hits"}, {200, 0, 1000, "MuonHits"}}};
-  mutable Gaudi::Accumulators::Histogram<2> m_scifi_hits_ECAL_clusters_correlation{
+      {{400, 0, 35000, "SciFi Hits"}, {400, 0, 18000, "MuonHits"}}};
+  mutable Gaudi::Accumulators::Histogram<2> m_scifi_hits_ECAL_energy_correlation{
       this,
       "ScifiECALCorrelation",
       "ScifiECALCorrelation",
-      {{200, 0, 10000, "SciFi Hits"}, {200, 0, 600, "ECAL Clusters"}}};
+      {{400, 0, 35000, "SciFi Hits"}, {400, 0, 60000000, "ECAL energy"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_scifi_hits_HCAL_energy_correlation{
       this,
       "ScifiHCALCorrelation",
       "ScifiHCALCorrelation",
-      {{200, 0, 10000, "SciFi Hits"}, {200, 0, 20000, "Total HCAL ADC counts"}}};
+      {{400, 0, 35000, "SciFi Hits"}, {400, 0, 480000, "Total HCAL ADC counts"}}};
+  mutable Gaudi::Accumulators::Histogram<2> m_ECAL_energy_HCAL_energy_correlation{
+      this,
+      "ECALHCALCorrelation",
+      "ECALHCALCorrelation",
+      {{400, 0, 60000000, "ECAL energy"}, {400, 0, 480000, "Total HCAL ADC counts"}}};
+  mutable Gaudi::Accumulators::Histogram<2> m_ECAL_energy_ECAL_clusters_correlation{
+      this,
+      "ECALECALCorrelation",
+      "ECALECALCorrelation",
+      {{400, 0, 60000000, "ECAL energy"}, {400, 0, 700, "ECAL Clusters"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_scifi_rich1_hits_correlation{
       this,
       "ScifiRICH1HitsCorrelation",
       "ScifiRICH1HitsCorrelation",
-      {{200, 0, 10000, "SciFi Hits"}, {200, 0, 10000, "RICH1 Hits"}}};
+      {{400, 0, 35000, "SciFi Hits"}, {400, 0, 80000, "RICH1 Hits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_velo_rich1_hits_correlation{
       this,
       "VeloRICH1HitsCorrelation",
       "VeloRICH1HitsCorrelation",
-      {{200, 0, 3000, "Velo Hits"}, {200, 0, 10000, "RICH1 Hits"}}};
+      {{400, 0, 36000, "Velo Hits"}, {400, 0, 80000, "RICH1 Hits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_scifi_rich2_hits_correlation{
       this,
       "ScifiRICH2HitsCorrelation",
       "ScifiRICH2HitsCorrelation",
-      {{200, 0, 10000, "SciFi Hits"}, {200, 0, 8000, "RICH2 Hits"}}};
+      {{400, 0, 35000, "SciFi Hits"}, {400, 0, 65000, "RICH2 Hits"}}};
 
   Gaudi::Property<int>   m_MinADCHCAL{this, "MinADCHCAL", 10}; // Minimum ADC threshold to have some zero suppression
   Gaudi::Property<float> m_MinEECAL{this, "MinEECAL",

Tr/TrackMonitors/src/MonitorECALEnergyHitsCorrelations.cpp

@@ -68,12 +68,12 @@ public:
       this,
       "ECALVeloHitsCorrelation",
       "ECALVeloHitsCorrelation",
-      {{200, 0, 60000000, "ECAL energy"}, {200, 0, 15000, "VeloHits"}}};
+      {{300, 0, 60000000, "ECAL energy"}, {300, 0, 36000, "VeloHits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_ecaltot_scifi_hits_correlation{
       this,
       "ECALScifiHitsCorrelation",
       "ECALScifiHitsCorrelation",
-      {{200, 0, 60000000, "ECAL energy"}, {200, 0, 35000, "ScifiHits"}}};
+      {{300, 0, 60000000, "ECAL energy"}, {300, 0, 35000, "ScifiHits"}}};
 };
 
 DECLARE_COMPONENT( MonitorECALEnergyTrackerHitsCorrelations )
@@ -104,12 +104,12 @@ public:
       this,
       "ECALRich1HitsCorrelation",
       "ECALRich1HitsCorrelation",
-      {{200, 0, 60000000, "ECAL energy"}, {200, 0, 90000, "Rich1Hits"}}};
+      {{300, 0, 60000000, "ECAL energy"}, {300, 0, 80000, "Rich1Hits"}}};
   mutable Gaudi::Accumulators::Histogram<2> m_ecaltot_rich2_hits_correlation{
       this,
       "ECALRich2HitsCorrelation",
       "ECALRich2HitsCorrelation",
-      {{200, 0, 60000000, "ECAL energy"}, {200, 0, 60000, "Rich2Hits"}}};
+      {{300, 0, 60000000, "ECAL energy"}, {300, 0, 65000, "Rich2Hits"}}};
 };
 
 DECLARE_COMPONENT( MonitorECALEnergyRichHitsCorrelations )