-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Run3-gex93B Modify Run3 and Phase2D86 geometry due to change in some material xml files (Backport #35290) #35292
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
Merged
Merged
Changes from all commits
Commits
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
154 changes: 154 additions & 0 deletions
154
Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml
This file contains hidden or 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,154 @@ | ||
| <?xml version="1.0"?> | ||
| <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../../DetectorDescription/Schema/DDLSchema.xsd"> | ||
|
|
||
| <MaterialSection label="ectkcablematerial.xml"> | ||
| <CompositeMaterial name="TS_PowerCable" density="4.02080*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.10028"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.89972"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="TS_SignalCable" density="3.13035*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.10018"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.89982"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="CAB_Al60" density="1.37448*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.29872"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.35518"> | ||
| <rMaterial name="materials:Aluminium" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.2691"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.02224"> | ||
| <rMaterial name="materials:T_Kapton" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.05475"> | ||
| <rMaterial name="materials:Silver" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="CAB_Al48" density="1.14748*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.31894"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.32994"> | ||
| <rMaterial name="materials:Aluminium" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.28131"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.02411"> | ||
| <rMaterial name="materials:T_Kapton" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.0457"> | ||
| <rMaterial name="materials:Silver" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="CAB_Al36" density="1.06783*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.32521"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.31456"> | ||
| <rMaterial name="materials:Aluminium" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.29435"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.02564"> | ||
| <rMaterial name="materials:T_Kapton" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.04024"> | ||
| <rMaterial name="materials:Silver" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="T_C6F14_F2_-30C" density="1.87917*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="1.00000000"> | ||
| <rMaterial name="materials:C6F14" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="T_RuggRibbon" density="0.83457*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.67776"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.13932"> | ||
| <rMaterial name="materials:Kevlar" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.13768"> | ||
| <rMaterial name="materials:Acrylate" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.04524"> | ||
| <rMaterial name="materials:Silica" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="Tk_Cables_PP1" density="2.07590*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.00998"> | ||
| <rMaterial name="ectkcablemat:TS_PowerCable" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.06704"> | ||
| <rMaterial name="materials:Steel-008" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0"> | ||
| <rMaterial name="materials:C6F14_3M_-15C" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.22783"> | ||
| <rMaterial name="ectkcablemat:CAB_Al60" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.01863"> | ||
| <rMaterial name="materials:Polyethylene" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.13358"> | ||
| <rMaterial name="ectkcablemat:T_C6F14_F2_-30C" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.10686"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.08857"> | ||
| <rMaterial name="ectkcablemat:T_RuggRibbon" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.12643"> | ||
| <rMaterial name="ectkcablemat:CAB_Al48" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.21136"> | ||
| <rMaterial name="ectkcablemat:CAB_Al36" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.00972"> | ||
| <rMaterial name="ectkcablemat:TS_SignalCable" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| <CompositeMaterial name="Tk_Connectors_PP1" density="0.30245*g/cm3" method="mixture by weight" symbol=" "> | ||
| <MaterialFraction fraction="0.22194"> | ||
| <rMaterial name="ectkcablemat:CAB_Al36" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.08451"> | ||
| <rMaterial name="ectkcablemat:CAB_Al48" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.27443"> | ||
| <rMaterial name="ectkcablemat:CAB_Al60" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.14866"> | ||
| <rMaterial name="ectkcablemat:T_RuggRibbon" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.01320"> | ||
| <rMaterial name="materials:Copper" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.22420"> | ||
| <rMaterial name="ectkcablemat:T_C6F14_F2_-30C" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.01676"> | ||
| <rMaterial name="ectkcablemat:TS_PowerCable" /> | ||
| </MaterialFraction> | ||
| <MaterialFraction fraction="0.01631"> | ||
| <rMaterial name="ectkcablemat:TS_SignalCable" /> | ||
| </MaterialFraction> | ||
| </CompositeMaterial> | ||
| </MaterialSection> | ||
|
|
||
| </DDDefinition> |
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.
Just trying to understand how this backport was designed: this line is from #34983, and it was apparently forgotten in some previous backport of that PR merged in master: could you please explain the logic and the history of previous backports?
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.
We had a few PR for 12_1_X and these are combined in the backport PR. Please merge this PR. It is in the way of other back-outings