Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Including PPS into cmsExtended 2021 #30268

Merged
merged 1 commit into from Jun 17, 2020
Merged

Including PPS into cmsExtended 2021 #30268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
96 changes: 94 additions & 2 deletions Configuration/Geometry/python/dict2021Geometry.py
View file
Open in desktop
Expand Up @@ -392,15 +392,107 @@
"default" : 1,
"P1" : {
2 : [
'Geometry/VeryForwardData/data/pps/2021/v1/pps.xml',
'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
'Geometry/ForwardCommonData/data/totemRotations.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_103.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
'Geometry/VeryForwardData/data/RP_Hybrid.xml',
'Geometry/VeryForwardData/data/RP_Materials.xml',
'Geometry/VeryForwardData/data/RP_Transformations.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
'Geometry/VeryForwardData/data/RP_Device.xml',
'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
'Geometry/VeryForwardData/data/ppstrackerMaterials.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml',
'Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml',
],
"sim" : [

],
"reco" :[

],
"era" : "phase2_timing, phase2_timing_layer",
"era" : "run3_common, phase2_timing, phase2_timing_layer",
},
}

Expand Down
94 changes: 93 additions & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Open in desktop
Expand Up @@ -260,7 +260,99 @@
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v1/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/pps/2021/v1/pps.xml'/>
<Include ref='Geometry/ForwardCommonData/data/Run2/totemMaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/totemRotations.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_103.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Hybrid.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Materials.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
<Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down