Merge pull request #23743 from guitargeek/RecoEgamma_CodeQuality

Tackled majority of RecoEgamma code quality issues
cms-sw · Jul 27, 2018 · 5bfa1f7 · 5bfa1f7
2 parents 0a5582e + 8755bb3
commit 5bfa1f7
Show file tree

Hide file tree

Showing 88 changed files with 478 additions and 969 deletions.
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronSeedProducer.h
@@ -2,7 +2,7 @@
 #define SiStripElectronSeedProducer_h
 
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -12,7 +12,7 @@
 
 class SiStripElectronSeedGenerator;
 
-class SiStripElectronSeedProducer : public edm::EDProducer
+class SiStripElectronSeedProducer : public edm::stream::EDProducer<>
 {
  public:
 

diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.cc
@@ -25,7 +25,6 @@ HFRecoEcalCandidateAlgo::HFRecoEcalCandidateAlgo(bool correct,double e9e25Cut,do
 						 const std::vector<double>& eSeLCut,
 						 const reco::HFValueStruct hfvv				
 ) :
-
   m_correct(correct), 
   m_e9e25Cut(e9e25Cut),
   m_intercept2DCut(intercept2DCut),
@@ -39,10 +38,9 @@ HFRecoEcalCandidateAlgo::HFRecoEcalCandidateAlgo(bool correct,double e9e25Cut,do
   m_era(4), 
   m_hfvv(hfvv)
 {
-
 }
 
-RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster& original , const HFEMClusterShape& shape,int nvtx) {
+RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster& original , const HFEMClusterShape& shape,int nvtx) const {
  double corEta=original.eta();
   //piece-wise log energy correction to eta
   double logel=log(shape.eLong3x3()/100.0);
@@ -108,7 +106,7 @@ RecoEcalCandidate HFRecoEcalCandidateAlgo::correctEPosition(const SuperCluster&
 void HFRecoEcalCandidateAlgo::produce(const edm::Handle<SuperClusterCollection>& SuperClusters,
 				      const HFEMClusterShapeAssociationCollection& AssocShapes,
 				      RecoEcalCandidateCollection& RecoECand,
-				      int nvtx) {
+				      int nvtx) const {
 
 
 

diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h b/RecoEgamma/EgammaHFProducers/plugins/HFRecoEcalCandidateAlgo.h
@@ -35,24 +35,24 @@ class HFRecoEcalCandidateAlgo {
   void produce(const edm::Handle<reco::SuperClusterCollection>& SuperClusters,
 	       const reco::HFEMClusterShapeAssociationCollection& AssocShapes,
 	       reco::RecoEcalCandidateCollection& RecoECand,
-	       int nvtx);
+	       int nvtx) const;
 
 
  private:
-  reco::RecoEcalCandidate correctEPosition(const reco::SuperCluster& original, const reco::HFEMClusterShape& shape, int nvtx);
-  bool m_correct;
-  double m_e9e25Cut;
-  double m_intercept2DCut;
-  double m_intercept2DSlope;
-  double m_e1e9Cuthi;
-  double m_eCOREe9Cuthi;
-  double m_eSeLCuthi;
-  double m_e1e9Cutlo;
-  double m_eCOREe9Cutlo;
-  double m_eSeLCutlo;
-  int m_era;
-  bool m_correctForPileup;
-  reco::HFValueStruct m_hfvv;
+  reco::RecoEcalCandidate correctEPosition(const reco::SuperCluster& original, const reco::HFEMClusterShape& shape, int nvtx) const;
+
+  const bool m_correct;
+  const double m_e9e25Cut;
+  const double m_intercept2DCut;
+  const double m_intercept2DSlope;
+  const double m_e1e9Cuthi;
+  const double m_eCOREe9Cuthi;
+  const double m_eSeLCuthi;
+  const double m_e1e9Cutlo;
+  const double m_eCOREe9Cutlo;
+  const double m_eSeLCutlo;
+  const int m_era;
+  const reco::HFValueStruct m_hfvv;
 
 };
 

diff --git a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.cc
@@ -49,7 +49,7 @@ HLTHFRecoEcalCandidateProducer::HLTHFRecoEcalCandidateProducer(edm::ParameterSet
 
 } 
 
-void HLTHFRecoEcalCandidateProducer::produce(edm::Event & e, edm::EventSetup const& iSetup) {  
+void HLTHFRecoEcalCandidateProducer::produce(edm::StreamID sid, edm::Event & e, edm::EventSetup const& iSetup) const {  
 
 
   edm::Handle<reco::SuperClusterCollection> super_clus;

diff --git a/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h b/RecoEgamma/EgammaHFProducers/plugins/HLTHFRecoEcalCandidateProducer.h
@@ -13,27 +13,26 @@
 //
 //
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "HFRecoEcalCandidateAlgo.h"
 #include "HFValueStruct.h"
 
-class HLTHFRecoEcalCandidateProducer : public edm::EDProducer {
+class HLTHFRecoEcalCandidateProducer : public edm::global::EDProducer<> {
  public:
   explicit HLTHFRecoEcalCandidateProducer(edm::ParameterSet const& conf);
-  void produce(edm::Event& e, edm::EventSetup const& iSetup) override;
+  void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
  private:
-  edm::InputTag hfclusters_,vertices_;
-  int HFDBversion_;
-  std::vector<double> HFDBvector_;
-  bool doPU_; 
-  double Cut2D_;
-  double defaultSlope2D_;
-  reco::HFValueStruct hfvars_;
-  HFRecoEcalCandidateAlgo algo_;
+  const edm::InputTag hfclusters_,vertices_;
+  const int HFDBversion_;
+  const std::vector<double> HFDBvector_;
+  const double Cut2D_;
+  const double defaultSlope2D_;
+  const reco::HFValueStruct hfvars_;
+  const HFRecoEcalCandidateAlgo algo_;
 };
 
 #endif
diff --git a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTEcalIsolation.h
@@ -42,12 +42,12 @@ class EgammaHLTEcalIsolation
 
   float isolPtSum(const reco::RecoCandidate *recocandidate, 
 		  const std::vector<const reco::SuperCluster*>& sclusters,
-		  const std::vector<const reco::BasicCluster*>& bclusters);
+		  const std::vector<const reco::BasicCluster*>& bclusters) const;
 
   /// Get Et cut for ecal hits
-  float getetMin() { return etMin; }
+  float getetMin() const { return etMin; }
   /// Get isolation cone size. 
-  float getConeSize() { return conesize; }
+  float getConeSize() const { return conesize; }
 
  private:
 

diff --git a/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h b/RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTHcalIsolationDoubleCone.h
@@ -50,23 +50,23 @@ class EgammaHLTHcalIsolationDoubleCone
     }
 
 
-  float isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry);
+  float isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry) const;
 
 
   /// Get pt cut for hcal hits
-  float getptMin() { return ptMin; }
+  float getptMin() const { return ptMin; }
   /// Get isolation cone size. 
-  float getConeSize() { return conesize; }
+  float getConeSize() const { return conesize; }
   /// Get exclusion region
-  float getExclusion() { return exclusion; }
+  float getExclusion() const { return exclusion; }
 
  private:
 
   // ---------- member data --------------------------------
    // Parameters of isolation cone geometry. 
-  float ptMin;
-  float conesize;
-  float exclusion;
+  const float ptMin;
+  const float conesize;
+  const float exclusion;
 
 };
 

diff --git a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTEcalIsolation.cc
@@ -21,7 +21,7 @@
 
 float EgammaHLTEcalIsolation::isolPtSum(const reco::RecoCandidate* recocandidate, 
 					const std::vector<const reco::SuperCluster*>& sclusters,
-					const std::vector<const reco::BasicCluster*>& bclusters){
+					const std::vector<const reco::BasicCluster*>& bclusters) const {
 
   float ecalIsol=0.;
 

diff --git a/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc b/RecoEgamma/EgammaHLTAlgos/src/EgammaHLTHcalIsolationDoubleCone.cc
@@ -21,7 +21,7 @@
 
 
 
-float EgammaHLTHcalIsolationDoubleCone::isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry){
+float EgammaHLTHcalIsolationDoubleCone::isolPtSum(const reco::RecoCandidate* recocandidate, const HBHERecHitCollection* hbhe, const HFRecHitCollection* hf, const CaloGeometry* geometry) const {
 
   float hcalIsol=0.;
 

diff --git a/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h b/RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h
@@ -6,7 +6,7 @@
 
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/stream/EDProducer.h>
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 
@@ -28,14 +28,12 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class ESListOfFEDSProducer : public edm::EDProducer {
+class ESListOfFEDSProducer : public edm::stream::EDProducer<> {
 
 public:
 	ESListOfFEDSProducer(const edm::ParameterSet& pset);
 	~ESListOfFEDSProducer() override;
 	void produce(edm::Event & e, const edm::EventSetup& c) override;
-	void beginJob(void) override;
-	void endJob(void) override;
 	void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
 	void Muon(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
 	void Jets(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);

diff --git a/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h b/RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h
@@ -2,7 +2,7 @@
 #define EventFilter_ESRecHitsMerger_H
 
 #include <FWCore/Framework/interface/MakerMacros.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/global/EDProducer.h>
 
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
@@ -18,12 +18,12 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class ESRecHitsMerger : public edm::EDProducer {
+class ESRecHitsMerger : public edm::global::EDProducer<> {
 
 public:
 	ESRecHitsMerger(const edm::ParameterSet& pset);
 	~ESRecHitsMerger() override;
-	void produce(edm::Event & e, const edm::EventSetup& c) override;
+	void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override;
 	void beginJob(void) override;
 	void endJob(void) override;
 	static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

diff --git a/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h
@@ -6,7 +6,7 @@
 
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/stream/EDProducer.h>
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 
@@ -27,14 +27,13 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class EcalListOfFEDSProducer : public edm::EDProducer {
+class EcalListOfFEDSProducer : public edm::stream::EDProducer<> {
 
  public:
   EcalListOfFEDSProducer(const edm::ParameterSet& pset);
   ~EcalListOfFEDSProducer() override;
   void produce(edm::Event & e, const edm::EventSetup& c) override;
-  void beginJob(void) override;
-  void endJob(void) override;
+
   void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
   void Muon(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
   void Jets(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);

diff --git a/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h b/RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h
@@ -2,7 +2,7 @@
 #define EventFilter_EcalRecHitsMerger_H
 
 #include <FWCore/Framework/interface/MakerMacros.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/global/EDProducer.h>
 
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
@@ -18,12 +18,12 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class EcalRecHitsMerger : public edm::EDProducer {
+class EcalRecHitsMerger : public edm::global::EDProducer<> {
 
 public:
 	EcalRecHitsMerger(const edm::ParameterSet& pset);
 	~EcalRecHitsMerger() override;
-	void produce(edm::Event & e, const edm::EventSetup& c) override;
+	void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override;
 	void beginJob(void) override;
 	void endJob(void) override;
 	static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTCombinedIsolationProducer.h
@@ -13,7 +13,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -27,20 +27,20 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class EgammaHLTCombinedIsolationProducer : public edm::EDProducer {
+class EgammaHLTCombinedIsolationProducer : public edm::global::EDProducer<> {
 public:
   explicit EgammaHLTCombinedIsolationProducer(const edm::ParameterSet&);
   ~EgammaHLTCombinedIsolationProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
 private:
   // ----------member data ---------------------------
 
   edm::EDGetTokenT<reco::RecoEcalCandidateCollection> recoEcalCandidateProducer_;
   std::vector<edm::EDGetTokenT<reco::RecoEcalCandidateIsolationMap> > IsolTag_;
   std::vector<double> IsolWeight_;
-  edm::ParameterSet conf_;
+  const edm::ParameterSet conf_;
 
 };
 
diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTEcalIsolationProducersRegional.h
@@ -23,7 +23,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -42,25 +42,25 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class EgammaHLTEcalIsolationProducersRegional : public edm::EDProducer {
+class EgammaHLTEcalIsolationProducersRegional : public edm::global::EDProducer<> {
 public:
   explicit EgammaHLTEcalIsolationProducersRegional(const edm::ParameterSet&);
   ~EgammaHLTEcalIsolationProducersRegional() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override;
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  edm::EDGetTokenT<reco::RecoEcalCandidateCollection> recoEcalCandidateProducer_;
-  edm::EDGetTokenT<reco::BasicClusterCollection> bcBarrelProducer_;
-  edm::EDGetTokenT<reco::BasicClusterCollection> bcEndcapProducer_;
-  edm::EDGetTokenT<reco::SuperClusterCollection> scIslandBarrelProducer_;
-  edm::EDGetTokenT<reco::SuperClusterCollection> scIslandEndcapProducer_;
+  const edm::ParameterSet conf_;
 
-  edm::ParameterSet conf_;
+  const edm::EDGetTokenT<reco::RecoEcalCandidateCollection> recoEcalCandidateProducer_;
+  const edm::EDGetTokenT<reco::BasicClusterCollection> bcBarrelProducer_;
+  const edm::EDGetTokenT<reco::BasicClusterCollection> bcEndcapProducer_;
+  const edm::EDGetTokenT<reco::SuperClusterCollection> scIslandBarrelProducer_;
+  const edm::EDGetTokenT<reco::SuperClusterCollection> scIslandEndcapProducer_;
 
-  double  egEcalIsoEtMin_;
-  double  egEcalIsoConeSize_;
-  int algoType_;
-  EgammaHLTEcalIsolation* test_;
+  const double  egEcalIsoEtMin_;
+  const double  egEcalIsoConeSize_;
+  const int algoType_;
+  EgammaHLTEcalIsolation const * const test_;
 };