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

Complete EventSetup migration for bunch of L1 modules #31763

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Complete EventSetup migration for bunch of L1 modules #31763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df111f1
Migrate rest of L1T{Rate,Sync}{,_Offline} to EventSetup consumes
makortel Oct 12, 2020
cf24d64
Migrate L1GlobalTriggerGTL to EventSetup-consumes
makortel Oct 12, 2020
72d11a1
Remove unncessary get-without-ESGetToken from L1GtUtils
makortel Oct 12, 2020
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
21 changes: 15 additions & 6 deletions DQM/L1TMonitor/interface/L1TMenuHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down Expand Up @@ -78,8 +77,21 @@ struct SingleObjectTrigger {

class L1TMenuHelper {
public:
L1TMenuHelper(const edm::EventSetup& iSetup); // Constructor
~L1TMenuHelper(); // Destructor
struct Tokens {
edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> menu;
edm::ESGetToken<L1GtPrescaleFactors, L1GtPrescaleFactorsAlgoTrigRcd> l1GtPfAlgo;
};

template <edm::Transition Tr = edm::Transition::Event>
static Tokens consumes(edm::ConsumesCollector iC) {
Tokens tok;
tok.menu = iC.esConsumes<Tr>();
tok.l1GtPfAlgo = iC.esConsumes<Tr>();
return tok;
}

L1TMenuHelper(const edm::EventSetup& iSetup, const Tokens& tokens); // Constructor
~L1TMenuHelper(); // Destructor

// Get Lowest Unprescaled Single Object Triggers
std::map<std::string, std::string> getLUSOTrigger(const std::map<std::string, bool>& iCategories,
Expand All @@ -98,9 +110,6 @@ class L1TMenuHelper {
unsigned int getQualityAlias(const TString& iCategory, const TString& iAlias);

private:
edm::ESHandle<L1GtTriggerMenu> menuRcd;
edm::ESHandle<L1GtPrescaleFactors> l1GtPfAlgo;

const L1GtTriggerMenu* m_l1GtMenu;
const std::vector<std::vector<int> >* m_prescaleFactorsAlgoTrig;

Expand Down
8 changes: 5 additions & 3 deletions DQM/L1TMonitor/interface/L1TRate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "DataFormats/Scalers/interface/LumiScalers.h"
Expand All @@ -35,6 +32,8 @@

#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"

#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"

#include <TString.h>

#include <iostream>
Expand Down Expand Up @@ -97,6 +96,9 @@ class L1TRate : public DQMOneEDAnalyzer<edm::one::WatchLuminosityBlocks> {
edm::EDGetTokenT<LumiScalersCollection> m_scalersSource_colLScal; // Where to get L1 Scalers
edm::EDGetTokenT<Level1TriggerScalersCollection> m_scalersSource_triggerScalers; // Where to get L1 Scalers
edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> m_l1GtDataDaqInputTag; // Where to get L1 GT Data DAQ
const edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> m_menuToken;
const edm::ESGetToken<L1GtPrescaleFactors, L1GtPrescaleFactorsAlgoTrigRcd> m_l1GtPfAlgoToken;
L1TMenuHelper::Tokens m_helperTokens;

// ParameterSet
edm::ParameterSet m_parameters;
Expand Down
6 changes: 3 additions & 3 deletions DQM/L1TMonitor/interface/L1TSync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"
#include "DQM/L1TMonitor/interface/L1TOMDSHelper.h"

//DataFormats
Expand Down Expand Up @@ -135,6 +133,8 @@ class L1TSync : public DQMOneEDAnalyzer<edm::one::WatchLuminosityBlocks> {
// Input tags
edm::EDGetTokenT<L1GlobalTriggerEvmReadoutRecord> m_l1GtEvmSource;
edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> m_l1GtDataDaqInputTag;
const edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> m_menuToken;
L1TMenuHelper::Tokens m_helperTokens;

L1GtUtils m_l1GtUtils;
};
Expand Down
12 changes: 4 additions & 8 deletions DQM/L1TMonitor/src/L1TMenuHelper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ using namespace std;
//-------------------------------------------------------------------------------------
//
//-------------------------------------------------------------------------------------
L1TMenuHelper::L1TMenuHelper(const edm::EventSetup& iSetup) {
iSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
iSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().get(l1GtPfAlgo);

const L1GtPrescaleFactors* m_l1GtPfAlgo = l1GtPfAlgo.product();

m_l1GtMenu = menuRcd.product(); // Getting the menu
m_prescaleFactorsAlgoTrig = &(m_l1GtPfAlgo->gtPrescaleFactors()); // Retriving the list of prescale sets
L1TMenuHelper::L1TMenuHelper(const edm::EventSetup& iSetup, const Tokens& tokens) {
m_l1GtMenu = &iSetup.getData(tokens.menu); // Getting the menu
m_prescaleFactorsAlgoTrig =
&(iSetup.getData(tokens.l1GtPfAlgo).gtPrescaleFactors()); // Retriving the list of prescale sets
}

//-------------------------------------------------------------------------------------
Expand Down
25 changes: 11 additions & 14 deletions DQM/L1TMonitor/src/L1TRate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

// L1TMonitor includes
#include "DQM/L1TMonitor/interface/L1TRate.h"
#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"
#include "DQM/L1TMonitor/interface/L1TOMDSHelper.h"

#include "DQMServices/Core/interface/DQMStore.h"
Expand All @@ -30,7 +29,11 @@ using namespace edm;
using namespace std;

//_____________________________________________________________________
L1TRate::L1TRate(const ParameterSet& ps) : m_l1GtUtils(ps, consumesCollector(), false, *this) {
L1TRate::L1TRate(const ParameterSet& ps)
: m_menuToken(esConsumes<edm::Transition::BeginRun>()),
m_l1GtPfAlgoToken(esConsumes<edm::Transition::BeginRun>()),
m_helperTokens(L1TMenuHelper::consumes<edm::Transition::BeginRun>(consumesCollector())),
m_l1GtUtils(ps, consumesCollector(), false, *this) {
m_maxNbins = 2500; // Maximum LS for each run (for binning purposes)
m_parameters = ps;

Expand Down Expand Up @@ -79,14 +82,8 @@ L1TRate::~L1TRate() {}
// BeginRun
//_____________________________________________________________________
void L1TRate::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup& iSetup) {
ESHandle<L1GtTriggerMenu> menuRcd;
ESHandle<L1GtPrescaleFactors> l1GtPfAlgo;

iSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
iSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().get(l1GtPfAlgo);

const L1GtTriggerMenu* menu = menuRcd.product();
const L1GtPrescaleFactors* m_l1GtPfAlgo = l1GtPfAlgo.product();
const L1GtTriggerMenu& menu = iSetup.getData(m_menuToken);
const L1GtPrescaleFactors& l1GtPfAlgo = iSetup.getData(m_l1GtPfAlgoToken);

// Initializing DQM Monitor Elements
ibooker.setCurrentFolder("L1T/L1TRate");
Expand All @@ -98,10 +95,10 @@ void L1TRate::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const
m_ErrorMonitor->setBinLabel(5, "UNKNOWN");

// Retriving the list of prescale sets
m_listsPrescaleFactors = &(m_l1GtPfAlgo->gtPrescaleFactors());
m_listsPrescaleFactors = &(l1GtPfAlgo.gtPrescaleFactors());

// Getting Lowest Prescale Single Object Triggers from the menu
L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup);
L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup, m_helperTokens);
m_l1GtUtils.retrieveL1EventSetup(iSetup);
m_selectedTriggers = myMenuHelper.getLUSOTrigger(m_inputCategories, m_refPrescaleSet, m_l1GtUtils);

Expand All @@ -113,8 +110,8 @@ void L1TRate::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const
getXSexFitsPython(m_parameters);
}

for (CItAlgo algo = menu->gtAlgorithmMap().begin(); algo != menu->gtAlgorithmMap().end(); ++algo) {
m_algoBit[(algo->second).algoAlias()] = (algo->second).algoBitNumber();
for (const auto& algo : menu.gtAlgorithmMap()) {
m_algoBit[algo.second.algoAlias()] = algo.second.algoBitNumber();
}

double minInstantLuminosity = m_parameters.getParameter<double>("minInstantLuminosity");
Expand Down
18 changes: 8 additions & 10 deletions DQM/L1TMonitor/src/L1TSync.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
//#include "DataFormats/Luminosity/interface/LumiDetails.h"
//#include "DataFormats/Luminosity/interface/LumiSummary.h"

// L1TMonitor includes
#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"

#include "TList.h"

using namespace edm;
using namespace std;

//-------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------
L1TSync::L1TSync(const ParameterSet& pset) : m_l1GtUtils(pset, consumesCollector(), false, *this) {
L1TSync::L1TSync(const ParameterSet& pset)
: m_menuToken(esConsumes<edm::Transition::BeginRun>()),
m_helperTokens(L1TMenuHelper::consumes<edm::Transition::BeginRun>(consumesCollector())),
m_l1GtUtils(pset, consumesCollector(), false, *this) {
m_parameters = pset;

// Mapping parameter input variables
Expand Down Expand Up @@ -319,13 +319,11 @@ void L1TSync::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const
m_certLastLS.clear();

// Getting Trigger menu from GT
ESHandle<L1GtTriggerMenu> menuRcd;
iSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
const L1GtTriggerMenu* menu = menuRcd.product();
const L1GtTriggerMenu& menu = iSetup.getData(m_menuToken);

// Filling Alias-Bit Map
for (CItAlgo algo = menu->gtAlgorithmAliasMap().begin(); algo != menu->gtAlgorithmAliasMap().end(); ++algo) {
m_algoBit[(algo->second).algoAlias()] = (algo->second).algoBitNumber();
for (const auto& algo : menu.gtAlgorithmAliasMap()) {
m_algoBit[algo.second.algoAlias()] = algo.second.algoBitNumber();
}

// Getting fill number for this run
Expand All @@ -337,7 +335,7 @@ void L1TSync::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const
//iSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().get(l1GtPfAlgo);
//const L1GtPrescaleFactors* m_l1GtPfAlgo = l1GtPfAlgo.product();

L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup);
L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup, m_helperTokens);

m_selectedTriggers = myMenuHelper.testAlgos(m_selectedTriggers);

Expand Down
8 changes: 5 additions & 3 deletions DQMOffline/L1Trigger/interface/L1TRate_Offline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
// user include files
#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

//DataFormats
Expand All @@ -31,6 +28,8 @@

#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"

#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"

#include <TString.h>

#include <iostream>
Expand Down Expand Up @@ -117,6 +116,9 @@ class L1TRate_Offline : public DQMOneEDAnalyzer<edm::one::WatchLuminosityBlocks>
// MonitorElement
MonitorElement* m_ErrorMonitor;

const edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> m_menuToken;
const edm::ESGetToken<L1GtPrescaleFactors, L1GtPrescaleFactorsAlgoTrigRcd> m_l1GtPfAlgoToken;
L1TMenuHelper::Tokens m_helperTokens;
L1GtUtils m_l1GtUtils;
};

Expand Down
6 changes: 3 additions & 3 deletions DQMOffline/L1Trigger/interface/L1TSync_Offline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,17 @@
// User include files
#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

//L1 includes and dataformats
#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"
#include "DQMOffline/L1Trigger/interface/L1TBeamConfiguration.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
Expand Down Expand Up @@ -155,6 +153,8 @@ class L1TSync_Offline : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<ltso::
// Input tags
edm::EDGetTokenT<L1GlobalTriggerEvmReadoutRecord> m_l1GtEvmSource;
edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> m_l1GtDataDaqInputTag;
const edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> m_menuToken;
L1TMenuHelper::Tokens m_helperTokens;

L1GtUtils m_l1GtUtils;
};
Expand Down
25 changes: 11 additions & 14 deletions DQMOffline/L1Trigger/src/L1TRate_Offline.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// L1TMonitor includes
#include "DQMOffline/L1Trigger/interface/L1TRate_Offline.h"
#include "DQM/L1TMonitor/interface/L1TMenuHelper.h"

#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
#include "CondFormats/L1TObjects/interface/L1GtTriggerMenuFwd.h"
Expand All @@ -16,7 +15,11 @@ using namespace edm;
using namespace std;

//_____________________________________________________________________
L1TRate_Offline::L1TRate_Offline(const ParameterSet& ps) : m_l1GtUtils(ps, consumesCollector(), false, *this) {
L1TRate_Offline::L1TRate_Offline(const ParameterSet& ps)
: m_menuToken(esConsumes<edm::Transition::BeginRun>()),
m_l1GtPfAlgoToken(esConsumes<edm::Transition::BeginRun>()),
m_helperTokens(L1TMenuHelper::consumes<edm::Transition::BeginRun>(consumesCollector())),
m_l1GtUtils(ps, consumesCollector(), false, *this) {
m_maxNbins = 2500; // Maximum LS for each run (for binning purposes)
m_parameters = ps;

Expand Down Expand Up @@ -63,14 +66,8 @@ void L1TRate_Offline::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&
cout << "[L1TRate_Offline:] Called beginRun." << endl;
}

ESHandle<L1GtTriggerMenu> menuRcd;
ESHandle<L1GtPrescaleFactors> l1GtPfAlgo;

iSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
iSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().get(l1GtPfAlgo);

const L1GtTriggerMenu* menu = menuRcd.product();
const L1GtPrescaleFactors* m_l1GtPfAlgo = l1GtPfAlgo.product();
const L1GtTriggerMenu& menu = iSetup.getData(m_menuToken);
const L1GtPrescaleFactors& l1GtPfAlgo = iSetup.getData(m_l1GtPfAlgoToken);

// Initializing DQM Monitor Elements
ibooker.setCurrentFolder("L1T/L1TRate");
Expand All @@ -83,18 +80,18 @@ void L1TRate_Offline::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&
}

// Retriving the list of prescale sets
m_listsPrescaleFactors = &(m_l1GtPfAlgo->gtPrescaleFactors());
m_listsPrescaleFactors = &(l1GtPfAlgo.gtPrescaleFactors());

// Getting Lowest Prescale Single Object Triggers from the menu
L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup);
L1TMenuHelper myMenuHelper = L1TMenuHelper(iSetup, m_helperTokens);
m_l1GtUtils.retrieveL1EventSetup(iSetup);
m_selectedTriggers = myMenuHelper.getLUSOTrigger(m_inputCategories, m_refPrescaleSet, m_l1GtUtils);

//-> Getting template fits for the algLo cross sections
getXSexFitsPython(m_parameters);

for (CItAlgo algo = menu->gtAlgorithmMap().begin(); algo != menu->gtAlgorithmMap().end(); ++algo) {
m_algoBit[(algo->second).algoAlias()] = (algo->second).algoBitNumber();
for (const auto& algo : menu.gtAlgorithmMap()) {
m_algoBit[(algo.second).algoAlias()] = (algo.second).algoBitNumber();
}

double minInstantLuminosity = m_parameters.getParameter<double>("minInstantLuminosity");
Expand Down
Loading