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

multithreading fix for 74x: HLTrigReport #11349

Merged
merged 1 commit into from Oct 9, 2015
Merged

multithreading fix for 74x: HLTrigReport #11349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions HLTrigger/HLTanalyzers/interface/HLTrigReport.h
View file
Open in desktop
Expand Up @@ -12,23 +12,22 @@
*
*/

#include "DataFormats/Common/interface/TriggerResults.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
#include "FWCore/Common/interface/TriggerNames.h"
#include<vector>
#include<string>
#include "DataFormats/Common/interface/TriggerResults.h"
#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
#include <vector>
#include <string>

//
// class declaration
//

class HLTrigReport : public edm::EDAnalyzer {
class HLTrigReport : public edm::one::EDAnalyzer<> {
private:
enum ReportEvery {
NEVER = 0,
Expand Down Expand Up @@ -104,10 +103,10 @@ class HLTrigReport : public edm::EDAnalyzer {
unsigned int refIndex_; // index of the reference path for rate calculation
double refRate_; // rate of the reference path, the rate of all other paths will be normalized to this

ReportEvery reportBy_; // dump report for every never/event/lumi/run/job
ReportEvery resetBy_; // reset counters every never/event/lumi/run/job
ReportEvery serviceBy_; // call to service every never/event/lumi/run/job
HLTConfigProvider hltConfig_; // to get configuration for L1s/Pre
const ReportEvery reportBy_; // dump report for every never/event/lumi/run/job
const ReportEvery resetBy_; // reset counters every never/event/lumi/run/job
const ReportEvery serviceBy_; // call to service every never/event/lumi/run/job
HLTConfigProvider hltConfig_; // to get configuration for L1s/Pre
};

#endif //HLTrigReport_h
5 changes: 2 additions & 3 deletions HLTrigger/HLTanalyzers/src/HLTrigReport.cc
View file
Open in desktop
Expand Up @@ -48,7 +48,8 @@ HLTrigReport::ReportEvery HLTrigReport::decode(const std::string & value) {
// constructors and destructor
//
HLTrigReport::HLTrigReport(const edm::ParameterSet& iConfig) :
hlTriggerResults_ (iConfig.getParameter<edm::InputTag> ("HLTriggerResults")),
hlTriggerResults_(iConfig.getParameter<edm::InputTag> ("HLTriggerResults")),
hlTriggerResultsToken_(consumes<edm::TriggerResults>(hlTriggerResults_)),
configured_(false),
nEvents_(0),
nWasRun_(0),
Expand Down Expand Up @@ -81,8 +82,6 @@ HLTrigReport::HLTrigReport(const edm::ParameterSet& iConfig) :
serviceBy_(decode(iConfig.getUntrackedParameter<std::string>("serviceBy", "never")) ),
hltConfig_()
{
hlTriggerResultsToken_ = consumes<edm::TriggerResults>(hlTriggerResults_);

const edm::ParameterSet customDatasets(iConfig.getUntrackedParameter<edm::ParameterSet>("CustomDatasets", edm::ParameterSet()));
isCustomDatasets_ = (customDatasets != edm::ParameterSet());
if (isCustomDatasets_) {
Expand Down