-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Phase2-hgx252 Make the new algorithm for dd4hep #30593
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
<?xml version="1.0"?> | ||
<DDDefinition> | ||
<open_geometry/> | ||
<close_geometry/> | ||
|
||
<IncludeSection> | ||
<Include ref="Geometry/CMSCommonData/data/materials.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/extend/cmsextent.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cms/2026/v4/cms.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v4/caloBase.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/mgnt.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/ebcon.xml"/> | ||
<Include ref="Geometry/EcalCommonData/data/ebrot.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcal/v13/hgcal.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v14/hgcalEE.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v14/hgcalHEsil.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v14/hgcalHEmix.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalCons/v13/hgcalCons.xml"/> | ||
<Include ref="Geometry/HGCalCommonData/data/hgcalConsData/v13/hgcalConsData.xml"/> | ||
<Include ref="Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/csc/2021/v2/csc.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mf/2026/v6/mf.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/mfshield/2026/v3/mfshield.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml"/> | ||
<Include ref="Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml"/> | ||
<Include ref="Geometry/EcalSimData/data/PhaseII/ecalsens.xml"/> | ||
<Include ref="Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml"/> | ||
<Include ref="Geometry/HcalSimData/data/hf.xml"/> | ||
<Include ref="Geometry/HcalSimData/data/hfpmt.xml"/> | ||
<Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/> | ||
<Include ref="Geometry/HcalSimData/data/CaloUtil.xml"/> | ||
<Include ref="Geometry/HGCalSimData/data/hgcsensv9.xml"/> | ||
<Include ref="Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml"/> | ||
<Include ref="Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml"/> | ||
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/> | ||
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/> | ||
<Include ref="Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml"/> | ||
<Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml"/> | ||
<Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml"/> | ||
<Include ref="Geometry/HcalSimData/data/HcalProdCuts.xml"/> | ||
<Include ref="Geometry/EcalSimData/data/EcalProdCuts.xml"/> | ||
<Include ref="Geometry/HGCalSimData/data/hgcProdCutsv9.xml"/> | ||
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/> | ||
<Include ref="Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml"/> | ||
</IncludeSection> | ||
|
||
</DDDefinition> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't the latest materials.xml be used rather than the obsolete one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cvuosalo Carl can you approve this PR. I shall modify the xml file in the next PR. It needs other changes as well because of overlap issues.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also need #30654 to be integrates and then I shall make a new PR correcting this scenario as well where I can correct the material file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's fine to fix the materials.xml reference in a later PR.