From e4aabffed4feb3f3c31f07eaeb182261eb90aa9f Mon Sep 17 00:00:00 2001 From: Jaime Leon Date: Fri, 1 Apr 2022 12:32:31 +0200 Subject: [PATCH 1/2] Fixes related to the cms-l1t-offline repo --- L1Trigger/DTTriggerPhase2/interface/GlobalCoordsObtainer.h | 3 +-- L1Trigger/DTTriggerPhase2/interface/MPFilter.h | 1 - L1Trigger/DTTriggerPhase2/interface/MotherGrouping.h | 1 - L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzer.h | 1 - L1Trigger/DTTriggerPhase2/interface/RPCIntegrator.h | 3 --- L1Trigger/DTTriggerPhase2/plugins/CalibratedDigis.cc | 1 - L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc | 5 ----- L1Trigger/DTTriggerPhase2/src/RPCIntegrator.cc | 6 +++--- .../DTTriggerPhase2/test/test_primitivesPhase2Prod.py | 7 ++++++- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/L1Trigger/DTTriggerPhase2/interface/GlobalCoordsObtainer.h b/L1Trigger/DTTriggerPhase2/interface/GlobalCoordsObtainer.h index af9d789c3d56f..0230b1a4eca09 100644 --- a/L1Trigger/DTTriggerPhase2/interface/GlobalCoordsObtainer.h +++ b/L1Trigger/DTTriggerPhase2/interface/GlobalCoordsObtainer.h @@ -1,7 +1,6 @@ #ifndef L1Trigger_DTTriggerPhase2_GlobalCoordsObtainer_h #define L1Trigger_DTTriggerPhase2_GlobalCoordsObtainer_h -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/FrameworkfwdMostUsed.h" @@ -77,4 +76,4 @@ class GlobalCoordsObtainer { std::map luts; }; -#endif \ No newline at end of file +#endif diff --git a/L1Trigger/DTTriggerPhase2/interface/MPFilter.h b/L1Trigger/DTTriggerPhase2/interface/MPFilter.h index 95df42c84c4f5..674a5a3489188 100644 --- a/L1Trigger/DTTriggerPhase2/interface/MPFilter.h +++ b/L1Trigger/DTTriggerPhase2/interface/MPFilter.h @@ -1,7 +1,6 @@ #ifndef Phase2L1Trigger_DTTrigger_MPFilter_h #define Phase2L1Trigger_DTTrigger_MPFilter_h -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/L1Trigger/DTTriggerPhase2/interface/MotherGrouping.h b/L1Trigger/DTTriggerPhase2/interface/MotherGrouping.h index fbab714a359c5..e68622b43312c 100644 --- a/L1Trigger/DTTriggerPhase2/interface/MotherGrouping.h +++ b/L1Trigger/DTTriggerPhase2/interface/MotherGrouping.h @@ -1,7 +1,6 @@ #ifndef Phase2L1Trigger_DTTrigger_MotherGrouping_h #define Phase2L1Trigger_DTTrigger_MotherGrouping_h -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzer.h b/L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzer.h index 470b276708a8a..7a42509b4b9ae 100644 --- a/L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzer.h +++ b/L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzer.h @@ -1,7 +1,6 @@ #ifndef Phase2L1Trigger_DTTrigger_MuonPathAnalyzer_h #define Phase2L1Trigger_DTTrigger_MuonPathAnalyzer_h -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/FrameworkfwdMostUsed.h" diff --git a/L1Trigger/DTTriggerPhase2/interface/RPCIntegrator.h b/L1Trigger/DTTriggerPhase2/interface/RPCIntegrator.h index e4b6852844425..c2f1d7931a9cf 100644 --- a/L1Trigger/DTTriggerPhase2/interface/RPCIntegrator.h +++ b/L1Trigger/DTTriggerPhase2/interface/RPCIntegrator.h @@ -1,7 +1,6 @@ #ifndef Phase2L1Trigger_DTTrigger_RPCIntegrator_h #define Phase2L1Trigger_DTTrigger_RPCIntegrator_h -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -93,8 +92,6 @@ class RPCIntegrator { edm::ESGetToken dtGeomH_; edm::ESGetToken rpcGeomH_; - static constexpr double m_dt_phi_granularity_ = (65536. / 0.8); // 65536 different values per 0.8 radian - static constexpr double m_dt_phiB_granularity_ = (2048. / 1.4); // 2048. different values per 1.4 radian // Constant geometry values //R[stat][layer] - radius of rpc station/layer from center of CMS static constexpr double R_[2][2] = {{410.0, 444.8}, {492.7, 527.3}}; diff --git a/L1Trigger/DTTriggerPhase2/plugins/CalibratedDigis.cc b/L1Trigger/DTTriggerPhase2/plugins/CalibratedDigis.cc index 55c633dd9fe15..de20feff242e4 100644 --- a/L1Trigger/DTTriggerPhase2/plugins/CalibratedDigis.cc +++ b/L1Trigger/DTTriggerPhase2/plugins/CalibratedDigis.cc @@ -32,7 +32,6 @@ #include "CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h" diff --git a/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc b/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc index de8ac2f23cb0a..c7a6758baf9ad 100644 --- a/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc +++ b/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc @@ -125,7 +125,6 @@ class DTTrigPhase2Prod : public edm::stream::EDProducer<> { int scenario_; int df_extended_; int max_index_; - // std::string geometry_tag_; // ParameterSet edm::EDGetTokenT dtDigisToken_; @@ -193,10 +192,6 @@ DTTrigPhase2Prod::DTTrigPhase2Prod(const ParameterSet& pset) // Choosing grouping scheme: algo_ = pset.getParameter("algo"); - // Local to global coordinates approach - // geometry_tag_ = - // dtGeomToken_ = consumes<>(pset.getUntrackedParameter("geometry_tag", "")); - edm::ConsumesCollector consumesColl(consumesCollector()); globalcoordsobtainer_ = std::make_shared(pset); globalcoordsobtainer_->generate_luts(); diff --git a/L1Trigger/DTTriggerPhase2/src/RPCIntegrator.cc b/L1Trigger/DTTriggerPhase2/src/RPCIntegrator.cc index ae8af19760d8b..74b97c9cc3879 100644 --- a/L1Trigger/DTTriggerPhase2/src/RPCIntegrator.cc +++ b/L1Trigger/DTTriggerPhase2/src/RPCIntegrator.cc @@ -178,7 +178,7 @@ RPCMetaprimitive* RPCIntegrator::matchDTwithRPC(metaPrimitive* dt_metaprimitive) // just a trick to apply the phi window cut on what could be accessed to fine tune it int delta_phi = (int)round((phi_DT_MP_conv(rpc_mp_it->global_position.phi(), rpc_det_id.sector()) - dt_metaprimitive->phi) * - m_dt_phiB_granularity_); + cmsdt::PHIBRES_CONV); if (std::abs(delta_phi) < min_dPhi && std::abs(delta_phi) < m_phi_window_) { min_dPhi = std::abs(delta_phi); bestMatch_rpcRecHit = &*rpc_mp_it; @@ -200,7 +200,7 @@ L1Phase2MuDTPhDigi RPCIntegrator::createL1Phase2MuDTPhDigi( int rpc_station = rpcDetId.station(); int rpc_layer = rpcDetId.layer(); int rpc_trigger_phi = phiInDTTPFormat(rpc_global_phi, rpcDetId.sector()); - int rpc_trigger_phiB = (phiB == -10000) ? phiB : (int)round(phiB * m_dt_phiB_granularity_); + int rpc_trigger_phiB = (phiB == -10000) ? phiB : (int)round(phiB * cmsdt::PHIBRES_CONV); int rpc_quality = -1; // dummy for rpc int rpc_index = 0; // dummy for rpc return L1Phase2MuDTPhDigi(rpc_bx, @@ -233,7 +233,7 @@ double RPCIntegrator::phiBending(RPCMetaprimitive* rpc_hit_1, RPCMetaprimitive* int RPCIntegrator::phiInDTTPFormat(double rpc_global_phi, int rpcSector) { double rpc_localDT_phi; - rpc_localDT_phi = phi_DT_MP_conv(rpc_global_phi, rpcSector) * m_dt_phi_granularity_; + rpc_localDT_phi = phi_DT_MP_conv(rpc_global_phi, rpcSector) * cmsdt::PHIBRES_CONV; return (int)round(rpc_localDT_phi); } diff --git a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py index 540dfb86cbd14..877c546004e70 100644 --- a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py +++ b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py @@ -20,10 +20,14 @@ process.CalibratedDigis.dtDigiTag = "simMuonDTDigis" process.CalibratedDigis.scenario = 0 +process.load('RecoLocalMuon.Configuration.RecoLocalMuon_cff') + # STD process.dtTriggerPhase2PrimitiveDigis.algo = 0 ## initial grouping process.dtTriggerPhase2PrimitiveDigis.df_extended = 0 +process.dtTriggerPhase2PrimitiveDigis.useRPC = True +process.rpcRecHits.rpcDigiLabel = "simMuonRPCDigis" # COMPARISON WITH FW # process.dtTriggerPhase2PrimitiveDigis.useBX_correlation = True @@ -60,7 +64,8 @@ fileName = cms.untracked.string('DTTriggerPhase2Primitives.root') ) -process.p = cms.Path(process.CalibratedDigis * +process.p = cms.Path(process.rpcRecHits * + process.CalibratedDigis * process.dtTriggerPhase2PrimitiveDigis ) process.this_is_the_end = cms.EndPath(process.out) From 6d431bade26a5b7a400945aace544c425752ac51 Mon Sep 17 00:00:00 2001 From: Jaime Leon Date: Fri, 1 Apr 2022 12:36:01 +0200 Subject: [PATCH 2/2] Fix back test file --- .../DTTriggerPhase2/test/test_primitivesPhase2Prod.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py index 877c546004e70..8aea7f548a772 100644 --- a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py +++ b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py @@ -20,15 +20,10 @@ process.CalibratedDigis.dtDigiTag = "simMuonDTDigis" process.CalibratedDigis.scenario = 0 -process.load('RecoLocalMuon.Configuration.RecoLocalMuon_cff') - # STD process.dtTriggerPhase2PrimitiveDigis.algo = 0 ## initial grouping process.dtTriggerPhase2PrimitiveDigis.df_extended = 0 -process.dtTriggerPhase2PrimitiveDigis.useRPC = True -process.rpcRecHits.rpcDigiLabel = "simMuonRPCDigis" - # COMPARISON WITH FW # process.dtTriggerPhase2PrimitiveDigis.useBX_correlation = True # process.dtTriggerPhase2PrimitiveDigis.dBX_correlate_TP = 1 @@ -64,8 +59,7 @@ fileName = cms.untracked.string('DTTriggerPhase2Primitives.root') ) -process.p = cms.Path(process.rpcRecHits * - process.CalibratedDigis * +process.p = cms.Path(process.CalibratedDigis * process.dtTriggerPhase2PrimitiveDigis ) process.this_is_the_end = cms.EndPath(process.out)