Merge pull request #1823 from TaiSakuma/metdev-70X-131214_01_AT

AT cleanup -- code-cleaning in JetMETCorrections/Type1MET
cms-sw · Dec 16, 2013 · 06a40fc · 06a40fc
2 parents bc44c1a + a8a54cf
commit 06a40fc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/...1MET/plugins/CorrectedCaloMETProducer2.cc → ...pe1MET/plugins/AddCorrectionsToCaloMET.cc b/...1MET/plugins/CorrectedCaloMETProducer2.cc → ...pe1MET/plugins/AddCorrectionsToCaloMET.cc
@@ -17,12 +17,12 @@
 #include <vector>
 
 //____________________________________________________________________________||
-class CorrectedCaloMETProducer2 : public edm::EDProducer  
+class AddCorrectionsToCaloMET : public edm::EDProducer
 {
 
 public:
 
-  explicit CorrectedCaloMETProducer2(const edm::ParameterSet& cfg)
+  explicit AddCorrectionsToCaloMET(const edm::ParameterSet& cfg)
     : token_(consumes<METCollection>(cfg.getParameter<edm::InputTag>("src")))
   {
 
@@ -35,8 +35,8 @@ class CorrectedCaloMETProducer2 : public edm::EDProducer
     produces<METCollection>("");
   }
 
-  ~CorrectedCaloMETProducer2() { }
-    
+  ~AddCorrectionsToCaloMET() { }
+
 private:
 
   typedef std::vector<reco::CaloMET> METCollection;
@@ -93,4 +93,4 @@ class CorrectedCaloMETProducer2 : public edm::EDProducer
 
 //____________________________________________________________________________||
 
-DEFINE_FWK_MODULE(CorrectedCaloMETProducer2);
+DEFINE_FWK_MODULE(AddCorrectionsToCaloMET);
diff --git a/...pe1MET/plugins/CorrectedPFMETProducer2.cc → ...Type1MET/plugins/AddCorrectionsToPFMET.cc b/...pe1MET/plugins/CorrectedPFMETProducer2.cc → ...Type1MET/plugins/AddCorrectionsToPFMET.cc
@@ -17,12 +17,12 @@
 #include <vector>
 
 //____________________________________________________________________________||
-class CorrectedPFMETProducer2 : public edm::EDProducer  
+class AddCorrectionsToPFMET : public edm::EDProducer
 {
 
 public:
 
-  explicit CorrectedPFMETProducer2(const edm::ParameterSet& cfg)
+  explicit AddCorrectionsToPFMET(const edm::ParameterSet& cfg)
     : token_(consumes<METCollection>(cfg.getParameter<edm::InputTag>("src")))
   {
   std::vector<edm::InputTag> corrInputTags = cfg.getParameter<std::vector<edm::InputTag> >("srcCorrections");
@@ -34,8 +34,8 @@ class CorrectedPFMETProducer2 : public edm::EDProducer
     produces<METCollection>("");
   }
 
-  ~CorrectedPFMETProducer2() { }
-    
+  ~AddCorrectionsToPFMET() { }
+
 private:
 
   typedef std::vector<reco::PFMET> METCollection;
@@ -89,5 +89,4 @@ class CorrectedPFMETProducer2 : public edm::EDProducer
 
 //____________________________________________________________________________||
 
-DEFINE_FWK_MODULE(CorrectedPFMETProducer2);
-
+DEFINE_FWK_MODULE(AddCorrectionsToPFMET);
diff --git a/JetMETCorrections/Type1MET/python/correctedMet_cff.py b/JetMETCorrections/Type1MET/python/correctedMet_cff.py
@@ -2,7 +2,7 @@
 
 ##____________________________________________________________________________||
 caloMetT1 = cms.EDProducer(
-    "CorrectedCaloMETProducer2",
+    "AddCorrectionsToCaloMET",
     src = cms.InputTag('corMetGlobalMuons'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrCaloMetType1', 'type1')
@@ -11,7 +11,7 @@
 
 ##____________________________________________________________________________||
 caloMetT1T2 = cms.EDProducer(
-    "CorrectedCaloMETProducer2",
+    "AddCorrectionsToCaloMET",
     src = cms.InputTag('corMetGlobalMuons'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrCaloMetType1', 'type1'),
@@ -21,7 +21,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rt = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrack'),
@@ -30,7 +30,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT1 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrack'),
@@ -40,7 +40,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT1T2 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrackForType2'),
@@ -51,7 +51,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT2 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrackForType2'),
@@ -61,7 +61,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0pc = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0PfCand'),
@@ -70,7 +70,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0pcT1 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0PfCand'),
@@ -80,7 +80,7 @@
 
 ##____________________________________________________________________________||
 pfMetT1 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType1', 'type1')
@@ -89,7 +89,7 @@
 
 ##____________________________________________________________________________||
 pfMetT1T2 = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType1', 'type1'),
@@ -99,7 +99,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtTxy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrack'),
@@ -109,7 +109,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT1Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrack'),
@@ -120,7 +120,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT1T2Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrackForType2'),
@@ -132,7 +132,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0rtT2Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0RecoTrackForType2'),
@@ -143,7 +143,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0pcTxy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0PfCand'),
@@ -153,7 +153,7 @@
 
 ##____________________________________________________________________________||
 pfMetT0pcT1Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType0PfCand'),
@@ -164,7 +164,7 @@
 
 ##____________________________________________________________________________||
 pfMetT1Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType1', 'type1'),
@@ -174,7 +174,7 @@
 
 ##____________________________________________________________________________||
 pfMetT1T2Txy = cms.EDProducer(
-    "CorrectedPFMETProducer2",
+    "AddCorrectionsToPFMET",
     src = cms.InputTag('pfMet'),
     srcCorrections = cms.VInputTag(
         cms.InputTag('corrPfMetType1', 'type1'),