From ca756704e36506d10b0956e55a9667f16f65730a Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Mon, 16 Nov 2015 17:22:35 +0100 Subject: [PATCH 1/3] Move GMTInternalMuon from DataFormats to L1Trigger/L1TMuon. --- {DataFormats => L1Trigger}/L1TMuon/interface/GMTInternalMuon.h | 0 .../L1TMuon/interface/GMTInternalMuonFwd.h | 0 L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h | 2 +- L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc | 2 +- {DataFormats => L1Trigger}/L1TMuon/src/GMTInternalMuon.cc | 2 +- L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc | 2 +- L1Trigger/L1TMuon/src/MicroGMTIsolationUnit.cc | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {DataFormats => L1Trigger}/L1TMuon/interface/GMTInternalMuon.h (100%) rename {DataFormats => L1Trigger}/L1TMuon/interface/GMTInternalMuonFwd.h (100%) rename {DataFormats => L1Trigger}/L1TMuon/src/GMTInternalMuon.cc (93%) diff --git a/DataFormats/L1TMuon/interface/GMTInternalMuon.h b/L1Trigger/L1TMuon/interface/GMTInternalMuon.h similarity index 100% rename from DataFormats/L1TMuon/interface/GMTInternalMuon.h rename to L1Trigger/L1TMuon/interface/GMTInternalMuon.h diff --git a/DataFormats/L1TMuon/interface/GMTInternalMuonFwd.h b/L1Trigger/L1TMuon/interface/GMTInternalMuonFwd.h similarity index 100% rename from DataFormats/L1TMuon/interface/GMTInternalMuonFwd.h rename to L1Trigger/L1TMuon/interface/GMTInternalMuonFwd.h diff --git a/L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h b/L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h index 7b4659263ab1f..cdfb2f1d0ca31 100644 --- a/L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h +++ b/L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h @@ -6,8 +6,8 @@ #include "DataFormats/L1Trigger/interface/Muon.h" #include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h" -#include "DataFormats/L1TMuon/interface/GMTInternalMuonFwd.h" #include "DataFormats/L1TMuon/interface/GMTInputCaloSumFwd.h" +#include "L1Trigger/L1TMuon/interface/GMTInternalMuonFwd.h" #include #include diff --git a/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc b/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc index 64c0f2a0e1680..2fb7bc8fe7603 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc @@ -39,11 +39,11 @@ #include "L1Trigger/L1TMuon/interface/MicroGMTIsolationUnit.h" #include "L1Trigger/L1TMuon/interface/MicroGMTCancelOutUnit.h" #include "L1Trigger/L1TMuon/interface/MicroGMTLUTFactories.h" +#include "L1Trigger/L1TMuon/interface/GMTInternalMuon.h" #include "DataFormats/Math/interface/LorentzVector.h" #include "DataFormats/L1Trigger/interface/Muon.h" #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h" -#include "DataFormats/L1TMuon/interface/GMTInternalMuon.h" #include "CondFormats/L1TObjects/interface/L1TMuonGlobalParams.h" #include "CondFormats/DataRecord/interface/L1TGMTParamsRcd.h" diff --git a/DataFormats/L1TMuon/src/GMTInternalMuon.cc b/L1Trigger/L1TMuon/src/GMTInternalMuon.cc similarity index 93% rename from DataFormats/L1TMuon/src/GMTInternalMuon.cc rename to L1Trigger/L1TMuon/src/GMTInternalMuon.cc index 9b29f452ace8f..aa696b4037a9d 100644 --- a/DataFormats/L1TMuon/src/GMTInternalMuon.cc +++ b/L1Trigger/L1TMuon/src/GMTInternalMuon.cc @@ -1,4 +1,4 @@ -#include "DataFormats/L1TMuon/interface/GMTInternalMuon.h" +#include "L1Trigger/L1TMuon/interface/GMTInternalMuon.h" #include "L1Trigger/L1TMuon/interface/MicroGMTConfiguration.h" diff --git a/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc b/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc index 74863f0412eff..243d3a57cbc0a 100644 --- a/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc +++ b/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc @@ -1,5 +1,5 @@ #include "../interface/MicroGMTCancelOutUnit.h" -#include "DataFormats/L1TMuon/interface/GMTInternalMuon.h" +#include "L1Trigger/L1TMuon/interface/GMTInternalMuon.h" namespace l1t { MicroGMTCancelOutUnit::MicroGMTCancelOutUnit () diff --git a/L1Trigger/L1TMuon/src/MicroGMTIsolationUnit.cc b/L1Trigger/L1TMuon/src/MicroGMTIsolationUnit.cc index e6230034315ab..38876cb580e31 100644 --- a/L1Trigger/L1TMuon/src/MicroGMTIsolationUnit.cc +++ b/L1Trigger/L1TMuon/src/MicroGMTIsolationUnit.cc @@ -1,7 +1,7 @@ #include "../interface/MicroGMTIsolationUnit.h" +#include "L1Trigger/L1TMuon/interface/GMTInternalMuon.h" #include "DataFormats/L1TMuon/interface/GMTInputCaloSum.h" -#include "DataFormats/L1TMuon/interface/GMTInternalMuon.h" #include "DataFormats/L1Trigger/interface/Muon.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" From 576bd2ded95b9f99c3352eb2d21338c5db28445a Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Tue, 17 Nov 2015 12:04:13 +0100 Subject: [PATCH 2/3] update cfg for EMTF producer --- L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py b/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py index 8bd5d4c792f20..e03041a8d49ee 100644 --- a/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py +++ b/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py @@ -97,6 +97,7 @@ process.L1TMuonEndcapTrackFinder = cms.EDProducer( 'L1TMuonEndCapTrackProducer', + CSCInput = cms.InputTag('simCscTriggerPrimitiveDigis',''), primitiveSrcs = cms.VInputTag( cms.InputTag('L1TMuonTriggerPrimitives', 'CSC'), cms.InputTag('L1TMuonTriggerPrimitives', 'DT'), From 7b6c000ac3c06765e5a01962a467960325fab56b Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Tue, 17 Nov 2015 13:22:43 +0100 Subject: [PATCH 3/3] update muon emulator configuration --- .../L1TMuon/python/microgmtemulator_cfi.py | 150 +----------------- .../test/microgmt_from_tfinputs_cfg.py | 9 +- .../test/produce_l1upgradentuple_cfg.py | 14 +- 3 files changed, 16 insertions(+), 157 deletions(-) diff --git a/L1Trigger/L1TMuon/python/microgmtemulator_cfi.py b/L1Trigger/L1TMuon/python/microgmtemulator_cfi.py index 841e6e2b252bd..41faf7b6108bc 100644 --- a/L1Trigger/L1TMuon/python/microgmtemulator_cfi.py +++ b/L1Trigger/L1TMuon/python/microgmtemulator_cfi.py @@ -1,151 +1,5 @@ import FWCore.ParameterSet.Config as cms -import os - -l1tgmt_basedir = "L1Trigger/L1TMuon/" -lut_dir = os.path.join(l1tgmt_basedir, "data/microgmt_luts/") - -microGMTEmulator = cms.EDProducer('l1t::L1TMuonProducer', - barrelTFInput = cms.InputTag("L1TMicroGMTInputProducer", "BarrelTFMuons"), - overlapTFInput = cms.InputTag("L1TMicroGMTInputProducer", "OverlapTFMuons"), - forwardTFInput = cms.InputTag("L1TMicroGMTInputProducer", "ForwardTFMuons"), - triggerTowerInput = cms.InputTag("L1TMicroGMTInputProducer", "TriggerTowerSums"), - - AbsIsoCheckMemLUTSettings = cms.PSet ( - areaSum_in_width = cms.int32(5), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'AbsIsoCheckMem.lut')), - ) , - - IdxSelMemPhiLUTSettings = cms.PSet ( - phi_in_width = cms.int32(10), - out_width = cms.int32(6), - filename = cms.string(os.path.join(lut_dir, 'IdxSelMemPhi.lut')), - ) , - - FwdPosSingleMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'FwdPosSingleMatchQual.lut')), - ) , - - BONegMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'BONegMatchQual.lut')), - ) , - - OvlNegSingleMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'OvlNegSingleMatchQual.lut')), - ) , - - IdxSelMemEtaLUTSettings = cms.PSet ( - eta_in_width = cms.int32(9), - out_width = cms.int32(5), - filename = cms.string(os.path.join(lut_dir, 'IdxSelMemEta.lut')), - ) , - - FOPosMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'FOPosMatchQual.lut')), - ) , - - FwdNegSingleMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'FwdNegSingleMatchQual.lut')), - ) , - - BPhiExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'BPhiExtrapolation.lut')), - ) , - - BrlSingleMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'BrlSingleMatchQual.lut')), - ) , - - RelIsoCheckMemLUTSettings = cms.PSet ( - areaSum_in_width = cms.int32(5), - pT_in_width = cms.int32(9), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'RelIsoCheckMem.lut')), - ) , - - OPhiExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'OPhiExtrapolation.lut')), - ) , - - OvlPosSingleMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'OvlPosSingleMatchQual.lut')), - ) , - - FEtaExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'FEtaExtrapolation.lut')), - ) , - - BOPosMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'BOPosMatchQual.lut')), - ) , - - OEtaExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'OEtaExtrapolation.lut')), - ) , - - BEtaExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'BEtaExtrapolation.lut')), - ) , - - FPhiExtrapolationLUTSettings = cms.PSet ( - etaAbsRed_in_width = cms.int32(6), - pTred_in_width = cms.int32(6), - out_width = cms.int32(4), - filename = cms.string(os.path.join(lut_dir, 'FPhiExtrapolation.lut')), - ) , - - FONegMatchQualLUTSettings = cms.PSet ( - deltaEtaRed_in_width = cms.int32(4), - deltaPhiRed_in_width = cms.int32(3), - out_width = cms.int32(1), - filename = cms.string(os.path.join(lut_dir, 'FONegMatchQual.lut')), - ) , - - SortRankLUTSettings = cms.PSet ( - pT_in_width = cms.int32(9), - qual_in_width = cms.int32(4), - out_width = cms.int32(10), - filename = cms.string(os.path.join(lut_dir, 'SortRank.lut')), - ) -) +from L1Trigger.L1TMuon.l1tmicrogmtparamsesproducer_cfi import * +from L1Trigger.L1TMuon.l1tmicrogmtproducer_cfi import * diff --git a/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py b/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py index e03041a8d49ee..aada92e611e38 100644 --- a/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py +++ b/L1Trigger/L1TMuon/test/microgmt_from_tfinputs_cfg.py @@ -109,6 +109,7 @@ process.load('L1Trigger.L1TMuonBarrel.L1TTwinMuxProducer_cfi') # BMTF Emulator +process.load('L1Trigger.L1TMuonBarrel.l1tmbtfparamsproducer_cfi') process.load('L1Trigger.L1TMuonBarrel.bmtfDigis_cfi') process.bmtfDigis.DTDigi_Source=cms.InputTag("L1TTwinMuxProducer") @@ -116,8 +117,8 @@ caloStage2Layer2Label=cms.InputTag("caloStage2Layer1Digis"), ) # WORKAROUNDS FOR WRONG SCALES / MISSING COLLECTIONS: -process.bmtfConverter = cms.EDProducer("L1TBMTFConverter", - barrelTFInput = cms.InputTag("bmtfDigis", "BM")) +#process.bmtfConverter = cms.EDProducer("L1TBMTFConverter", +# barrelTFInput = cms.InputTag("bmtfDigis", "BM")) # Adjust input tags if running on GEN-SIM-RAW (have to re-digi) if SAMPLE == "zmumu" or SAMPLE == "minbias": @@ -128,7 +129,7 @@ process.microGMTEmulator.overlapTFInput = cms.InputTag("omtfEmulator", "OMTF") process.microGMTEmulator.forwardTFInput = cms.InputTag("L1TMuonEndcapTrackFinder", "EMUTF") -process.microGMTEmulator.barrelTFInput = cms.InputTag("bmtfConverter", "ConvBMTFMuons") +process.microGMTEmulator.barrelTFInput = cms.InputTag("bmtfDigis", "BM") process.microGMTEmulator.triggerTowerInput = cms.InputTag("MicroGMTCaloInputProducer", "TriggerTowerSums") # output file @@ -190,7 +191,7 @@ process.L1TMuonTriggerPrimitives + process.L1TTwinMuxProducer + process.bmtfDigis - + process.bmtfConverter + #+ process.bmtfConverter + process.omtfEmulator + process.L1TMuonEndcapTrackFinder + process.L1TCaloStage2_PPFromRaw diff --git a/L1Trigger/L1TMuon/test/produce_l1upgradentuple_cfg.py b/L1Trigger/L1TMuon/test/produce_l1upgradentuple_cfg.py index 403dfae8247ad..348259c1efc2b 100644 --- a/L1Trigger/L1TMuon/test/produce_l1upgradentuple_cfg.py +++ b/L1Trigger/L1TMuon/test/produce_l1upgradentuple_cfg.py @@ -94,6 +94,7 @@ process.L1TMuonEndcapTrackFinder = cms.EDProducer( 'L1TMuonEndCapTrackProducer', + CSCInput = cms.InputTag('simCscTriggerPrimitiveDigis',''), primitiveSrcs = cms.VInputTag( cms.InputTag('L1TMuonTriggerPrimitives', 'CSC'), cms.InputTag('L1TMuonTriggerPrimitives', 'DT'), @@ -105,6 +106,7 @@ process.load('L1Trigger.L1TMuonBarrel.L1TTwinMuxProducer_cfi') # BMTF Emulator +process.load('L1Trigger.L1TMuonBarrel.l1tmbtfparamsproducer_cfi') process.load('L1Trigger.L1TMuonBarrel.bmtfDigis_cfi') process.bmtfDigis.DTDigi_Source=cms.InputTag("L1TTwinMuxProducer") @@ -112,8 +114,8 @@ caloStage2Layer2Label=cms.InputTag("caloStage2Layer1Digis"), ) # WORKAROUNDS FOR WRONG SCALES / MISSING COLLECTIONS: -process.bmtfConverter = cms.EDProducer("L1TBMTFConverter", - barrelTFInput = cms.InputTag("bmtfDigis", "BM")) +#process.bmtfConverter = cms.EDProducer("L1TBMTFConverter", +# barrelTFInput = cms.InputTag("bmtfDigis", "BM")) # Adjust input tags if running on GEN-SIM-RAW (have to re-digi) if SAMPLE == "zmumu" or SAMPLE == "minbias": @@ -135,8 +137,10 @@ process.l1MuonUpgradeTreeProducer.omtfTag = cms.InputTag("omtfEmulator", "OMTF") process.microGMTEmulator.forwardTFInput = cms.InputTag("L1TMuonEndcapTrackFinder", "EMUTF") process.l1MuonUpgradeTreeProducer.emtfTag = cms.InputTag("L1TMuonEndcapTrackFinder", "EMUTF") -process.microGMTEmulator.barrelTFInput = cms.InputTag("bmtfConverter", "ConvBMTFMuons") -process.l1MuonUpgradeTreeProducer.bmtfTag = cms.InputTag("bmtfConverter", "ConvBMTFMuons") +#process.microGMTEmulator.barrelTFInput = cms.InputTag("bmtfConverter", "ConvBMTFMuons") +#process.l1MuonUpgradeTreeProducer.bmtfTag = cms.InputTag("bmtfConverter", "ConvBMTFMuons") +process.microGMTEmulator.barrelTFInput = cms.InputTag("bmtfDigis", "BM") +process.l1MuonUpgradeTreeProducer.bmtfTag = cms.InputTag("bmtfDigis", "BM") process.microGMTEmulator.triggerTowerInput = cms.InputTag("MicroGMTCaloInputProducer", "TriggerTowerSums") process.l1MuonUpgradeTreeProducer.calo2x2Tag = cms.InputTag("MicroGMTCaloInputProducer", "TriggerTower2x2s") process.l1MuonUpgradeTreeProducer.caloTag = cms.InputTag("caloStage2Layer1Digis") @@ -230,7 +234,7 @@ process.L1TMuonTriggerPrimitives + process.L1TTwinMuxProducer + process.bmtfDigis - + process.bmtfConverter + #+ process.bmtfConverter + process.omtfEmulator + process.L1TMuonEndcapTrackFinder + process.L1TCaloStage2_PPFromRaw