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

No hack conditions #18522

Closed
wants to merge 5 commits into from
Closed

No hack conditions #18522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
572a483
Removed hack conditions
Apr 28, 2017
d4ba1e8
Removing hack conditions from DQM as well
Apr 28, 2017
ecea8ef
L1TCaloStage2ParamsRcd -> L1TCaloParamsRcd
May 2, 2017
587c1eb
L1TCaloStage2ParamsRcd -> L1TCaloParamsRcd
May 2, 2017
4b6e635
Add global conditions to L1T configuration and L1T DQM source client …
May 12, 2017
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
9 changes: 5 additions & 4 deletions DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@
)

# To get L1 conditions that are not in GlobalTag / O2O yet
process.load("L1Trigger.L1TCalorimeter.hackConditions_cff")
process.load("L1Trigger.L1TMuon.hackConditions_cff")
process.gmtParams.caloInputsMasked = cms.bool(True) # Disable uGMT calo inputs like in the online configuration
process.load("L1Trigger.L1TGlobal.hackConditions_cff")
#process.load("L1Trigger.L1TCalorimeter.hackConditions_cff")
#process.load("L1Trigger.L1TMuon.hackConditions_cff")
#process.gmtParams.caloInputsMasked = cms.bool(True) # Disable uGMT calo inputs like in the online configuration
#process.load("L1Trigger.L1TGlobal.hackConditions_cff")
process.load("L1Trigger.L1TGlobal.GlobalParameters_cff")

# To get CaloTPGTranscoder
process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff')
Expand Down
8 changes: 4 additions & 4 deletions L1Trigger/Configuration/python/SimL1Emulator_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
# Next we load ES producers for any conditions that are not yet in GT,
# using the Era configuration.
#
from L1Trigger.L1TCalorimeter.hackConditions_cff import *
from L1Trigger.L1TMuon.hackConditions_cff import *
from L1Trigger.L1TGlobal.hackConditions_cff import *

#from L1Trigger.L1TCalorimeter.hackConditions_cff import *
#from L1Trigger.L1TMuon.hackConditions_cff import *
# from L1Trigger.L1TGlobal.hackConditions_cff import *
from L1Trigger.L1TGlobal.GlobalParameters_cff import *

# Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger
#from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import *
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h"
#include "CondFormats/L1TObjects/interface/CaloParams.h"
#include "CondFormats/DataRecord/interface/L1TCaloStage2ParamsRcd.h"
#include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h"

#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
#include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
Expand Down Expand Up @@ -44,7 +44,7 @@ bool L1TCaloLayer1FetchLUTs(const edm::EventSetup& iSetup,

// CaloParams contains all persisted parameters for Layer 1
edm::ESHandle<l1t::CaloParams> paramsHandle;
iSetup.get<L1TCaloStage2ParamsRcd>().get(paramsHandle);
iSetup.get<L1TCaloParamsRcd>().get(paramsHandle);
if ( paramsHandle.product() == nullptr ) {
edm::LogError("L1TCaloLayer1FetchLUTs") << "Missing CaloParams object! Check Global Tag, etc.";
return false;
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "CondFormats/L1TObjects/interface/CaloParams.h"
#include "L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h"
#include "CondFormats/DataRecord/interface/L1TCaloStage2ParamsRcd.h"
#include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h"

using namespace std;

Expand All @@ -48,7 +48,7 @@ class L1TCaloStage2ParamsESProducer : public edm::ESProducer {

typedef std::shared_ptr<CaloParams> ReturnType;

ReturnType produce(const L1TCaloStage2ParamsRcd&);
ReturnType produce(const L1TCaloParamsRcd&);

private:
CaloParams m_params ;
Expand Down Expand Up @@ -318,7 +318,7 @@ L1TCaloStage2ParamsESProducer::~L1TCaloStage2ParamsESProducer()

// ------------ method called to produce the data ------------
L1TCaloStage2ParamsESProducer::ReturnType
L1TCaloStage2ParamsESProducer::produce(const L1TCaloStage2ParamsRcd& iRecord)
L1TCaloStage2ParamsESProducer::produce(const L1TCaloParamsRcd& iRecord)
{
using namespace edm::es;
std::shared_ptr<CaloParams> pCaloParams ;
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "L1Trigger/L1TCalorimeter/interface/Stage2PreProcessor.h"

#include "L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h"
#include "CondFormats/DataRecord/interface/L1TCaloStage2ParamsRcd.h"
#include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h"

#include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
#include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
Expand Down Expand Up @@ -348,14 +348,14 @@ L1TStage2Layer1Producer::beginRun(edm::Run const& iRun, edm::EventSetup const& i

// parameters

unsigned long long id = iSetup.get<L1TCaloStage2ParamsRcd>().cacheIdentifier();
unsigned long long id = iSetup.get<L1TCaloParamsRcd>().cacheIdentifier();

if (id != paramsCacheId_) {

paramsCacheId_ = id;

edm::ESHandle<CaloParams> paramsHandle;
iSetup.get<L1TCaloStage2ParamsRcd>().get(paramsHandle);
iSetup.get<L1TCaloParamsRcd>().get(paramsHandle);

// replace our local copy of the parameters with a new one using placement new
params_->~CaloParamsHelper();
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "L1Trigger/L1TCalorimeter/interface/CaloTools.h"

#include "L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h"
#include "CondFormats/DataRecord/interface/L1TCaloStage2ParamsRcd.h"
#include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h"

#include "DataFormats/L1TCalorimeter/interface/CaloTower.h"
#include "DataFormats/L1Trigger/interface/EGamma.h"
Expand Down Expand Up @@ -262,14 +262,14 @@ L1TStage2Layer2Producer::beginRun(edm::Run const& iRun, edm::EventSetup const& i

// parameters

unsigned long long id = iSetup.get<L1TCaloStage2ParamsRcd>().cacheIdentifier();
unsigned long long id = iSetup.get<L1TCaloParamsRcd>().cacheIdentifier();

if (id != m_paramsCacheId) {

m_paramsCacheId = id;

edm::ESHandle<CaloParams> paramsHandle;
iSetup.get<L1TCaloStage2ParamsRcd>().get(paramsHandle);
iSetup.get<L1TCaloParamsRcd>().get(paramsHandle);

// replace our local copy of the parameters with a new one using placement new
m_params->~CaloParamsHelper();
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TCalorimeter/python/caloParams_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

caloParamsSource = cms.ESSource(
"EmptyESSource",
recordName = cms.string('L1TCaloStage2ParamsRcd'),
recordName = cms.string('L1TCaloParamsRcd'),
iovIsRunNotTime = cms.bool(True),
firstValid = cms.vuint32(1)
)
Expand Down