Fixes to Scouting Calo RecHits DataFormats and producer (PR review)

Author: elfontan

DataFormats/Scouting/interface/Run3ScoutingEBRecHit.h

@@ -5,10 +5,8 @@
 #include <stdint.h>
 
 // Updated Run 3 HLT-Scouting data format to include calo recHits information:
-// - EBRecHits collection (ECAL Barrel);
-// - EERecHits collection (ECAL Endcap);
-// - HBHERecHits collection (HCAL Barrel and Endcap).
-// Saved information is specific to each hit type: energy, time, flags, and detId are available for EB recHits.
+// - EBRecHits collection (ECAL Barrel)
+// Saved information is specific to each hit type: energy, time, flags, and detId are available for EB recHits
 //
 // IMPORTANT: any changes to Run3ScoutingEBRecHit must be backward-compatible!
 
@@ -29,6 +27,7 @@ class Run3ScoutingEBRecHit {
   float time_;
   unsigned int detId_;
   uint32_t flags_;
+  // NOTE: types are kept the same as in the origin of the data in reco::PFRecHit
 };
 
 using Run3ScoutingEBRecHitCollection = std::vector<Run3ScoutingEBRecHit>;

DataFormats/Scouting/interface/Run3ScoutingEERecHit.h

@@ -4,10 +4,8 @@
 #include <vector>
 
 // Updated Run 3 HLT-Scouting data format to include calo recHits information:
-// - EERecHits collection (ECAL Endcap);
-// - EBRecHits collection (ECAL Barrel);
-// - HBHERecHits collection (HCAL Barrel and Endcap).
-// Saved information is specific to each hit type: energy, time, and detId are available for EE recHits.
+// - EERecHits collection (ECAL Endcap)
+// Saved information is specific to each hit type: energy, time, and detId are available for EE recHits
 //
 // IMPORTANT: any changes to Run3ScoutingEERecHit must be backward-compatible !
 

DataFormats/Scouting/interface/Run3ScoutingHBHERecHit.h

@@ -4,10 +4,8 @@
 #include <vector>
 
 // Updated Run 3 HLT-Scouting data format to include calo recHits information:
-// - HBHERecHits collection (HCAL Barrel and Endcap);
-// - EBRecHits collection (ECAL Barrel);
-// - EERecHits collection (ECAL Endcap).
-// Saved information is specific to each hit type: energy and detId are available for HCAL recHits.
+// - HBHERecHits collection (HCAL Barrel and Endcap)
+// Saved information is specific to each hit type: energy and detId are available for HCAL recHits
 //
 // -- IMPORTANT: any changes to Run3ScoutingHBHERecHit must be backward-compatible!
 

HLTrigger/special/plugins/HLTScoutingRecHitProducer.cc

@@ -28,19 +28,19 @@ class HLTScoutingRecHitProducer : public edm::global::EDProducer<> {
                           const reco::PFRecHitCollection& inputRecHits,
                           double minEnergyEB,
                           double minEnergyEE,
-                          int mantrissaPrecision,
-                          const std::string tag = "");
+                          int mantissaPrecision,
+                          const std::string& tag = "");
   static void produceHcal(edm::Event& iEvent,
                           const reco::PFRecHitCollection& inputRecHits,
                           double minEnergyHBHE,
-                          int mantrissaPrecision,
-                          const std::string tag = "");
+                          int mantissaPrecision,
+                          const std::string& tag = "");
 
   template <typename T>
   void setToken(edm::EDGetTokenT<T>& token, const edm::ParameterSet& iConfig, std::string name) {
     const auto inputTag = iConfig.getParameter<edm::InputTag>(name);
     if (!inputTag.encode().empty()) {
-      token = consumes(iConfig.getParameter<edm::InputTag>(name));
+      token = consumes(inputTag);
     }
   }
 
@@ -79,7 +79,7 @@ void HLTScoutingRecHitProducer::produceEcal(edm::Event& iEvent,
                                             double minEnergyEB,
                                             double minEnergyEE,
                                             int mantissaPrecision,
-                                            const std::string tag) {
+                                            const std::string& tag) {
   auto run3ScoutEBRecHits = std::make_unique<Run3ScoutingEBRecHitCollection>();
   run3ScoutEBRecHits->reserve(inputRecHits.size());
 
@@ -119,7 +119,7 @@ void HLTScoutingRecHitProducer::produceHcal(edm::Event& iEvent,
                                             const reco::PFRecHitCollection& inputRecHits,
                                             double minEnergyHBHE,
                                             int mantissaPrecision,
-                                            const std::string tag) {
+                                            const std::string& tag) {
   auto run3ScoutHBHERecHits = std::make_unique<Run3ScoutingHBHERecHitCollection>();
   run3ScoutHBHERecHits->reserve(inputRecHits.size());