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.

Sign up for GitHub

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

Jump to bottom

Integration pr for CMSSW_9_2_3_patch2 #19232

Closed
wants to merge 4 commits into from
Closed

Integration pr for CMSSW_9_2_3_patch2 #19232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d49fbd
FastTimerService: make plots per path optional
fwyzard Jun 14, 2017
9575a6d
drop histos which contribute to memory issues @tier0
mtosi Jun 14, 2017
c29e92d
Retry: comment redundant produce
afiqaize Jun 14, 2017
51131fb
Remove, not comment
afiqaize Jun 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
doPUmonitoring ['highPurityPtRange1to10'] = cms.bool(False)
doPlotsVsBXlumi ['highPurityPtRange1to10'] = cms.bool(False)
doPlotsVsGoodPVtx ['highPurityPtRange1to10'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPtRange1to10'] = cms.bool(True)
doEffFromHitPatternVsBX ['highPurityPtRange1to10'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPtRange1to10'] = cms.bool(False)
doEffFromHitPatternVsBX ['highPurityPtRange1to10'] = cms.bool(False)
doStopSource ['highPurityPtRange1to10'] = cms.bool(True)

highPurityPt10 = trackSelector.clone()
Expand Down Expand Up @@ -145,8 +145,8 @@
doPUmonitoring ['highPurityPt10'] = cms.bool(False)
doPlotsVsBXlumi ['highPurityPt10'] = cms.bool(False)
doPlotsVsGoodPVtx ['highPurityPt10'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPt10'] = cms.bool(True)
doEffFromHitPatternVsBX ['highPurityPt10'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPt10'] = cms.bool(False)
doEffFromHitPatternVsBX ['highPurityPt10'] = cms.bool(False)
doStopSource ['highPurityPt10'] = cms.bool(True)

###### old monitored track collections
Expand Down Expand Up @@ -246,8 +246,8 @@
doPUmonitoring ['highPurityPV0p1'] = cms.bool(False)
doPlotsVsBXlumi ['highPurityPV0p1'] = cms.bool(False)
doPlotsVsGoodPVtx ['highPurityPV0p1'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPV0p1'] = cms.bool(True)
doEffFromHitPatternVsBX ['highPurityPV0p1'] = cms.bool(True)
doEffFromHitPatternVsPU ['highPurityPV0p1'] = cms.bool(False)
doEffFromHitPatternVsBX ['highPurityPV0p1'] = cms.bool(False)
doStopSource ['highPurityPV0p1'] = cms.bool(True)

selectedTracks.extend( ['generalTracks'] )
Expand Down
6 changes: 3 additions & 3 deletions DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
locals()[label].doPlotsVsBX = cms.bool(True)
locals()[label].doEffFromHitPatternVsPU = doEffFromHitPatternVsPU [tracks]
locals()[label].doEffFromHitPatternVsBX = doEffFromHitPatternVsBX [tracks]
locals()[label].doEffFromHitPatternVsLUMI = cms.bool(True)
locals()[label].doEffFromHitPatternVsLUMI = False
locals()[label].doStopSource = doStopSource [tracks]
locals()[label].setLabel(label)

Expand Down Expand Up @@ -167,7 +167,7 @@
locals()[label].doPlotsVsBX = cms.bool(True)
locals()[label].doEffFromHitPatternVsPU = doEffFromHitPatternVsPU [tracks]
locals()[label].doEffFromHitPatternVsBX = doEffFromHitPatternVsBX [tracks]
locals()[label].doEffFromHitPatternVsLUMI = cms.bool(True)
locals()[label].doEffFromHitPatternVsLUMI = False
locals()[label].doStopSource = doStopSource [tracks]
locals()[label].setLabel(label)

Expand Down Expand Up @@ -208,7 +208,7 @@
locals()[label].doPlotsVsBX = cms.bool(True)
locals()[label].doEffFromHitPatternVsPU = doEffFromHitPatternVsPU [tracks]
locals()[label].doEffFromHitPatternVsBX = doEffFromHitPatternVsBX [tracks]
locals()[label].doEffFromHitPatternVsLUMI = cms.bool(True)
locals()[label].doEffFromHitPatternVsLUMI = False
locals()[label].doStopSource = doStopSource [tracks]
locals()[label].setLabel(label)

Expand Down
3 changes: 0 additions & 3 deletions HLTrigger/Egamma/src/HLTEgammaGenericQuadraticEtaFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ HLTEgammaGenericQuadraticEtaFilter::HLTEgammaGenericQuadraticEtaFilter(const edm
throw cms::Exception("ImproperBinning") << "absEtaLowEdges entries should be in increasing order. \n";
}
}

//register your products
produces<trigger::TriggerFilterObjectWithRefs>();
}

void
Expand Down
5 changes: 3 additions & 2 deletions HLTrigger/Timer/interface/FastTimerService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ class FastTimerService {
void reset();
void book(DQMStore::IBooker &, ProcessCallGraph const&, ProcessCallGraph::ProcessType const&,
PlotRanges const& event_ranges, PlotRanges const& path_ranges,
unsigned int lumisections, bool byls);
unsigned int lumisections, bool bypath, bool byls);
void fill(ProcessCallGraph::ProcessType const&, ResourcesPerJob const&, ResourcesPerProcess const&, unsigned int ls);

private:
Expand All @@ -393,7 +393,7 @@ class FastTimerService {
void book(DQMStore::IBooker &, ProcessCallGraph const&, std::vector<GroupOfModules> const&,
PlotRanges const& event_ranges, PlotRanges const& path_ranges,
PlotRanges const& module_ranges, unsigned int lumisections,
bool bymodule, bool byls);
bool bymodule, bool bypath, bool byls);
void fill(ProcessCallGraph const&, ResourcesPerJob const&, unsigned int ls);

private:
Expand Down Expand Up @@ -448,6 +448,7 @@ class FastTimerService {

bool enable_dqm_; // non const, depends on the availability of the DQMStore
const bool enable_dqm_bymodule_;
const bool enable_dqm_bypath_;
const bool enable_dqm_byls_;
const bool enable_dqm_bynproc_;

Expand Down
42 changes: 25 additions & 17 deletions HLTrigger/Timer/src/FastTimerService.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@ FastTimerService::PlotsPerProcess::book(
PlotRanges const& event_ranges,
PlotRanges const& path_ranges,
unsigned int lumisections,
bool bypath,
bool byls)
{
const std::string basedir = booker.pwd();
Expand All @@ -631,24 +632,26 @@ FastTimerService::PlotsPerProcess::book(
event_ranges,
lumisections,
byls);
booker.setCurrentFolder(basedir + "/process " + process.name_ + " paths");
for (unsigned int id: boost::irange(0ul, paths_.size()))
{
paths_[id].book(booker,"path ",
job, process.paths_[id],
path_ranges,
lumisections,
byls);
}
for (unsigned int id: boost::irange(0ul, endpaths_.size()))
{
endpaths_[id].book(booker,"endpath ",
job, process.endPaths_[id],
path_ranges,
lumisections,
byls);
if (bypath) {
booker.setCurrentFolder(basedir + "/process " + process.name_ + " paths");
for (unsigned int id: boost::irange(0ul, paths_.size()))
{
paths_[id].book(booker,"path ",
job, process.paths_[id],
path_ranges,
lumisections,
byls);
}
for (unsigned int id: boost::irange(0ul, endpaths_.size()))
{
endpaths_[id].book(booker,"endpath ",
job, process.endPaths_[id],
path_ranges,
lumisections,
byls);
}
booker.setCurrentFolder(basedir);
}
booker.setCurrentFolder(basedir);
}

void
Expand Down Expand Up @@ -699,6 +702,7 @@ FastTimerService::PlotsPerJob::book(
PlotRanges const& module_ranges,
unsigned int lumisections,
bool bymodule,
bool bypath,
bool byls)
{
const std::string basedir = booker.pwd();
Expand Down Expand Up @@ -734,6 +738,7 @@ FastTimerService::PlotsPerJob::book(
event_ranges,
path_ranges,
lumisections,
bypath,
byls);

if (bymodule) {
Expand Down Expand Up @@ -787,6 +792,7 @@ FastTimerService::FastTimerService(const edm::ParameterSet & config, edm::Activi
module_id_( edm::ModuleDescription::invalidID() ),
enable_dqm_( config.getUntrackedParameter<bool>( "enableDQM" ) ),
enable_dqm_bymodule_( config.getUntrackedParameter<bool>( "enableDQMbyModule" ) ),
enable_dqm_bypath_( config.getUntrackedParameter<bool>( "enableDQMbyPath" ) ),
enable_dqm_byls_( config.getUntrackedParameter<bool>( "enableDQMbyLumiSection" ) ),
enable_dqm_bynproc_( config.getUntrackedParameter<bool>( "enableDQMbyProcesses" ) ),
dqm_event_ranges_( { config.getUntrackedParameter<double>( "dqmTimeRange" ), // ms
Expand Down Expand Up @@ -1049,6 +1055,7 @@ FastTimerService::preStreamBeginRun(edm::StreamContext const& sc)
dqm_module_ranges_,
dqm_lumisections_range_,
enable_dqm_bymodule_,
enable_dqm_bypath_,
enable_dqm_byls_);
};

Expand Down Expand Up @@ -1751,6 +1758,7 @@ FastTimerService::fillDescriptions(edm::ConfigurationDescriptions & descriptions
desc.addUntracked<bool>( "printJobSummary", true);
desc.addUntracked<bool>( "enableDQM", true);
desc.addUntracked<bool>( "enableDQMbyModule", false);
desc.addUntracked<bool>( "enableDQMbyPath", false);
desc.addUntracked<bool>( "enableDQMbyLumiSection", false);
desc.addUntracked<bool>( "enableDQMbyProcesses", false);
desc.addUntracked<double>( "dqmTimeRange", 1000. ); // ms
Expand Down