Merge pull request #41517 from mmusich/use_online_metadata_in_AlCaHOC…

…alibProducer [13.1.X] use `onlineMetaDataDigis` when available for retrieval of average PU in `AlCaHOCalibProducer`
cms-sw · May 5, 2023 · 0447b06 · 0447b06
2 parents 97925d2 + 5bd611f
commit 0447b06
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc
@@ -92,6 +92,7 @@ Ring 0 L0 : Width Tray 6:266.6, 5&4:325.6, 3:330.6, 2:341.6, 1:272.6
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/GeometrySurface/interface/PlaneBuilder.h"
 #include "DataFormats/Luminosity/interface/LumiDetails.h"
+#include "DataFormats/OnlineMetaData/interface/OnlineLuminosityRecord.h"
 #include "DataFormats/Math/interface/Error.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/RecoCandidate/interface/IsoDeposit.h"
@@ -199,6 +200,7 @@ class AlCaHOCalibProducer : public edm::one::EDProducer<edm::one::SharedResource
   edm::EDGetTokenT<reco::VertexCollection> tok_vertex_;
   //  edm::EDGetTokenT<LumiDetails> tok_lumi_;
   edm::EDGetTokenT<LumiScalersCollection> tok_lumi_;
+  edm::EDGetTokenT<OnlineLuminosityRecord> tok_metaData_;
 
   edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
   edm::EDGetTokenT<HORecHitCollection> tok_ho_;
@@ -257,6 +259,7 @@ AlCaHOCalibProducer::AlCaHOCalibProducer(const edm::ParameterSet& iConfig) {
   tok_vertex_ = consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("vertexTags"));
   //  tok_lumi_ = consumes<LumiDetails ,edm::InLumi>(iConfig.getParameter<edm::InputTag>("lumiTags"));
   tok_lumi_ = consumes<LumiScalersCollection>(iConfig.getParameter<edm::InputTag>("lumiTags"));
+  tok_metaData_ = consumes<OnlineLuminosityRecord>(iConfig.getParameter<edm::InputTag>("metadata"));
   tok_ho_ = consumes<HORecHitCollection>(iConfig.getParameter<edm::InputTag>("hoInput"));
   tok_hbhe_ = consumes<HBHERecHitCollection>(iConfig.getParameter<edm::InputTag>("hbheInput"));
   tok_tower_ = consumes<CaloTowerCollection>(iConfig.getParameter<edm::InputTag>("towerInput"));
@@ -301,6 +304,7 @@ void AlCaHOCalibProducer::fillDescriptions(edm::ConfigurationDescriptions& descr
   desc.addUntracked<edm::InputTag>("muons", edm::InputTag("muons"));
   desc.add<edm::InputTag>("vertexTags", edm::InputTag("offlinePrimaryVertices"));
   desc.add<edm::InputTag>("lumiTags", edm::InputTag("scalersRawToDigi"));
+  desc.add<edm::InputTag>("metadata", edm::InputTag("onlineMetaDataDigis"));
   descriptions.add("alcaHOCalibProducer", desc);
 }
 
@@ -343,13 +347,17 @@ void AlCaHOCalibProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
       tmpHOCalib.inslumi = 0.;
 
       auto const& lumiScale = iEvent.getHandle(tok_lumi_);
+      auto const& metaData = iEvent.getHandle(tok_metaData_);
 
-      if (lumiScale.isValid()) {
-        if (lumiScale->empty()) {
-          edm::LogError("HOCalib") << "lumiScale collection is empty";
-        } else {
+      // by default use Run-3 access (onlineMetaDataDigis)
+      if (metaData.isValid()) {
+        tmpHOCalib.inslumi = metaData->avgPileUp();
+      } else if (lumiScale.isValid() && !lumiScale->empty()) {
+        if (lumiScale->begin() != lumiScale->end()) {
           tmpHOCalib.inslumi = lumiScale->begin()->pileup();
         }
+      } else {
+        edm::LogWarning("HOCalib") << "Neither LumiScalers nor OnlineMetadata collections found in the event";
       }
     }
   }

diff --git a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -13,6 +13,7 @@
 <use name="DataFormats/HcalRecHit"/>
 <use name="DataFormats/JetReco"/>
 <use name="DataFormats/Luminosity"/>
+<use name="DataFormats/OnlineMetaData"/>
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/Scalers"/>