Skip to content

Commit 39c19f6

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48165 from bsunanda/Phase2-hgx364
Phase2-hgx364 Make a new scenario Run4D121 using D116 + corrected RPC with the corresponding workflow 34434.0
2 parents e3eede9 + 607ea94 commit 39c19f6

File tree

11 files changed

+468
-0
lines changed

11 files changed

+468
-0
lines changed

‎Configuration/Geometry/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Muon system:
144144
* M13: same as M10 with right front-back relation between alternate phi segments
145145
* M14: same as M11 with right front-back relation between alternate phi segments
146146
* M15: same as M12 with right front-back relation between alternate phi segments
147+
* M16: same as M15 with reverting RPC endcap disk4 rotation
147148

148149
Fast Timing system:
149150
* I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments
@@ -202,3 +203,4 @@ Several detector combinations have been generated:
202203
* D118 = T35+C25+M15+I19+O10+F9
203204
* D119 = T35+C25+M15+I20+O10+F9
204205
* D120 = T35+C26+M15+I20+O10+F9
206+
* D121 = T35+C25+M16+I17+O10+F9

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D121Reco_cff.py

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryDD4hepExtendedRun4D121_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
12+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
13+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
14+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
15+
trackerGeometry.applyAlignment = True
16+
17+
# calo
18+
from Geometry.CaloEventSetup.HGCalTopology_cfi import *
19+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
20+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
21+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
22+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
23+
SelectedCalos = cms.vstring("HCAL",
24+
"ZDC",
25+
"EcalBarrel",
26+
"TOWER",
27+
"HGCalEESensitive",
28+
"HGCalHESiliconSensitive",
29+
"HGCalHEScintillatorSensitive"
30+
)
31+
)
32+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
33+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
35+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
36+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
37+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
38+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
39+
from Geometry.EcalMapping.EcalMapping_cfi import *
40+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
41+
42+
# muon
43+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
44+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
45+
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
46+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
47+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
48+
49+
# forward
50+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
51+
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
52+
53+
# timing
54+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
55+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
56+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
57+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
58+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
59+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
60+
mtdGeometry.applyAlignment = False
61+

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D121_cff.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryDD4hep_cff import *
7+
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D121.xml")
8+
9+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
10+
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
11+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
12+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
13+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
14+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
15+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
16+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
17+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/GeometryExtendedRun4D121Reco_cff.py

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryExtendedRun4D121_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
12+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
13+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
14+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
15+
trackerGeometry.applyAlignment = True
16+
17+
# calo
18+
from Geometry.CaloEventSetup.HGCalTopology_cfi import *
19+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
20+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
21+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
22+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
23+
SelectedCalos = cms.vstring("HCAL",
24+
"ZDC",
25+
"EcalBarrel",
26+
"TOWER",
27+
"HGCalEESensitive",
28+
"HGCalHESiliconSensitive",
29+
"HGCalHEScintillatorSensitive"
30+
)
31+
)
32+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
33+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
35+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
36+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
37+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
38+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
39+
from Geometry.EcalMapping.EcalMapping_cfi import *
40+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
41+
42+
# muon
43+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
44+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
45+
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
46+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
47+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
48+
49+
# forward
50+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
51+
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
52+
53+
# timing
54+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
55+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
56+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
57+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
58+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
59+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
60+
mtdGeometry.applyAlignment = False
61+

‎Configuration/Geometry/python/GeometryExtendedRun4D121_cff.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D121XML_cfi import *
7+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
8+
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
9+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
10+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
11+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
12+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
13+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
14+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
15+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/dictRun4Geometry.py

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,53 @@
14361436
],
14371437
"era" : "phase2_muon, phase2_GEM, phase2_GE0",
14381438
},
1439+
"M16" : {
1440+
1 : [
1441+
'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
1442+
'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
1443+
'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
1444+
'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
1445+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
1446+
'Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml',
1447+
'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
1448+
'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
1449+
'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
1450+
'Geometry/MuonCommonData/data/rpcf/2030/v6/rpcf.xml',
1451+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
1452+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1453+
'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
1454+
'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
1455+
'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml',
1456+
'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
1457+
],
1458+
2 : [
1459+
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
1460+
],
1461+
3 : [
1462+
'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
1463+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
1464+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
1465+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
1466+
'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
1467+
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
1468+
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
1469+
],
1470+
4 : [
1471+
'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
1472+
],
1473+
"sim" : [
1474+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
1475+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
1476+
],
1477+
"reco" : [
1478+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
1479+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
1480+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
1481+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
1482+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
1483+
],
1484+
"era" : "phase2_muon, phase2_GEM, phase2_GE0",
1485+
},
14391486
}
14401487

14411488
forwardDict = {
@@ -1720,6 +1767,7 @@
17201767
("O10","T35","C25","M15","F9","I19") : "D118",
17211768
("O10","T35","C25","M15","F9","I20") : "D119",
17221769
("O10","T35","C26","M15","F9","I20") : "D120",
1770+
("O10","T35","C25","M16","F9","I17") : "D121",
17231771
}
17241772

17251773
deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"])

‎Configuration/PyReleaseValidation/python/relval_Run4.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
numWFIB.extend([33234.0]) #Run4D118
4141
numWFIB.extend([33634.0]) #Run4D119
4242
numWFIB.extend([34034.0]) #Run4D120
43+
numWFIB.extend([34434.0]) #Run4D121
4344

4445
#Additional sample for short matrix and IB
4546
#Default Phase-2 Det NoPU

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
'Run4D119PU',
106106
'Run4D120',
107107
'Run4D120PU',
108+
'Run4D121',
109+
'Run4D121PU',
108110
]
109111

110112
# pre-generation of WF numbers
@@ -3529,6 +3531,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
35293531
'Era' : 'Phase2C22I13M9',
35303532
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
35313533
},
3534+
'Run4D121' : {
3535+
'Geom' : 'ExtendedRun4D121',
3536+
'HLTmenu': '@relvalRun4',
3537+
'GT' : 'auto:phase2_realistic_T33',
3538+
'Era' : 'Phase2C22I13M9',
3539+
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
3540+
},
35323541
}
35333542

35343543
# standard PU sequences

‎Configuration/StandardSequences/python/GeometryConf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,6 @@
138138
'DD4hepExtendedRun4D119' : 'DD4hepExtendedRun4D119,DD4hepExtendedRun4D119Reco',
139139
'ExtendedRun4D120' : 'ExtendedRun4D120,ExtendedRun4D120Reco',
140140
'DD4hepExtendedRun4D120' : 'DD4hepExtendedRun4D120,DD4hepExtendedRun4D120Reco',
141+
'ExtendedRun4D121' : 'ExtendedRun4D121,ExtendedRun4D121Reco',
142+
'DD4hepExtendedRun4D121' : 'DD4hepExtendedRun4D121,DD4hepExtendedRun4D121Reco',
141143
}

0 commit comments

Comments
 (0)