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

Run3-gex174 Add RPD in the latest version of 2023 Gemetry as requested by the ZDC group for the next HI simulation effort #43418

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Run3-gex174 Add RPD in the latest version of 2023 Gemetry as requested by the ZDC group for the next HI simulation effort #43418

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Configuration/Geometry/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ The script also handles the common and forward elements of the geometry:
* O5: as O6, but with trackermaterial removed (they are in T5, T6, T7, T8)
* O6: 2021 baseline
* F1: 2021 baseline
* F2: same as F1 with modified file from ZDC group
* F2: same as F1 with modified file zdc.xmlfrom ZDC group
* F3: same as F2 with added simulti geometry for RPD

Several detector combinations have been generated:
* 2021 = T3+C1+M1+P7+O6+F1
Expand All @@ -51,7 +52,7 @@ Several detector combinations have been generated:
* 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
* 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
* 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
* 2023 = T3+C1+M2+P7+O6+F2
* 2023 = T3+C1+M2+P7+O6+F3
* 2023ZeroMaterial = T4+C1+M1+P7+O4+F2
* 2023FlatMinus05Percent = T5+C1+M1+P7+O5+F2
* 2023FlatMinus10Percent = T6+C1+M1+P7+O5+F2
Expand Down
37 changes: 35 additions & 2 deletions Configuration/Geometry/python/dict2021Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@
forwardDict = {
"abbrev" : "F",
"name" : "forward",
"default" : 2,
"default" : 3,
"F1" : {
2 : [
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
Expand Down Expand Up @@ -1551,6 +1551,39 @@
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
]
},
"F3" : {
2 : [
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/bhm.xml',
'Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml',
'Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml',
'Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml',
'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
],
3 : [
'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
'Geometry/ForwardCommonData/data/bhmsens.xml',
'Geometry/ForwardSimData/data/pltsens.xml',
'Geometry/ForwardSimData/data/bcm1fsens.xml',
'Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml',
],
4 : [
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
],
"reco" :[
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
]
},
}

ppsDict = {
Expand Down Expand Up @@ -1666,7 +1699,7 @@
("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
("O6","T3","C1","M2","F2","P7") : "2023",
("O6","T3","C1","M2","F3","P7") : "2023",
("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml'/>
Expand Down Expand Up @@ -369,14 +369,14 @@
<Include ref='Geometry/ForwardCommonData/data/bhmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/pltsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/bcm1fsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/ESProdCuts.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
</DDDefinition>
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
Expand Down Expand Up @@ -372,14 +372,14 @@
'Geometry/ForwardCommonData/data/bhmsens.xml',
'Geometry/ForwardSimData/data/pltsens.xml',
'Geometry/ForwardSimData/data/bcm1fsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml',
),
rootNodeName = cms.string('cms:OCMS')
Expand Down