Skip to content

Commit

Permalink
Merge pull request cms-sw#15550 from Michael-Krohn/AdditionalMaterials
Browse files Browse the repository at this point in the history
Added the radiation length and hadronic interaction length of unclassified materials
  • Loading branch information
cmsbuild authored Aug 30, 2016
2 parents 79e058c + 72c60e2 commit d5eb24d
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 1 deletion.
66 changes: 66 additions & 0 deletions Validation/Geometry/data/trackerMaterials.l0
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@ T_G10 1.000 0.000 0.000 0.000 0.000

T_CarbonFibreStr 1.000 0.000 0.000 0.000 0.000

MS_CU60 0.000 0.000 1.000 0.000 0.000

MS_AL36 0.000 0.000 1.000 0.000 0.000

MS_AL48 0.000 0.000 1.000 0.000 0.000

MS_AL_60 0.000 0.000 1.000 0.000 0.000

Polyurethane 1.000 0.000 0.000 0.000 0.000



Expand Down Expand Up @@ -119,6 +128,49 @@ PixelBarrelSupTubCables 0.000 0.000 0.784 0.216 0.000

PixelBarrelSupTubCables2 0.000 0.000 0.784 0.216 0.000

BPix_Silicone 1.000 0.000 0.000 0.000 0.000

CoolPipesDaisyChain 0.000 0.000 0.000 1.000 0.000

Pix_Bar_Baseplate_Full_Upgrade 1.000 0.000 0.000 0.000 0.000

Pix_Bar_Cable_Upgrade 0.000 0.000 1.000 0.000 0.000

Pix_Bar_CableSignal_Upgrade 0.000 0.000 1.000 0.000 0.000

Pix_Bar_CablePower_Upgrade 0.000 0.000 1.000 0.000 0.000

cable_endring_to_tube_Upgrade 0.309 0.000 0.585 0.000 0.105

Layer1_2_EndringPrints_Upgrade 0.008 0.000 0.000 0.000 0.992

Layer3_EndringPrints_Upgrade 0.010 0.000 0.000 0.000 0.990

SectorC_Upgrade 0.214 0.000 0.120 0.177 0.489

Flange1_Airex 1.000 0.000 0.000 0.000 0.000

Flange2_Airex 1.000 0.000 0.000 0.000 0.000

Flange3_Airex 1.000 0.000 0.000 0.000 0.000

Flange4_Airex 1.000 0.000 0.000 0.000 0.000

Flange1_CFK 1.000 0.000 0.000 0.000 0.000

Flange2_CFK 1.000 0.000 0.000 0.000 0.000

Flange3_CFK 1.000 0.000 0.000 0.000 0.000

Flange4_CFK 1.000 0.000 0.000 0.000 0.000

FlangeOuter_Layer3_Upgrade 1.000 0.000 0.000 0.000 0.000

LCP_Glass_Enforced 0.000 0.000 0.000 0.000 1.000

Silicon_Nitride 1.000 0.000 0.000 0.000 0.000

FlangeOuter_Layer3_Upgrade 1.000 0.000 0.000 0.000 0.000


#pixel_fwd.in 0 0 0 0 0
Expand Down Expand Up @@ -218,6 +270,10 @@ TIB_AUX 0.233 0.000 0.166 0.000 0.601
TIB_DOHMCarrier 0.768 0.000 0.232 0.000 0.000

TIB_Pillar 1.000 0.000 0.000 0.000 0.000

TIB_RailTop 1.000 0.000 0.000 0.000 0.000

TIB_RailBottom 1.000 0.000 0.000 0.000 0.000



Expand Down Expand Up @@ -278,6 +334,12 @@ TIBTID_HybridBoard 0.000 0.000 0.000 0.000 1.000
TIBTID_HybridTails 0.000 0.000 1.000 0.000 0.000

TIBTID_Hybrid 0.000 0.000 0.000 0.000 1.000

TIBTID_T_RuggRibbon 0.000 0.000 1.000 0.000 0.000

TIBTID_ServiceDisk1 0.531 0.000 0.407 0.080 0.000

TIBTID_ServiceDisk2 0.531 0.000 0.407 0.080 0.000



Expand Down Expand Up @@ -379,6 +441,10 @@ TOB_CONN34 0.015 0.000 0.955 0.000 0.030

TOB_CONN56 0.010 0.000 0.969 0.000 0.021

TOB_AlSideConnect 1.000 0.000 0.000 0.000 0.000

TOB_AlCentralConnect 1.000 0.000 0.000 0.000 0.000



#tob_struc.in 0 0 0 0 0
Expand Down
66 changes: 65 additions & 1 deletion Validation/Geometry/data/trackerMaterials.x0
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@ T_G10 1.000 0.000 0.000 0.000 0.000

T_CarbonFibreStr 1.000 0.000 0.000 0.000 0.000

MS_CU60 0.000 0.000 1.000 0.000 0.000

MS_AL36 0.000 0.000 1.000 0.000 0.000

MS_AL48 0.000 0.000 1.000 0.000 0.000

MS_AL_60 0.000 0.000 1.000 0.000 0.000

Polyurethane 1.000 0.000 0.000 0.000 0.000


#pixel_bar.in 0 0 0 0 0
Expand Down Expand Up @@ -118,7 +127,49 @@ PixelBarrelSupTubCables 0.000 0.000 0.762 0.238 0.000

PixelBarrelSupTubCables2 0.000 0.000 0.762 0.238 0.000

BPix_Silicone 1.000 0.000 0.000 0.000 0.000

CoolPipesDaisyChain 0.000 0.000 0.000 1.000 0.000

Pix_Bar_Baseplate_Full_Upgrade 1.000 0.000 0.000 0.000 0.000

Pix_Bar_Cable_Upgrade 0.000 0.000 1.000 0.000 0.000

Pix_Bar_CableSignal_Upgrade 0.000 0.000 1.000 0.000 0.000

Pix_Bar_CablePower_Upgrade 0.000 0.000 1.000 0.000 0.000

cable_endring_to_tube_Upgrade 0.309 0.000 0.585 0.000 0.105

Layer1_2_EndringPrints_Upgrade 0.008 0.000 0.000 0.000 0.992

Layer3_EndringPrints_Upgrade 0.010 0.000 0.000 0.000 0.990

SectorC_Upgrade 0.214 0.000 0.120 0.177 0.489

Flange1_Airex 1.000 0.000 0.000 0.000 0.000

Flange2_Airex 1.000 0.000 0.000 0.000 0.000

Flange3_Airex 1.000 0.000 0.000 0.000 0.000

Flange4_Airex 1.000 0.000 0.000 0.000 0.000

nge1_CFK 1.000 0.000 0.000 0.000 0.000

Flange2_CFK 1.000 0.000 0.000 0.000 0.000

Flange3_CFK 1.000 0.000 0.000 0.000 0.000

Flange4_CFK 1.000 0.000 0.000 0.000 0.000

FlangeOuter_Layer3_Upgrade 1.000 0.000 0.000 0.000 0.000

LCP_Glass_Enforced 0.000 0.000 0.000 0.000 1.000

Silicon_Nitride 1.000 0.000 0.000 0.000 0.000

FlangeOuter_Layer3_Upgrade 1.000 0.000 0.000 0.000 0.000

#pixel_fwd.in 0 0 0 0 0

Expand Down Expand Up @@ -218,6 +269,9 @@ TIB_DOHMCarrier 0.552 0.000 0.448 0.000 0.000

TIB_Pillar 1.000 0.000 0.000 0.000 0.000

TIB_RailTop 1.000 0.000 0.000 0.000 0.000

TIB_RailBottom 1.000 0.000 0.000 0.000 0.000


#tid_module.in 0 0 0 0 0
Expand Down Expand Up @@ -277,6 +331,12 @@ TIBTID_HybridBoard 0.000 0.000 0.000 0.000 1.000
TIBTID_HybridTails 0.000 0.000 1.000 0.000 0.000

TIBTID_Hybrid 0.000 0.000 0.000 0.000 1.000

TIBTID_T_RuggRibbon 0.000 0.000 1.000 0.000 0.000

TIBTID_ServiceDisk1 0.531 0.000 0.407 0.080 0.000

TIBTID_ServiceDisk2 0.531 0.000 0.407 0.080 0.000



Expand Down Expand Up @@ -377,7 +437,11 @@ TOB_CONN12 0.006 0.000 0.972 0.000 0.022
TOB_CONN34 0.007 0.000 0.963 0.000 0.030

TOB_CONN56 0.006 0.000 0.970 0.000 0.024


TOB_AlSideConnect 1.000 0.000 0.000 0.000 0.000

TOB_AlCentralConnect 1.000 0.000 0.000 0.000 0.000



#tob_struc.in 0 0 0 0 0
Expand Down

0 comments on commit d5eb24d

Please sign in to comment.