Merge pull request cms-sw#97 from thomreis/l1t-muon-dev-CMSSW_8_0_0_p…

…re1_GMTInternalMuon_move

Merged

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 <map>
 #include <utility>

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"

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 *

DataFormats/L1TMuon/src/GMTInternalMuon.cc → 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"
 
 

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 ()

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"
 

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'),
@@ -108,15 +109,16 @@
 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")
 
 process.MicroGMTCaloInputProducer = cms.EDProducer("L1TMicroGMTCaloInputProducer",
                                                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":
@@ -127,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
@@ -189,7 +191,7 @@
     process.L1TMuonTriggerPrimitives
     + process.L1TTwinMuxProducer
     + process.bmtfDigis
-    + process.bmtfConverter
+    #+ process.bmtfConverter
     + process.omtfEmulator
     + process.L1TMuonEndcapTrackFinder
     + process.L1TCaloStage2_PPFromRaw

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,15 +106,16 @@
 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")
 
 process.MicroGMTCaloInputProducer = cms.EDProducer("L1TMicroGMTCaloInputProducer",
                                                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