Skip to content

Commit 7052146

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47825 from bsunanda/Run3-gex188A
Run3-gex188A Update the scenario for 2025
2 parents 0e1856e + 5d11a78 commit 7052146

16 files changed

+1829
-110
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,30 @@ The script also handles the common and forward elements of the geometry:
6464
* F3: same as F2 with added simulti geometry for RPD
6565

6666
Several detector combinations have been generated:
67-
* 2021 = T3+C3+M9+P7+O6+F1
67+
* 2021 = T3+C3+M13+P7+O7+F1
6868
* 2021ZeroMaterial = T4+C1+M9+P7+O4+F1
6969
* 2021FlatMinus05Percent = T5+C1+M9+P7+O5+F1
7070
* 2021FlatMinus10Percent = T6+C1+M9+P7+O5+F1
7171
* 2021FlatPlus05Percent = T7+C1+M9+P7+O5+F1
7272
* 2021FlatPlus10Percent = T8+C1+M9+P7+O5+F1
73-
* 2023 = T3+C2+M10+P7+O6+F3
73+
* 2023 = T3+C2+M14+P7+O7+F3
7474
* 2023ZeroMaterial = T4+C1+M10+P7+O4+F2
7575
* 2023FlatMinus05Percent = T5+C1+M10+P7+O5+F2
7676
* 2023FlatMinus10Percent = T6+C1+M10+P7+O5+F2
7777
* 2023FlatPlus05Percent = T7+C1+M10+P7+O5+F2
7878
* 2023FlatPlus10Percent = T8+C1+M10+P7+O5+F2
79-
* 2024 = T3+C2+M11+P7+O6+F3
79+
* 2024 = T3+C2+M15+P7+O7+F3
8080
* 2024ZeroMaterial = T4+C2+M11+P7+O4+F2
8181
* 2024FlatMinus05Percent = T5+C2+M11+P7+O5+F2
8282
* 2024FlatMinus10Percent = T6+C2+M11+P7+O5+F2
8383
* 2024FlatPlus05Percent = T7+C2+M11+P7+O5+F2
8484
* 2024FlatPlus10Percent = T8+C2+M11+P7+O5+F2
85-
* 2025 = T3+C2+M12+P7+O7+F3
86-
* 2025ZeroMaterial = T4+C2+M12+P7+O8+F3
87-
* 2025FlatMinus05Percent = T5+C2+M12+P7+O9+F3
88-
* 2025FlatMinus10Percent = T6+C2+M12+P7+O9+F3
89-
* 2025FlatPlus05Percent = T7+C2+M12+P7+O9+F3
90-
* 2025FlatPlus10Percent = T8+C2+M12+P7+O9+F3
85+
* 2025 = T3+C2+M16+P8+O7+F3
86+
* 2025ZeroMaterial = T4+C2+M12+P8+O8+F3
87+
* 2025FlatMinus05Percent = T5+C2+M12+P8+O9+F3
88+
* 2025FlatMinus10Percent = T6+C2+M12+P8+O9+F3
89+
* 2025FlatPlus05Percent = T7+C2+M12+P8+O9+F3
90+
* 2025FlatPlus10Percent = T8+C2+M12+P8+O9+F3
9191

9292
# Phase 2 Geometries
9393

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@
23042304
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
23052305
'Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml',
23062306
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2307-
'Geometry/MuonCommonData/data/gem11/2025/v1/gem11.xml',
2307+
'Geometry/MuonCommonData/data/gem11/2025/v2/gem11.xml',
23082308
'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
23092309
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
23102310
'Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml',
@@ -2598,12 +2598,12 @@
25982598
'Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml',
25992599
'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml',
26002600
'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml',
2601-
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml',
2602-
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml',
2603-
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml',
2604-
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml',
2605-
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml',
2606-
'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml',
2601+
'Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml',
2602+
'Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml',
2603+
'Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml',
2604+
'Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml',
2605+
'Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml',
2606+
'Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml',
26072607
'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
26082608
'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
26092609
'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
@@ -2635,7 +2635,7 @@
26352635
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
26362636
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
26372637
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml',
2638-
'Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
2638+
'Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
26392639
],
26402640
"sim" : [
26412641

@@ -2667,12 +2667,12 @@
26672667
("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",
26682668
("O5","T7","C2","M11","F2","P7") : "2024FlatPlus05Percent",
26692669
("O5","T8","C2","M11","F2","P7") : "2024FlatPlus10Percent",
2670-
("O7","T3","C2","M12","F3","P7") : "2025",
2671-
("O8","T4","C2","M12","F3","P7") : "2025ZeroMaterial",
2672-
("O9","T5","C2","M12","F3","P7") : "2025FlatMinus05Percent",
2673-
("O9","T6","C2","M12","F3","P7") : "2025FlatMinus10Percent",
2674-
("O9","T7","C2","M12","F3","P7") : "2025FlatPlus05Percent",
2675-
("O9","T8","C2","M12","F3","P7") : "2025FlatPlus10Percent",
2670+
("O7","T3","C2","M16","F3","P8") : "2025",
2671+
("O8","T4","C2","M12","F3","P8") : "2025ZeroMaterial",
2672+
("O9","T5","C2","M12","F3","P8") : "2025FlatMinus05Percent",
2673+
("O9","T6","C2","M12","F3","P8") : "2025FlatMinus10Percent",
2674+
("O9","T7","C2","M12","F3","P8") : "2025FlatPlus05Percent",
2675+
("O9","T8","C2","M12","F3","P8") : "2025FlatPlus10Percent",
26762676
}
26772677

26782678
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4", "M5"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248-
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
248+
<Include ref='Geometry/MuonCommonData/data/gem11/2025/v2/gem11.xml'/>
249249
<Include ref='Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml'/>
@@ -314,12 +314,12 @@
314314
<Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
315315
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
316316
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
317-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
318-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
319-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
320-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
321-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
322-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
317+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml'/>
318+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml'/>
319+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml'/>
320+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml'/>
321+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml'/>
322+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
323323
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
324324
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
325325
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
@@ -351,7 +351,7 @@
351351
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
352352
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
353353
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
354-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
354+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
355355
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
356356
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
357357
<Include ref='Geometry/HcalSimData/data/hf.xml'/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@
314314
<Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
315315
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
316316
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
317-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
318-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
319-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
320-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
321-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
322-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
317+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml'/>
318+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml'/>
319+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml'/>
320+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml'/>
321+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml'/>
322+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
323323
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
324324
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
325325
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
@@ -351,7 +351,7 @@
351351
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
352352
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
353353
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
354-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
354+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
355355
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
356356
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
357357
<Include ref='Geometry/HcalSimData/data/hf.xml'/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@
314314
<Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
315315
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
316316
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
317-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
318-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
319-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
320-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
321-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
322-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
317+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml'/>
318+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml'/>
319+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml'/>
320+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml'/>
321+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml'/>
322+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
323323
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
324324
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
325325
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
@@ -351,7 +351,7 @@
351351
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
352352
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
353353
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
354-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
354+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
355355
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
356356
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
357357
<Include ref='Geometry/HcalSimData/data/hf.xml'/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@
314314
<Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
315315
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
316316
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
317-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
318-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
319-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
320-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
321-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
322-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
317+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml'/>
318+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml'/>
319+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml'/>
320+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml'/>
321+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml'/>
322+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
323323
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
324324
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
325325
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
@@ -351,7 +351,7 @@
351351
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
352352
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
353353
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
354-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
354+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
355355
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
356356
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
357357
<Include ref='Geometry/HcalSimData/data/hf.xml'/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@
314314
<Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
315315
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
316316
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
317-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
318-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
319-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
320-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
321-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
322-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
317+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Right_Station.xml'/>
318+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_220_Left_Station.xml'/>
319+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Right_Station.xml'/>
320+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_210_Left_Station.xml'/>
321+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Stations/Simu/v1/CTPPS_Stations_Assembly.xml'/>
322+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
323323
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
324324
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
325325
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
@@ -351,7 +351,7 @@
351351
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
352352
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
353353
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
354-
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
354+
<Include ref='Geometry/VeryForwardData/data/CTPPS_2025/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
355355
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
356356
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
357357
<Include ref='Geometry/HcalSimData/data/hf.xml'/>

0 commit comments

Comments
 (0)