Code check

malbouis · Sep 5, 2021 · c81ed0a · c81ed0a
1 parent e487015
commit c81ed0a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h b/SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h
@@ -39,14 +39,18 @@ class HcalSignalGenerator : public HcalBaseSignalGenerator {
 
   ~HcalSignalGenerator() override {}
 
-  void initializeEvent(const edm::Event* event, const edm::EventSetup* eventSetup, const edm::ESGetToken<HcalDbService, HcalDbRecord>& tok) {
+  void initializeEvent(const edm::Event* event,
+                       const edm::EventSetup* eventSetup,
+                       const edm::ESGetToken<HcalDbService, HcalDbRecord>& tok) {
     theEvent = event;
     theConditions = &(eventSetup->getData(tok));
     theParameterMap->setDbService(theConditions);
   }
 
   /// some users use EventPrincipals, not Events.  We support both
-  void initializeEvent(const edm::EventPrincipal* eventPrincipal, const edm::EventSetup* eventSetup, const edm::ESGetToken<HcalDbService, HcalDbRecord>& tok) {
+  void initializeEvent(const edm::EventPrincipal* eventPrincipal,
+                       const edm::EventSetup* eventSetup,
+                       const edm::ESGetToken<HcalDbService, HcalDbRecord>& tok) {
     theEventPrincipal = eventPrincipal;
     theConditions = &(eventSetup->getData(tok));
     theParameterMap->setDbService(theConditions);

diff --git a/SimCalorimetry/HcalSimAlgos/test/CaloSamplesAnalyzer.cc b/SimCalorimetry/HcalSimAlgos/test/CaloSamplesAnalyzer.cc
@@ -94,7 +94,7 @@ class CaloSamplesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResource
   edm::EDGetTokenT<std::vector<CaloSamples>> tok_calo;
   edm::ESGetToken<CaloGeometry, CaloGeometryRecord> tokGeom_;
   edm::ESGetToken<HcalDDDRecConstants, HcalRecNumberingRecord> tokRecCns_;
-  edm::ESGetToken<HcalDbService,HcalDbRecord> tokDB_;
+  edm::ESGetToken<HcalDbService, HcalDbRecord> tokDB_;
 };
 
 //
@@ -111,8 +111,8 @@ CaloSamplesAnalyzer::CaloSamplesAnalyzer(const edm::ParameterSet& iConfig)
           edm::InputTag(iConfig.getParameter<std::string>("hitsProducer"), "HcalHits"))),
       tok_calo(consumes<std::vector<CaloSamples>>(iConfig.getParameter<edm::InputTag>("CaloSamplesTag"))),
       tokGeom_(esConsumes<CaloGeometry, CaloGeometryRecord, edm::Transition::BeginRun>()),
-  tokRecCns_(esConsumes<HcalDDDRecConstants, HcalRecNumberingRecord, edm::Transition::BeginRun>()),
-  tokDB_(esConsumes<HcalDbService,HcalDbRecord>()) {
+      tokRecCns_(esConsumes<HcalDDDRecConstants, HcalRecNumberingRecord, edm::Transition::BeginRun>()),
+      tokDB_(esConsumes<HcalDbService, HcalDbRecord>()) {
   usesResource("TFileService");
 }
 

diff --git a/SimCalorimetry/HcalSimAlgos/test/HcalDigitizerTest.cc b/SimCalorimetry/HcalSimAlgos/test/HcalDigitizerTest.cc
@@ -66,9 +66,9 @@ class HcalDigitizerTest : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   const HcalTimeSlew* hcalTimeSlew_delay_;
 };
 
-HcalDigitizerTest::HcalDigitizerTest(const edm::ParameterSet& iConfig) :
-  tok_htopo_(esConsumes<HcalTopology, HcalRecNumberingRecord>()),
-  tok_slew_(esConsumes<HcalTimeSlew, HcalTimeSlewRecord>(edm::ESInputTag("", "HBHE"))) {
+HcalDigitizerTest::HcalDigitizerTest(const edm::ParameterSet& iConfig)
+    : tok_htopo_(esConsumes<HcalTopology, HcalRecNumberingRecord>()),
+      tok_slew_(esConsumes<HcalTimeSlew, HcalTimeSlewRecord>(edm::ESInputTag("", "HBHE"))) {
   //DB helper preparation
   dbHardcode.setHB(HcalHardcodeParameters(iConfig.getParameter<edm::ParameterSet>("hb")));
   dbHardcode.setHE(HcalHardcodeParameters(iConfig.getParameter<edm::ParameterSet>("he")));

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
@@ -16,7 +16,9 @@
 using namespace std;
 namespace edm {
   // Constructor
-  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC, const edm::ESGetToken<HcalDbService, HcalDbRecord>& tok)
+  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps,
+                                                             edm::ConsumesCollector &&iC,
+                                                             const edm::ESGetToken<HcalDbService, HcalDbRecord> &tok)
       : HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
         HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
         HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
@@ -43,7 +43,9 @@ namespace edm {
   class DataMixingHcalDigiWorkerProd {
   public:
     /** standard constructor*/
-    explicit DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC, const edm::ESGetToken<HcalDbService, HcalDbRecord>&);
+    explicit DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps,
+                                          edm::ConsumesCollector &&iC,
+                                          const edm::ESGetToken<HcalDbService, HcalDbRecord> &);
 
     /**Default destructor*/
     virtual ~DataMixingHcalDigiWorkerProd();