From 1eb6d4e96710cd5b38ecdd6ec5ba45958f41f008 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.delannoy@hotmail.com>
Date: Thu, 29 Oct 2015 17:11:37 +0100
Subject: [PATCH] Fix the way the folder is handled in SiPixelHLT

---
 DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h    | 1 -
 DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py | 5 ++---
 DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc         | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
index 0b8dc5f3c8203..33188da6c2a5e 100644
--- a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
+++ b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
@@ -56,7 +56,6 @@
        virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) ;
        virtual void bookMEs(DQMStore::IBooker &);
 
-       std::string topFolderName_;
 
     private:
        edm::ParameterSet conf_;
diff --git a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py
index 90b7decec77d6..3ae4b5f0891e2 100644
--- a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py
+++ b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py
@@ -1,13 +1,12 @@
 import FWCore.ParameterSet.Config as cms
 
 SiPixelHLTSource = cms.EDAnalyzer("SiPixelHLTSource",
-    TopFolderName = cms.string('Pixel'),
+    DirName = cms.untracked.string('Pixel/FEDIntegrity/'),
     RawInput = cms.InputTag("rawDataCollector"),
     ErrorInput = cms.InputTag("siPixelDigis"),
     outputFile = cms.string('Pixel_DQM_HLT.root'),
     saveFile = cms.untracked.bool(False),
-    slowDown = cms.untracked.bool(False),
-    DirName = cms.untracked.string('Pixel/FEDIntegrity/')
+    slowDown = cms.untracked.bool(False)
 )
 
 
diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
index 5a5ea9dd5f99b..f62c3e692e0f2 100644
--- a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
+++ b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
@@ -51,11 +51,11 @@ SiPixelHLTSource::SiPixelHLTSource(const edm::ParameterSet& iConfig) :
   rawin_( consumes<FEDRawDataCollection>( conf_.getParameter<edm::InputTag>( "RawInput" ) ) ),
   errin_( consumes<edm::DetSetVector<SiPixelRawDataError> >( conf_.getParameter<edm::InputTag>( "ErrorInput" ) ) ),
   saveFile( conf_.getUntrackedParameter<bool>("saveFile",false) ),
-  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) )
+  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) ),
+  dirName_( conf_.getUntrackedParameter<string>("DirName","Pixel/FEDIntegrity/") )
 {
   firstRun = true;
   LogInfo ("PixelDQM") << "SiPixelHLTSource::SiPixelHLTSource: Got DQM BackEnd interface"<<endl;
-  topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
 }
 
 
@@ -153,8 +153,8 @@ void SiPixelHLTSource::analyze(const edm::Event& iEvent, const edm::EventSetup&
 void SiPixelHLTSource::bookMEs(DQMStore::IBooker & iBooker){
 
   iBooker.cd();
-  iBooker.setCurrentFolder(topFolderName_+"/FEDIntegrity/");
-
+  iBooker.setCurrentFolder(dirName_);
+  
   std::string rawhid;
   std::string errhid;
   // Get collection name and instantiate Histo Id builder