Skip to content

Commit 6c32981

Browse files
author
Sunanda
committed
Add the complete list of the new PPS XML files and make muon set with the unmounted GE11
1 parent 8ed7282 commit 6c32981

File tree

2 files changed

+146
-1
lines changed

2 files changed

+146
-1
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ Muon system:
4646
* M13: Same as M9 with modified DTShield
4747
* M14: Same as M10 with modified DTShield
4848
* M15: Same as M11 with modified DTShield
49+
* M16: Same as M12 with unmounted GE11 for 2025
4950

5051
PPS:
5152
* P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
53+
* P8: First 2025 version with the rotated PPS detectors
5254

5355
The script also handles the common and forward elements of the geometry:
5456
* O4: as O6, but with zero material

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 144 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2292,6 +2292,51 @@
22922292
],
22932293
"era" : "run3_GEM",
22942294
},
2295+
"M16" : {
2296+
1 : [
2297+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2298+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2299+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2300+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2301+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2302+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2303+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2304+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2305+
'Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml',
2306+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2307+
'Geometry/MuonCommonData/data/gem11/2025/v1/gem11.xml',
2308+
'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
2309+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2310+
'Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml',
2311+
],
2312+
2 : [
2313+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
2314+
],
2315+
3 : [
2316+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2317+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2318+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2319+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2320+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2321+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2322+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2323+
],
2324+
4 : [
2325+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2326+
],
2327+
"sim" : [
2328+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2329+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2330+
],
2331+
"reco" : [
2332+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2333+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2334+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2335+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2336+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2337+
],
2338+
"era" : "run3_GEM",
2339+
},
22952340
}
22962341

22972342
forwardDict = {
@@ -2402,7 +2447,7 @@
24022447
ppsDict = {
24032448
"abbrev" : "P",
24042449
"name" : "pps",
2405-
"default" : 7,
2450+
"default" : 8,
24062451
"P7" : {
24072452
2 : [
24082453
'Geometry/VeryForwardData/data/RP_Box.xml',
@@ -2499,6 +2544,104 @@
24992544
],
25002545
"reco" :[
25012546

2547+
],
2548+
},
2549+
"P8" : {
2550+
2 : [
2551+
'Geometry/VeryForwardData/data/RP_Box.xml',
2552+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
2553+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
2554+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
2555+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
2556+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
2557+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
2558+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
2559+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
2560+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml',
2561+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
2562+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
2563+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
2564+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
2565+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
2566+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
2567+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
2568+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
2569+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
2570+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
2571+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
2572+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml',
2573+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
2574+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
2575+
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
2576+
'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
2577+
'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
2578+
'Geometry/VeryForwardData/data/RP_Transformations.xml',
2579+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
2580+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
2581+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
2582+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
2583+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
2584+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
2585+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
2586+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
2587+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
2588+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
2589+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
2590+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
2591+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
2592+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
2593+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
2594+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
2595+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
2596+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
2597+
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
2598+
'Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml',
2599+
'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml',
2600+
'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',
2607+
'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
2608+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
2609+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
2610+
'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
2611+
'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
2612+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
2613+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
2614+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
2615+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
2616+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
2617+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
2618+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
2619+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
2620+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
2621+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
2622+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
2623+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
2624+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
2625+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
2626+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
2627+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
2628+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml',
2629+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
2630+
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
2631+
'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
2632+
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
2633+
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
2634+
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
2635+
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
2636+
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
2637+
'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',
2639+
],
2640+
"sim" : [
2641+
2642+
],
2643+
"reco" :[
2644+
25022645
],
25032646
},
25042647
}

0 commit comments

Comments
 (0)