From 082911dd7be6677549cc023a32d66e838fa911e2 Mon Sep 17 00:00:00 2001
From: Francesco Fiori <francesco.fiori@cern.ch>
Date: Wed, 14 Oct 2015 18:01:10 +0200
Subject: [PATCH] Fix TrackSplit module

---
 .../interface/TrackSplittingMonitor.h         |  4 +--
 .../python/TrackSplittingMonitor_cfi.py       |  3 --
 .../src/TrackSplittingMonitor.cc              | 32 ++++++-------------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h b/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h
index ca97c0ac57bd4..3ffb4855cb9b0 100644
--- a/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h
+++ b/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h
@@ -46,10 +46,8 @@ class TrackSplittingMonitor : public DQMEDAnalyzer {
 public:
 	explicit TrackSplittingMonitor(const edm::ParameterSet&);
 	~TrackSplittingMonitor();
-	virtual void beginJob(void);
-	virtual void endJob(void);
 	
-	virtual void analyze(const edm::Event&, const edm::EventSetup&);
+	virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
 	void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 	
 private:
diff --git a/DQM/TrackingMonitor/python/TrackSplittingMonitor_cfi.py b/DQM/TrackingMonitor/python/TrackSplittingMonitor_cfi.py
index a51d3fa475eea..c81b51b5e03ee 100644
--- a/DQM/TrackingMonitor/python/TrackSplittingMonitor_cfi.py
+++ b/DQM/TrackingMonitor/python/TrackSplittingMonitor_cfi.py
@@ -7,9 +7,6 @@
 
 TrackSplitMonitor = cms.EDAnalyzer("TrackSplittingMonitor",
                  
-    OutputMEsInRootFile = cms.bool(False),
-    OutputFileName = cms.string('MonitorTrackSplit.root'),
-
     FolderName = cms.string('TrackSplitMonitoring'),
 	
 	splitTrackCollection = cms.InputTag("splittedTracksP5"),
diff --git a/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc b/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc
index 03a3935b004d0..499e5f718e5cd 100644
--- a/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc
+++ b/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc
@@ -39,6 +39,16 @@ TrackSplittingMonitor::TrackSplittingMonitor(const edm::ParameterSet& iConfig)
   splitTracksToken_ = consumes<std::vector<reco::Track> >(splitTracks_);
   splitMuonsToken_  = mayConsume<std::vector<reco::Muon> >(splitMuons_);
 
+  plotMuons_ = conf_.getParameter<bool>("ifPlotMuons");
+
+  // cuts
+  pixelHitsPerLeg_ = conf_.getParameter<int>("pixelHitsPerLeg");
+  totalHitsPerLeg_ = conf_.getParameter<int>("totalHitsPerLeg");
+  d0Cut_ = conf_.getParameter<double>("d0Cut");
+  dzCut_ = conf_.getParameter<double>("dzCut");
+  ptCut_ = conf_.getParameter<double>("ptCut");
+  norchiCut_ = conf_.getParameter<double>("norchiCut");
+	  
 }
 
 TrackSplittingMonitor::~TrackSplittingMonitor() { 
@@ -145,20 +155,6 @@ void TrackSplittingMonitor::bookHistograms(DQMStore::IBooker & ibooker,
 
 }
 
-void TrackSplittingMonitor::beginJob(void) 
-{	
-  //get input tags
-  plotMuons_ = conf_.getParameter<bool>("ifPlotMuons");
-
-  // cuts
-  pixelHitsPerLeg_ = conf_.getParameter<int>("pixelHitsPerLeg");
-  totalHitsPerLeg_ = conf_.getParameter<int>("totalHitsPerLeg");
-  d0Cut_ = conf_.getParameter<double>("d0Cut");
-  dzCut_ = conf_.getParameter<double>("dzCut");
-  ptCut_ = conf_.getParameter<double>("ptCut");
-  norchiCut_ = conf_.getParameter<double>("norchiCut");
-	  
-}
 
 //
 // -- Analyse
@@ -361,13 +357,5 @@ void TrackSplittingMonitor::analyze(const edm::Event& iEvent, const edm::EventSe
 }
 
 
-void TrackSplittingMonitor::endJob(void) {
-  bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
-  std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
-  if(outputMEsInRootFile){
-    dqmStore_->showDirStructure();
-    dqmStore_->save(outputFileName);
-  }
-}
 
 DEFINE_FWK_MODULE(TrackSplittingMonitor);