Skip to content

Commit 5766f9c

Browse files
author
Sunanda
committed
Update some of the scenarios so that the no-gap solution for V18 and beyond scenarios have no overlap issues
1 parent 69e8253 commit 5766f9c

14 files changed

+49
-49
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Several detector combinations have been generated:
204204
* D117 = T35+C25+M15+I18+O10+F9
205205
* D118 = T35+C25+M15+I19+O10+F9
206206
* D119 = T35+C25+M15+I20+O10+F9
207-
* D120 = T35+C26+M15+I20+O10+F9
208-
* D121 = T35+C25+M16+I17+O10+F9
209-
* D122 = T35+C27+M15+I20+O10+F9
210-
* D123 = T35+C28+M15+I20+O10+F9
207+
* D120 = T35+C26+M16+I20+O10+F9
208+
* D121 = T35+C25+M16+I18+O10+F9
209+
* D122 = T35+C27+M16+I18+O10+F9
210+
* D123 = T35+C28+M16+I18+O10+F9

‎Configuration/Geometry/python/dictRun4Geometry.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,12 +1084,12 @@
10841084
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
10851085
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
10861086
'Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml',
1087-
'Geometry/HGCalCommonData/data/hgcalwafer/v18ng/hgcalwafer.xml',
1088-
'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml',
1087+
'Geometry/HGCalCommonData/data/hgcalwafer/v18ngr/hgcalwafer.xml',
1088+
'Geometry/HGCalCommonData/data/hgcalPassive/v18ng/hgcalPassive.xml',
10891089
'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml',
10901090
'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml',
10911091
'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml',
1092-
'Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml',
1092+
'Geometry/HGCalCommonData/data/hgcalCons/v18ng/hgcalCons.xml',
10931093
'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
10941094
],
10951095
3 : [
@@ -1381,7 +1381,7 @@
13811381
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
13821382
'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
13831383
'Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml',
1384-
'Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml',
1384+
'Geometry/HGCalCommonData/data/hgcalwafer/v19ngr/hgcalwafer.xml',
13851385
'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
13861386
'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
13871387
'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
@@ -1396,7 +1396,7 @@
13961396
'Geometry/HcalSimData/data/hfpmt.xml',
13971397
'Geometry/HcalSimData/data/hffibrebundle.xml',
13981398
'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
1399-
'Geometry/HGCalSimData/data/hgcsensv15.xml',
1399+
'Geometry/HGCalSimData/data/hgcsensv19n.xml',
14001400
],
14011401
4 : [
14021402
'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
@@ -1989,10 +1989,10 @@
19891989
("O10","T35","C25","M15","F9","I18") : "D117",
19901990
("O10","T35","C25","M15","F9","I19") : "D118",
19911991
("O10","T35","C25","M15","F9","I20") : "D119",
1992-
("O10","T35","C26","M15","F9","I20") : "D120",
1993-
("O10","T35","C25","M16","F9","I17") : "D121",
1994-
("O10","T35","C27","M15","F9","I20") : "D122",
1995-
("O10","T35","C28","M15","F9","I20") : "D123",
1992+
("O10","T35","C26","M16","F9","I20") : "D120",
1993+
("O10","T35","C25","M16","F9","I18") : "D121",
1994+
("O10","T35","C27","M16","F9","I18") : "D122",
1995+
("O10","T35","C28","M16","F9","I18") : "D123",
19961996
}
19971997

19981998
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"])

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
5959
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml'/>
61-
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v18ng/hgcalwafer.xml'/>
62-
<Include ref='Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml'/>
61+
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v18ngr/hgcalwafer.xml'/>
62+
<Include ref='Geometry/HGCalCommonData/data/hgcalPassive/v18ng/hgcalPassive.xml'/>
6363
<Include ref='Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml'/>
6464
<Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml'/>
6565
<Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml'/>
66-
<Include ref='Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml'/>
66+
<Include ref='Geometry/HGCalCommonData/data/hgcalCons/v18ng/hgcalCons.xml'/>
6767
<Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml'/>
6868
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
6969
<Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D120.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
7777
<Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
7878
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
79-
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml'/>
79+
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v6/rpcf.xml'/>
8080
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
8181
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
8282
<Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D121.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@
9191
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
9292
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
9393
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
94-
<Include ref='Geometry/MTDCommonData/data/btl/v3/btl.xml'/>
94+
<Include ref='Geometry/MTDCommonData/data/btl/v4/btl.xml'/>
9595
<Include ref='Geometry/MTDCommonData/data/etl/v8/etl.xml'/>
96-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v5/mtdStructureTopology.xml'/>
97-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v5/mtdParameters.xml'/>
96+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml'/>
97+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100100
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D122.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
7676
<Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
7777
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
78-
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml'/>
78+
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v6/rpcf.xml'/>
7979
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
8080
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
8181
<Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
@@ -92,9 +92,9 @@
9292
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
9393
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
9494
<Include ref='Geometry/MTDCommonData/data/btl/v4/btl.xml'/>
95-
<Include ref='Geometry/MTDCommonData/data/etl/v10/etl.xml'/>
96-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml'/>
97-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml'/>
95+
<Include ref='Geometry/MTDCommonData/data/etl/v8/etl.xml'/>
96+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml'/>
97+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100100
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D123.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml'/>
6161
<Include ref='Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml'/>
62-
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml'/>
62+
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v19ngr/hgcalwafer.xml'/>
6363
<Include ref='Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml'/>
6464
<Include ref='Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml'/>
6565
<Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml'/>
@@ -75,7 +75,7 @@
7575
<Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
7676
<Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
7777
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
78-
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml'/>
78+
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v6/rpcf.xml'/>
7979
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
8080
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
8181
<Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
@@ -92,17 +92,17 @@
9292
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
9393
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
9494
<Include ref='Geometry/MTDCommonData/data/btl/v4/btl.xml'/>
95-
<Include ref='Geometry/MTDCommonData/data/etl/v10/etl.xml'/>
96-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml'/>
97-
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml'/>
95+
<Include ref='Geometry/MTDCommonData/data/etl/v8/etl.xml'/>
96+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml'/>
97+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100100
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
101101
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
104104
<Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
105-
<Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
105+
<Include ref='Geometry/HGCalSimData/data/hgcsensv19n.xml'/>
106106
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
107107
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
108108
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>

‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
6060
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
6161
'Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml',
62-
'Geometry/HGCalCommonData/data/hgcalwafer/v18ng/hgcalwafer.xml',
63-
'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml',
62+
'Geometry/HGCalCommonData/data/hgcalwafer/v18ngr/hgcalwafer.xml',
63+
'Geometry/HGCalCommonData/data/hgcalPassive/v18ng/hgcalPassive.xml',
6464
'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml',
6565
'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml',
6666
'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml',
67-
'Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml',
67+
'Geometry/HGCalCommonData/data/hgcalCons/v18ng/hgcalCons.xml',
6868
'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
6969
'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
7070
'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D120XML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
7878
'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
7979
'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
80-
'Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml',
80+
'Geometry/MuonCommonData/data/rpcf/2030/v6/rpcf.xml',
8181
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
8282
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
8383
'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D121XML_cfi.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
9393
'Geometry/ForwardCommonData/data/cmszdc.xml',
9494
'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
95-
'Geometry/MTDCommonData/data/btl/v3/btl.xml',
95+
'Geometry/MTDCommonData/data/btl/v4/btl.xml',
9696
'Geometry/MTDCommonData/data/etl/v8/etl.xml',
97-
'Geometry/MTDCommonData/data/mtdParameters/v5/mtdStructureTopology.xml',
98-
'Geometry/MTDCommonData/data/mtdParameters/v5/mtdParameters.xml',
97+
'Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml',
98+
'Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml',
9999
)+
100100
cms.vstring(
101101
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',

0 commit comments

Comments
 (0)