Merge pull request cms-sw#8168 from anorkus/threaded_dqm_migration5

Threaded dqm migration5
davidsheffield · Mar 14, 2015 · cdef835 · cdef835
2 parents 1ad9210 + 1846e18
commit cdef835
Show file tree

Hide file tree

Showing 6 changed files with 637 additions and 575 deletions.
diff --git a/DQMOffline/Alignment/interface/MuonAlignmentSummary.h b/DQMOffline/Alignment/interface/MuonAlignmentSummary.h
@@ -12,7 +12,6 @@
 #include <math.h>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
@@ -23,6 +22,7 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 
 namespace edm {
     class ParameterSet;
@@ -32,28 +32,20 @@ namespace edm {
 
 class TH1F;
 
-class MuonAlignmentSummary : public edm::EDAnalyzer {
+class MuonAlignmentSummary : public DQMEDHarvester {
 public:
 
     /// Constructor
     MuonAlignmentSummary(const edm::ParameterSet&);
-  
+
     /// Destructor
     virtual ~MuonAlignmentSummary();
-
-    /// Inizialize parameters for histo binning
-    void beginRun(edm::Run const& run,edm::EventSetup const& iSetup);
-
-    /// Get the analysis
-    void analyze(const edm::Event& event, const edm::EventSetup& iSetup){}
 
-    /// Save the histos
-    void endRun(edm::Run const& run, edm::EventSetup const& iSetup);
+    //Book histograms
+    void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
 
 private:
     // ----------member data ---------------------------
-
-    DQMStore* dbe;
 
     MonitorElement *hLocalPositionDT;
     MonitorElement *hLocalPositionRmsDT;
@@ -90,7 +82,7 @@ class MuonAlignmentSummary : public edm::EDAnalyzer {
 
     // mean and rms histos ranges
     double meanPositionRange,rmsPositionRange,meanAngleRange,rmsAngleRange;
-    
+
     // flags to decide on subdetector and summary histograms
     bool doDT, doCSC;
 
@@ -99,4 +91,4 @@ class MuonAlignmentSummary : public edm::EDAnalyzer {
     std::stringstream topFolder;
 
 };
-#endif  
+#endif