Skip to content

Commit

Permalink
Convert modules in L1Trigger/HardwareValidation to global
Browse files Browse the repository at this point in the history 
- did minor changes to allow change to const
- used mutable atomics for thread-safe incremented values
  • Loading branch information
@Dr15Jones
Dr15Jones committed Sep 29, 2022
1 parent 30a3bf4 commit 35a2fb3
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 125 deletions.
28 changes: 13 additions & 15 deletions L1Trigger/HardwareValidation/interface/L1ComparatorRun2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
#include <string>
#include <algorithm>

//#include "FWCore/Framework/interface/global/EDProducer.h"

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/global/EDProducer.h"

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down Expand Up @@ -37,24 +35,24 @@

namespace l1t {

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

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

edm::EDGetToken JetDataToken_;
edm::EDGetToken JetEmulToken_;
edm::EDGetToken EGammaDataToken_;
edm::EDGetToken EGammaEmulToken_;
edm::EDGetToken TauDataToken_;
edm::EDGetToken TauEmulToken_;
edm::EDGetToken EtSumDataToken_;
edm::EDGetToken EtSumEmulToken_;
edm::EDGetToken CaloTowerDataToken_;
edm::EDGetToken CaloTowerEmulToken_;
edm::EDGetTokenT<JetBxCollection> JetDataToken_;
edm::EDGetTokenT<JetBxCollection> JetEmulToken_;
edm::EDGetTokenT<EGammaBxCollection> EGammaDataToken_;
edm::EDGetTokenT<EGammaBxCollection> EGammaEmulToken_;
edm::EDGetTokenT<TauBxCollection> TauDataToken_;
edm::EDGetTokenT<TauBxCollection> TauEmulToken_;
edm::EDGetTokenT<EtSumBxCollection> EtSumDataToken_;
edm::EDGetTokenT<EtSumBxCollection> EtSumEmulToken_;
edm::EDGetTokenT<CaloTowerBxCollection> CaloTowerDataToken_;
edm::EDGetTokenT<CaloTowerBxCollection> CaloTowerEmulToken_;

int bxMax_;
int bxMin_;
Expand Down
6 changes: 2 additions & 4 deletions L1Trigger/HardwareValidation/plugins/L1DEFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
#include "L1Trigger/HardwareValidation/interface/DEtrait.h"
using dedefs::DEnsys;

L1DEFilter::L1DEFilter(const edm::ParameterSet& iConfig) {
L1DEFilter::L1DEFilter(const edm::ParameterSet& iConfig) : nEvt_{0}, nAgree_{0} {
DEsource_ = iConfig.getParameter<edm::InputTag>("DataEmulCompareSource");
nEvt_ = 0;
nAgree_ = 0;
flagSys_ = iConfig.getUntrackedParameter<std::vector<unsigned int> >("FlagSystems");
}

Expand All @@ -18,7 +16,7 @@ void L1DEFilter::endJob() {
}

// ------------ method called on each new Event ------------
bool L1DEFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
bool L1DEFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
nEvt_++;

bool pass = true;
Expand Down
11 changes: 6 additions & 5 deletions L1Trigger/HardwareValidation/plugins/L1DEFilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,33 @@

// system includes
#include <memory>
#include <atomic>

// common includes
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDFilter.h"
#include "FWCore/Framework/interface/global/EDFilter.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

// d|e record
#include "DataFormats/L1Trigger/interface/L1DataEmulRecord.h"

class L1DEFilter : public edm::EDFilter {
class L1DEFilter : public edm::global::EDFilter<> {
public:
explicit L1DEFilter(const edm::ParameterSet&);
~L1DEFilter() override;

private:
void beginJob(void) override{};
//virtual void beginRun(edm::Run&, const edm::EventSetup&);
bool filter(edm::Event&, const edm::EventSetup&) override;
bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
void endJob() override;

edm::InputTag DEsource_;
std::vector<unsigned int> flagSys_;
int nEvt_;
int nAgree_;
mutable std::atomic<int> nEvt_;
mutable std::atomic<int> nAgree_;
};

#endif
53 changes: 26 additions & 27 deletions L1Trigger/HardwareValidation/plugins/L1DummyProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ L1DummyProducer::L1DummyProducer(const edm::ParameterSet& iConfig) {

L1DummyProducer::~L1DummyProducer() {}

void L1DummyProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
void L1DummyProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
edm::Service<edm::RandomNumberGenerator> rng;
CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID());

Expand Down Expand Up @@ -171,55 +171,56 @@ void L1DummyProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
std::unique_ptr<L1GlobalTriggerEvmReadoutRecord> glt_evm_data(new L1GlobalTriggerEvmReadoutRecord);
std::unique_ptr<L1GlobalTriggerObjectMapRecord> glt_obj_data(new L1GlobalTriggerObjectMapRecord);

int nevt = nevt_++;
/// fill candidate collections
if (m_doSys[ETP])
SimpleDigi(engine, ecal_tp_data);
SimpleDigi(nevt, engine, ecal_tp_data);
if (m_doSys[HTP])
SimpleDigi(engine, hcal_tp_data);
SimpleDigi(nevt, engine, hcal_tp_data);
if (m_doSys[RCT])
SimpleDigi(engine, rct_em_data);
SimpleDigi(nevt, engine, rct_em_data);
if (m_doSys[RCT])
SimpleDigi(engine, rct_rgn_data);
SimpleDigi(nevt, engine, rct_rgn_data);
if (m_doSys[GCT])
SimpleDigi(engine, gct_isolaem_data, 0);
SimpleDigi(nevt, engine, gct_isolaem_data, 0);
if (m_doSys[GCT])
SimpleDigi(engine, gct_noisoem_data, 1);
SimpleDigi(nevt, engine, gct_noisoem_data, 1);
if (m_doSys[GCT])
SimpleDigi(engine, gct_cenjets_data, 0);
SimpleDigi(nevt, engine, gct_cenjets_data, 0);
if (m_doSys[GCT])
SimpleDigi(engine, gct_forjets_data, 1);
SimpleDigi(nevt, engine, gct_forjets_data, 1);
if (m_doSys[GCT])
SimpleDigi(engine, gct_taujets_data, 2);
SimpleDigi(nevt, engine, gct_taujets_data, 2);
if (m_doSys[DTP])
SimpleDigi(engine, dtp_ph_data);
SimpleDigi(nevt, engine, dtp_ph_data);
if (m_doSys[DTP])
SimpleDigi(engine, dtp_th_data);
SimpleDigi(nevt, engine, dtp_th_data);
if (m_doSys[DTF])
SimpleDigi(engine, dtf_data, 0);
SimpleDigi(nevt, engine, dtf_data, 0);
if (m_doSys[DTF])
SimpleDigi(engine, dtf_trk_data);
SimpleDigi(nevt, engine, dtf_trk_data);
if (m_doSys[CTP])
SimpleDigi(engine, ctp_data);
SimpleDigi(nevt, engine, ctp_data);
if (m_doSys[CTF])
SimpleDigi(engine, ctf_data, 2);
SimpleDigi(nevt, engine, ctf_data, 2);
if (m_doSys[CTF])
SimpleDigi(engine, ctf_trk_data);
SimpleDigi(nevt, engine, ctf_trk_data);
if (m_doSys[RPC])
SimpleDigi(engine, rpc_cen_data, 1);
SimpleDigi(nevt, engine, rpc_cen_data, 1);
if (m_doSys[RPC])
SimpleDigi(engine, rpc_for_data, 3);
SimpleDigi(nevt, engine, rpc_for_data, 3);
if (m_doSys[LTC])
SimpleDigi(engine, ltc_data);
SimpleDigi(nevt, engine, ltc_data);
if (m_doSys[GMT])
SimpleDigi(engine, gmt_data);
SimpleDigi(nevt, engine, gmt_data);
if (m_doSys[GMT])
SimpleDigi(engine, gmt_rdt_data);
SimpleDigi(nevt, engine, gmt_rdt_data);
if (m_doSys[GLT])
SimpleDigi(engine, glt_rdt_data);
SimpleDigi(nevt, engine, glt_rdt_data);
if (m_doSys[GLT])
SimpleDigi(engine, glt_evm_data);
SimpleDigi(nevt, engine, glt_evm_data);
if (m_doSys[GLT])
SimpleDigi(engine, glt_obj_data);
SimpleDigi(nevt, engine, glt_obj_data);

/// put collection
if (m_doSys[ETP])
Expand Down Expand Up @@ -271,8 +272,6 @@ void L1DummyProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
if (m_doSys[GLT])
iEvent.put(std::move(glt_obj_data), instName[GLT][0]);

nevt_++;

if (verbose())
std::cout << "L1DummyProducer::produce end.\n" << std::flush;
}
Loading

0 comments on commit 35a2fb3

Please sign in to comment.