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

MTD geometry: add test workflows for scenario D53, update material budget validation #28834

Merged
merged 3 commits into from
Feb 2, 2020
Merged

MTD geometry: add test workflows for scenario D53, update material budget validation #28834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad3a533
Add definition of workflows for scenario D53 (but not add to the IB m…
fabiocos Jan 28, 2020
472c9c7
Update MTD material budget data files for scenarios up to D50
fabiocos Jan 27, 2020
00f30f3
Update MTD material budget data files for scenario D53
fabiocos Jan 27, 2020
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
9 changes: 9 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
'2026D51PU',
'2026D52',
'2026D52PU',
'2026D53',
'2026D53PU',
]

# pre-generation of WF numbers
Expand Down Expand Up @@ -742,6 +744,13 @@ def workflow_(self, workflows, num, fragment, stepList):
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D53' : {
'Geom' : 'Extended2026D53',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
}

# standard PU sequences
Expand Down
62 changes: 48 additions & 14 deletions Validation/Geometry/data/mtdMaterials.l0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,58 @@
#CommonMaterials 0 0 0 0 0

tkLayout_SenLYSO 0.000 1.000 0.000 0.000 0.000


mtdtkLayout_SenLYSO 0.000 1.000 0.000 0.000 0.000

LYSO 0.000 1.000 0.000 0.000 0.000

tkLayout_SenSi 0.000 1.000 0.000 0.000 0.000


mtdtkLayout_SenSi 0.000 1.000 0.000 0.000 0.000

Silicon 0.000 1.000 0.000 0.000 0.000

tkLayout_Al 0.000 0.000 0.000 1.000 0.000

mtdtkLayout_Al 0.000 0.000 0.000 1.000 0.000

Aluminium 0.000 0.000 0.000 1.000 0.000

hybridcompositeBModule1Layer1PositiveZFSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeBModule1Layer1PositiveZFSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeBModule1Layer1PositiveZSupportPlate 0.000 0.000 0.000 1.000 0.000

hybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000
mtdhybridcompositeBModule1Layer1PositiveZSupportPlate 0.000 0.000 0.000 1.000 0.000

hybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1BSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1BSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1FSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1FSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1LSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1LSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1SupportPlate 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1SupportPlate 0.000 0.000 0.000 0.000 1.000

servicecompositeR1038Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR323Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR420Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR511Z2666 0.000 0.000 0.000 0.000 1.000
servicecompositeR511Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR596Z2666 0.000 0.000 0.000 0.000 1.000

Expand All @@ -41,25 +65,35 @@ servicecompositeR688Z2666 0.000 0.000 0.000 0.000
servicecompositeR772Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR864Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR946Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR1059Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR264Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR361Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR452Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR537Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR629Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR713Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR805Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR887Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR979Z2666 0.000 0.000 0.000 0.000 1.000

Epoxy 0.000 0.000 0.000 0.000 1.000

Laird 0.000 0.000 0.000 0.000 1.000

ServiceHybrid_PCB 0.000 0.000 0.000 0.000 1.000

Aluminium_Nitride 0.000 0.000 0.000 0.000 1.000

ThermalScreenComposite 0.000 0.000 0.000 1.000 0.000
62 changes: 48 additions & 14 deletions Validation/Geometry/data/mtdMaterials.x0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,58 @@
#CommonMaterials 0 0 0 0 0

tkLayout_SenLYSO 0.000 1.000 0.000 0.000 0.000


mtdtkLayout_SenLYSO 0.000 1.000 0.000 0.000 0.000

LYSO 0.000 1.000 0.000 0.000 0.000

tkLayout_SenSi 0.000 1.000 0.000 0.000 0.000


mtdtkLayout_SenSi 0.000 1.000 0.000 0.000 0.000

Silicon 0.000 1.000 0.000 0.000 0.000

tkLayout_Al 0.000 0.000 0.000 1.000 0.000

mtdtkLayout_Al 0.000 0.000 0.000 1.000 0.000

Aluminium 0.000 0.000 0.000 1.000 0.000

hybridcompositeBModule1Layer1PositiveZFSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeBModule1Layer1PositiveZFSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeBModule1Layer1PositiveZSupportPlate 0.000 0.000 0.000 1.000 0.000

hybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000
mtdhybridcompositeBModule1Layer1PositiveZSupportPlate 0.000 0.000 0.000 1.000 0.000

hybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1Between 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1BSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1BSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1FSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1FSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1LSide 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1LSide 0.000 0.000 0.000 0.000 1.000

hybridcompositeEModule1Disc1SupportPlate 0.000 0.000 0.000 0.000 1.000

mtdhybridcompositeEModule1Disc1SupportPlate 0.000 0.000 0.000 0.000 1.000

servicecompositeR1038Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR323Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR420Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR511Z2666 0.000 0.000 0.000 0.000 1.000
servicecompositeR511Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR596Z2666 0.000 0.000 0.000 0.000 1.000

Expand All @@ -41,25 +65,35 @@ servicecompositeR688Z2666 0.000 0.000 0.000 0.000
servicecompositeR772Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR864Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR946Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR1059Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR264Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR361Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR452Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR537Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR629Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR713Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR805Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR887Z2666 0.000 0.000 0.000 0.000 1.000

servicecompositeR979Z2666 0.000 0.000 0.000 0.000 1.000

Epoxy 0.000 0.000 0.000 0.000 1.000

Laird 0.000 0.000 0.000 0.000 1.000

ServiceHybrid_PCB 0.000 0.000 0.000 0.000 1.000

Aluminium_Nitride 0.000 0.000 0.000 0.000 1.000

ThermalScreenComposite 0.000 0.000 0.000 1.000 0.000