Skip to content

Commit

Permalink
Merge pull request cms-sw#362 from peruzzim/fixL1_102X
Browse files Browse the repository at this point in the history
Fix L1 decision storage in 102X
peruzzim authored May 14, 2019
2 parents c784d1b + fb81f03 commit 5d36548
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions PhysicsTools/NanoAOD/plugins/L1TriggerResultsConverter.cc
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h"
#include "CondFormats/DataRecord/interface/L1GtTriggerMaskAlgoTrigRcd.h"
@@ -47,16 +47,16 @@
// class declaration
//

class L1TriggerResultsConverter : public edm::global::EDProducer<> {
class L1TriggerResultsConverter : public edm::stream::EDProducer<> {
public:
explicit L1TriggerResultsConverter(const edm::ParameterSet&);
~L1TriggerResultsConverter() override;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
virtual void beginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&);
void produce(edm::Event&, const edm::EventSetup&) override;
void beginRun(edm::Run const&, edm::EventSetup const&) override;

// ----------member data ---------------------------
const bool legacyL1_;
@@ -94,7 +94,7 @@ L1TriggerResultsConverter::~L1TriggerResultsConverter()
// member functions
//

void L1TriggerResultsConverter::beginRun(edm::StreamID streamID, edm::Run const&, edm::EventSetup const&setup) {
void L1TriggerResultsConverter::beginRun(edm::Run const&, edm::EventSetup const& setup) {
mask_.clear();
names_.clear();
indices_.clear();
@@ -125,7 +125,7 @@ void L1TriggerResultsConverter::beginRun(edm::StreamID streamID, edm::Run const&


void
L1TriggerResultsConverter::produce(edm::StreamID streamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const
L1TriggerResultsConverter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
{
using namespace edm;
const std::vector<bool> * wordp=nullptr;

0 comments on commit 5d36548

Please sign in to comment.