Merge pull request cms-sw#8 from battibass/111X_preparation

Switch master to 11_1_X
jfernan2 · Aug 28, 2020 · 2c481af · 2c481af
2 parents 96080e3 + 99c6789
commit 2c481af
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -7,15 +7,13 @@ In the present days this code is evolving fast, hence the installation recipe ma
 
 ### Installation:
 ```
-cmsrel CMSSW_11_0_2
-cd CMSSW_11_0_2/src/
+cmsrel CMSSW_11_1_3
+cd CMSSW_11_1_3/src/
 cmsenv
-git cms-merge-topic oglez:Phase2_DTAB7Unpacker_v9.2
-git cms-merge-topic battibass:Phase2_DTReco_110X
-git cms-merge-topic swiedenb:DTCalibOfflineSlice_11_0_X_v2 
-git cms-merge-topic -u battibass:HB_From106X_for110X # MTT-CHT emulator (brute force copy from Nicola)
-git cms-merge-topic -u dtp2-tpg-am:AM_106X_11_0_1_noDF # AM emulator
-git clone https://github.com/battibass/DTNtuples.git DTDPGAnalysis/DTNtuples
+git cms-merge-topic oglez:Phase2_DTAB7Unpacker_v9.3
+git cms-merge-topic battibass:Phase2_DTReco_111X
+git cms-merge-topic swiedenb:DTCalibOfflineSlice_11_1_X_v2
+git clone https://github.com/battibass/DTNtuples.git DTDPGAnalysis/DTNtuples -b 111X_preparation
 scramv1 b -j 5
 ```
 

diff --git a/python/dtNtupleProducer_phase2_cfi.py b/python/dtNtupleProducer_phase2_cfi.py
@@ -22,7 +22,7 @@
                                   ph1BmtfInThTag = cms.untracked.InputTag("simDtTriggerPrimitiveDigis"),
 
                                   ph2TPGPhiHwTag = cms.untracked.InputTag("dtTriggerPhase2AmPrimitiveDigis"),
-                                  ph2TPGPhiEmuHbTag = cms.untracked.InputTag("dtTriggerPhase2HbPrimitiveDigis","MMTCHT"),
+                                  ph2TPGPhiEmuHbTag = cms.untracked.InputTag("none"),
                                   ph2TPGPhiEmuAmTag = cms.untracked.InputTag("dtTriggerPhase2AmPrimitiveDigis"),
 
                                   ph1DtSegmentTag = cms.untracked.InputTag("dt4DSegments"),

diff --git a/test/dtDpgNtuples_phase2_cfg.py b/test/dtDpgNtuples_phase2_cfg.py
@@ -68,7 +68,7 @@
                  "If True applies random background to phase-2 digis and emulator")
 
 options.register('ntupleName',
-                 './DTDPGNtuple_11_0_2_Phase2_Simulation.root', #default value
+                 './DTDPGNtuple_11_1_0_patch2_Phase2_Simulation.root', #default value
                  VarParsing.VarParsing.multiplicity.singleton,
                  VarParsing.VarParsing.varType.string,
                  "Folder and name ame for output ntuple")
@@ -123,24 +123,19 @@
 # process.DTGeometryESModule.applyAlignment = False
 # process.DTGeometryESModule.fromDDD = False
 
-process.load("Phase2L1Trigger.CalibratedDigis.CalibratedDigis_cfi") 
-process.load("L1Trigger.DTPhase2Trigger.dtTriggerPhase2PrimitiveDigis_cfi")
+process.load("L1Trigger.DTTriggerPhase2.CalibratedDigis_cfi") 
+process.load("L1Trigger.DTTriggerPhase2.dtTriggerPhase2PrimitiveDigis_cfi")
 
 process.CalibratedDigis.dtDigiTag = "simMuonDTDigis"
 process.dtTriggerPhase2AmPrimitiveDigis = process.dtTriggerPhase2PrimitiveDigis.clone()
 process.dtTriggerPhase2AmPrimitiveDigis.useRPC = True
 
-process.load('L1Trigger.DTHoughTPG.DTTPG_cfi')
-
-process.dtTriggerPhase2HbPrimitiveDigis = process.DTTPG.clone()
-process.dtTriggerPhase2HbPrimitiveDigis.FirstBX = cms.untracked.int32(20)
-process.dtTriggerPhase2HbPrimitiveDigis.LastBX = cms.untracked.int32(20)
-
 process.load('RecoLocalMuon.Configuration.RecoLocalMuon_cff')
 process.dt1DRecHits.dtDigiLabel = "simMuonDTDigis"
 process.rpcRecHits.rpcDigiLabel = "simMuonRPCDigis"
 
-process.load('Configuration.StandardSequences.SimL1Emulator_cff')
+from Configuration.StandardSequences.SimL1Emulator_cff import simBmtfDigis
+process.simBmtfDigis = simBmtfDigis
 process.simBmtfDigis.DTDigi_Source = "simDtTriggerPrimitiveDigis"
 process.simBmtfDigis.DTDigi_Theta_Source = "simDtTriggerPrimitiveDigis"
 
@@ -152,7 +147,6 @@
                      + process.CalibratedDigis
                      + process.simBmtfDigis
                      + process.dtTriggerPhase2AmPrimitiveDigis
-                     + process.dtTriggerPhase2HbPrimitiveDigis
                      + process.dtNtupleProducer)
 
 from DTDPGAnalysis.DTNtuples.customiseDtNtuples_cff import customiseForRandomBkg, customiseForRunningOnMC, customiseForFakePhase2Info, customiseForAgeing

diff --git a/test/dtDpgNtuples_slicetest_cfg.py b/test/dtDpgNtuples_slicetest_cfg.py
@@ -27,7 +27,7 @@ def appendToGlobalTag(process, rcd, tag, fileName, label) :
 options = VarParsing.VarParsing()
 
 options.register('globalTag',
-                 '110X_dataRun3_HLT_v1', #default value
+                 '111X_dataRun3_Prompt_v1', #default value
                  VarParsing.VarParsing.multiplicity.singleton,
                  VarParsing.VarParsing.varType.string,
                  "Global Tag")