From 572a4834c151113efe20b15786101cb17bf3d92a Mon Sep 17 00:00:00 2001 From: kkotov Date: Fri, 28 Apr 2017 20:35:26 +0200 Subject: [PATCH 1/5] Removed hack conditions --- L1Trigger/Configuration/python/SimL1Emulator_cff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index 33c8499f4e274..6f5c4680d028f 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -49,9 +49,9 @@ # 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 * # Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger From d4ba1e8e5df69a5cb91b2208a4300e5c13b04446 Mon Sep 17 00:00:00 2001 From: kkotov Date: Fri, 28 Apr 2017 20:40:39 +0200 Subject: [PATCH 2/5] Removing hack conditions from DQM as well --- .../l1tstage2emulator_dqm_sourceclient-live_cfg.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index a5e72197ddc4a..ce6e0d931d3f4 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -73,10 +73,10 @@ ) # 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") # To get CaloTPGTranscoder process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff') From ecea8efc99abefe7df74e6de41faee121e113395 Mon Sep 17 00:00:00 2001 From: kkotov Date: Tue, 2 May 2017 15:06:20 +0200 Subject: [PATCH 3/5] L1TCaloStage2ParamsRcd -> L1TCaloParamsRcd --- .../L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc | 6 +++--- L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc | 6 +++--- L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc | 6 +++--- L1Trigger/L1TCalorimeter/python/caloParams_cfi.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc index f8028cf0cb8dc..0f5a933aa5ca4 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc @@ -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; @@ -48,7 +48,7 @@ class L1TCaloStage2ParamsESProducer : public edm::ESProducer { typedef std::shared_ptr ReturnType; - ReturnType produce(const L1TCaloStage2ParamsRcd&); + ReturnType produce(const L1TCaloParamsRcd&); private: CaloParams m_params ; @@ -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 pCaloParams ; diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc index 39a132379dda2..b5336774596d6 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc @@ -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" @@ -348,14 +348,14 @@ L1TStage2Layer1Producer::beginRun(edm::Run const& iRun, edm::EventSetup const& i // parameters - unsigned long long id = iSetup.get().cacheIdentifier(); + unsigned long long id = iSetup.get().cacheIdentifier(); if (id != paramsCacheId_) { paramsCacheId_ = id; edm::ESHandle paramsHandle; - iSetup.get().get(paramsHandle); + iSetup.get().get(paramsHandle); // replace our local copy of the parameters with a new one using placement new params_->~CaloParamsHelper(); diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc index d892bca3e6ff2..c8e7c17651983 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc @@ -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" @@ -262,14 +262,14 @@ L1TStage2Layer2Producer::beginRun(edm::Run const& iRun, edm::EventSetup const& i // parameters - unsigned long long id = iSetup.get().cacheIdentifier(); + unsigned long long id = iSetup.get().cacheIdentifier(); if (id != m_paramsCacheId) { m_paramsCacheId = id; edm::ESHandle paramsHandle; - iSetup.get().get(paramsHandle); + iSetup.get().get(paramsHandle); // replace our local copy of the parameters with a new one using placement new m_params->~CaloParamsHelper(); diff --git a/L1Trigger/L1TCalorimeter/python/caloParams_cfi.py b/L1Trigger/L1TCalorimeter/python/caloParams_cfi.py index 0a88fb62c3820..f5a87f23d66d5 100644 --- a/L1Trigger/L1TCalorimeter/python/caloParams_cfi.py +++ b/L1Trigger/L1TCalorimeter/python/caloParams_cfi.py @@ -2,7 +2,7 @@ caloParamsSource = cms.ESSource( "EmptyESSource", - recordName = cms.string('L1TCaloStage2ParamsRcd'), + recordName = cms.string('L1TCaloParamsRcd'), iovIsRunNotTime = cms.bool(True), firstValid = cms.vuint32(1) ) From 587c1eb6598cff5200154296d18b32c1a54afaa3 Mon Sep 17 00:00:00 2001 From: kkotov Date: Tue, 2 May 2017 20:40:36 +0200 Subject: [PATCH 4/5] L1TCaloStage2ParamsRcd -> L1TCaloParamsRcd --- L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc b/L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc index 4ee1f78791caf..8648f1c37424e 100644 --- a/L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc +++ b/L1Trigger/L1TCaloLayer1/src/L1TCaloLayer1FetchLUTs.cc @@ -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" @@ -44,7 +44,7 @@ bool L1TCaloLayer1FetchLUTs(const edm::EventSetup& iSetup, // CaloParams contains all persisted parameters for Layer 1 edm::ESHandle paramsHandle; - iSetup.get().get(paramsHandle); + iSetup.get().get(paramsHandle); if ( paramsHandle.product() == nullptr ) { edm::LogError("L1TCaloLayer1FetchLUTs") << "Missing CaloParams object! Check Global Tag, etc."; return false; From 4b6e6354f0cb6b8afc9441aac5aa00a1ea21c253 Mon Sep 17 00:00:00 2001 From: Antoni Shtipliyski Date: Fri, 12 May 2017 17:07:15 +0200 Subject: [PATCH 5/5] Add global conditions to L1T configuration and L1T DQM source client config --- .../clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py | 1 + L1Trigger/Configuration/python/SimL1Emulator_cff.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index ce6e0d931d3f4..ef674536b8979 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -77,6 +77,7 @@ #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') diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index 6f5c4680d028f..4a0a8af2e637f 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -51,8 +51,8 @@ # #from L1Trigger.L1TCalorimeter.hackConditions_cff import * #from L1Trigger.L1TMuon.hackConditions_cff import * -#from L1Trigger.L1TGlobal.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 *