Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the way the folder is handled in SiPixelHLT in 7_5_X #12427

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
5 changes: 2 additions & 3 deletions DQM/SiPixelMonitorRawData/python/SiPixelMonitorHLT_cfi.py
Original file line number Diff line number Diff line change
@@ -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)
)


8 changes: 4 additions & 4 deletions DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}


Expand Down Expand Up @@ -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
Expand Down