Skip to content

Commit 590d5cd

Browse files
author
Sunanda
committed
Create the scenri for V19 (still under test)
1 parent 97dff05 commit 590d5cd

File tree

11 files changed

+502
-4
lines changed

11 files changed

+502
-4
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Calorimeters:
130130
* C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
131131
* C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
132132
* C25: sane as C18 but changing ebalgo.xml to make it more conformant with standard
133+
* C26: HGCal (v19 version of HGCal geometry with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D120)
133134

134135
Muon system:
135136
* M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
@@ -200,3 +201,4 @@ Several detector combinations have been generated:
200201
* D117 = T35+C25+M15+I18+O10+F9
201202
* D118 = T35+C25+M15+I19+O10+F9
202203
* D119 = T35+C25+M15+I20+O10+F9
204+
* D120 = T35+C26+M15+I20+O10+F9

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D120Reco_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.GeometryDD4hepExtendedRun4D120_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/GeometryDD4hepExtendedRun4D120_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/cmsExtendedGeometryRun4D120.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/GeometryExtendedRun4D120Reco_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.GeometryExtendedRun4D120_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/GeometryExtendedRun4D120_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.cmsExtendedGeometryRun4D120XML_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: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,81 @@
12131213
],
12141214
"era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose",
12151215
},
1216+
"C26" : {
1217+
1 : [
1218+
'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
1219+
'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
1220+
'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
1221+
'Geometry/EcalCommonData/data/ebalgo.xml',
1222+
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
1223+
'Geometry/EcalCommonData/data/ebrot.xml',
1224+
'Geometry/HcalCommonData/data/hcalrotations.xml',
1225+
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
1226+
'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
1227+
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
1228+
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
1229+
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
1230+
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
1231+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
1232+
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
1233+
'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
1234+
'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
1235+
'Geometry/HGCalCommonData/data/hgcalcell/v19/hgcalcell.xml',
1236+
'Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml',
1237+
'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
1238+
'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
1239+
'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
1240+
'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
1241+
'Geometry/HGCalCommonData/data/hgcalCons/v19/hgcalCons.xml',
1242+
'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
1243+
],
1244+
3 : [
1245+
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
1246+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
1247+
'Geometry/HcalSimData/data/hf.xml',
1248+
'Geometry/HcalSimData/data/hfpmt.xml',
1249+
'Geometry/HcalSimData/data/hffibrebundle.xml',
1250+
'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
1251+
'Geometry/HGCalSimData/data/hgcsensv15.xml',
1252+
],
1253+
4 : [
1254+
'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
1255+
'Geometry/EcalSimData/data/EcalProdCuts.xml',
1256+
'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
1257+
],
1258+
"sim" : [
1259+
'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
1260+
'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
1261+
'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
1262+
'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
1263+
],
1264+
"reco" : [
1265+
'from Geometry.CaloEventSetup.HGCalTopology_cfi import *',
1266+
'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
1267+
'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
1268+
'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
1269+
'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
1270+
' SelectedCalos = cms.vstring("HCAL",',
1271+
' "ZDC",',
1272+
' "EcalBarrel",',
1273+
' "TOWER",',
1274+
' "HGCalEESensitive",',
1275+
' "HGCalHESiliconSensitive",',
1276+
' "HGCalHEScintillatorSensitive"',
1277+
' )',
1278+
')',
1279+
'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
1280+
'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
1281+
'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
1282+
'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
1283+
'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
1284+
'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
1285+
'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
1286+
'from Geometry.EcalMapping.EcalMapping_cfi import *',
1287+
'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
1288+
],
1289+
"era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18",
1290+
},
12161291

12171292
}
12181293

@@ -1644,6 +1719,7 @@
16441719
("O10","T35","C25","M15","F9","I18") : "D117",
16451720
("O10","T35","C25","M15","F9","I19") : "D118",
16461721
("O10","T35","C25","M15","F9","I20") : "D119",
1722+
("O10","T35","C26","M15","F9","I20") : "D120",
16471723
}
16481724

16491725
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
@@ -39,6 +39,7 @@
3939
numWFIB.extend([32834.0]) #Run4D117
4040
numWFIB.extend([33234.0]) #Run4D118
4141
numWFIB.extend([33634.0]) #Run4D119
42+
numWFIB.extend([34034.0]) #Run4D120
4243

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

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
'Run4D118PU',
104104
'Run4D119',
105105
'Run4D119PU',
106+
'Run4D120',
107+
'Run4D120PU',
106108
]
107109

108110
# pre-generation of WF numbers
@@ -3389,28 +3391,35 @@ def condition(self, fragment, stepList, key, hasHarvest):
33893391
'Geom' : 'ExtendedRun4D116',
33903392
'HLTmenu': '@relvalRun4',
33913393
'GT' : 'auto:phase2_realistic_T33',
3392-
'Era' : 'Phase2C17I13M9',
3394+
'Era' : 'Phase2C22I13M9',
33933395
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
33943396
},
33953397
'Run4D117' : {
33963398
'Geom' : 'ExtendedRun4D117',
33973399
'HLTmenu': '@relvalRun4',
33983400
'GT' : 'auto:phase2_realistic_T33',
3399-
'Era' : 'Phase2C17I13M9',
3401+
'Era' : 'Phase2C22I13M9',
34003402
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
34013403
},
34023404
'Run4D118' : {
34033405
'Geom' : 'ExtendedRun4D118',
34043406
'HLTmenu': '@relvalRun4',
34053407
'GT' : 'auto:phase2_realistic_T33',
3406-
'Era' : 'Phase2C17I13M9',
3408+
'Era' : 'Phase2C22I13M9',
34073409
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
34083410
},
34093411
'Run4D119' : {
34103412
'Geom' : 'ExtendedRun4D119',
34113413
'HLTmenu': '@relvalRun4',
34123414
'GT' : 'auto:phase2_realistic_T33',
3413-
'Era' : 'Phase2C17I13M9',
3415+
'Era' : 'Phase2C22I13M9',
3416+
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
3417+
},
3418+
'Run4D120' : {
3419+
'Geom' : 'ExtendedRun4D120',
3420+
'HLTmenu': '@relvalRun4',
3421+
'GT' : 'auto:phase2_realistic_T33',
3422+
'Era' : 'Phase2C22I13M9',
34143423
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
34153424
},
34163425
}

‎Configuration/StandardSequences/python/GeometryConf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,6 @@
136136
'DD4hepExtendedRun4D118' : 'DD4hepExtendedRun4D118,DD4hepExtendedRun4D118Reco',
137137
'ExtendedRun4D119' : 'ExtendedRun4D119,ExtendedRun4D119Reco',
138138
'DD4hepExtendedRun4D119' : 'DD4hepExtendedRun4D119,DD4hepExtendedRun4D119Reco',
139+
'ExtendedRun4D120' : 'ExtendedRun4D120,ExtendedRun4D120Reco',
140+
'DD4hepExtendedRun4D120' : 'DD4hepExtendedRun4D120,DD4hepExtendedRun4D120Reco',
139141
}

0 commit comments

Comments
 (0)