diff --git a/Validation/Geometry/data/trackerMaterials.l0 b/Validation/Geometry/data/trackerMaterials.l0 index bcd5ed58c002a..329618557e649 100644 --- a/Validation/Geometry/data/trackerMaterials.l0 +++ b/Validation/Geometry/data/trackerMaterials.l0 @@ -11,6 +11,8 @@ T_Aluminium 1.000 0.000 0.000 0.000 0.000 T_Beryllium 1.000 0.000 0.000 0.000 0.000 T_Carbon 1.000 0.000 0.000 0.000 0.000 + +T_Kapton 1.000 0.000 0.000 0.000 0.000 T_Nomex 1.000 0.000 0.000 0.000 0.000 @@ -74,6 +76,8 @@ T_G10 1.000 0.000 0.000 0.000 0.000 T_CarbonFibreStr 1.000 0.000 0.000 0.000 0.000 +T_CarbonFibreStrBox 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 @@ -85,7 +89,6 @@ 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 Pix_Bar_Baseplate_Full 1.000 0.000 0.000 0.000 0.000 @@ -118,19 +121,19 @@ Layer3_EndringPrints 0.006 0.000 0.000 0.000 0.994 silicone_pipes_plus_coolant 0.000 0.000 0.000 1.000 0.000 -SectorA 0.354 0.000 0.084 0.187 0.375 +SectorA 0.331 0.000 0.023 0.105 0.542 -SectorB 0.399 0.000 0.219 0.218 0.164 +SectorB 0.300 0.000 0.359 0.246 0.095 -SectorC 0.312 0.000 0.094 0.171 0.423 +SectorC 0.214 0.000 0.120 0.177 0.489 -PixelBarrelSupTubCables 0.000 0.000 0.784 0.216 0.000 +SectorBC 0.322 0.000 0.048 0.056 0.574 -PixelBarrelSupTubCables2 0.000 0.000 0.784 0.216 0.000 +PixelBarrelSupTubCables 0.000 0.000 0.762 0.238 0.000 -BPix_Silicone 1.000 0.000 0.000 0.000 0.000 +PixelBarrelSupTubCables2 0.000 0.000 0.762 0.238 0.000 -CoolPipesDaisyChain 0.000 0.000 0.000 1.000 0.000 +BPix_Silicone 1.000 0.000 0.000 0.000 0.000 Pix_Bar_Baseplate_Full_Upgrade 1.000 0.000 0.000 0.000 0.000 @@ -140,6 +143,10 @@ 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 +Pix_Bar_Cable_Layer1_Upgrade 0.000 0.000 1.000 0.000 0.000 + +Pix_Bar_Cable_Layer234_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 @@ -154,7 +161,7 @@ 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_InnerCFK 1.000 0.000 0.000 0.000 0.000 +Flange4_InnerCFK 1.000 0.000 0.000 0.000 0.000 Flange1_CFK 1.000 0.000 0.000 0.000 0.000 @@ -172,6 +179,40 @@ 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 +micro_twisted_boundle 0.000 0.000 0.000 0.000 1.000 + +CFK 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer1 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer2 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer3 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer4 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer4 1.000 0.000 0.000 0.000 0.000 + +CoolPipesDaisyChain 0.000 0.000 0.000 1.000 0.000 + +Bpix_Pipe_Steel_Half 0.000 0.000 0.000 1.000 0.000 + +Bpix_CO2_-20C_Half 0.000 0.000 0.000 1.000 0.000 + +Bpix_Pipe_Steel 0.000 0.000 0.000 1.000 0.000 + +Bpix_CO2_-20C 0.000 0.000 0.000 1.000 0.000 + +C6F14_F2_-10C 0.000 0.000 0.000 1.000 0.000 + +SupplyTubeEpoxy 1.000 0.000 0.000 0.000 0.000 + +SupplyTubeConn3 1.000 0.000 0.000 0.000 0.000 + +SupplyTubeConn3_Upgrade 1.000 0.000 0.000 0.000 0.000 + +Polyoxymethylene 1.000 0.000 0.000 0.000 0.000 + #pixel_fwd.in 0 0 0 0 0 @@ -223,6 +264,41 @@ FPix_CFSkin 1.000 0.000 0.000 0.000 0.000 Pix_Fwd_ROChip 0.000 0.000 0.000 0.000 1.000 +Pix_Fwd_InnerBlade_AdhFilm 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_AluFlexCable2 0.000 0.000 1.000 0.000 0.000 + +Pix_Fwd_AluFlexCable3 0.000 0.000 1.000 0.000 0.000 + +FPix_CFSkin_InnerInnerRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_InnerOuterRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_OuterInnerRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_OuterOuterRing 1.000 0.000 0.000 0.000 0.000 + +C_C_InnerInnerRing 1.000 0.000 0.000 0.000 0.000 + +C_C_InnerOuterRing 1.000 0.000 0.000 0.000 0.000 + +C_C_OuterInnerRing 1.000 0.000 0.000 0.000 0.000 + +C_C_OuterOuterRing 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_OuterBlade_AdhFilm 1.000 0.000 0.000 0.000 0.000 + +CF_SupportArm 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_Conn 0.000 0.000 1.000 0.000 0.000 + +Pix_Fwd_AluFlexCable 0.000 0.000 1.000 0.000 0.000 + +DiskCoolingTube_inner 0.000 0.000 0.000 1.000 0.000 + +DiskCoolingTube_outer 0.000 0.000 0.000 1.000 0.000 + +Peek 1.000 0.000 0.000 0.000 0.000 #tib_module.in 0 0 0 0 0 @@ -276,7 +352,6 @@ 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 TID_CoolInsert 1.000 0.000 0.000 0.000 0.000 @@ -806,5 +881,3 @@ Tk_SO_FC_E 1.000 0.000 0.000 0.000 0.000 Tk_SO_FC_F 1.000 0.000 0.000 0.000 0.000 - - diff --git a/Validation/Geometry/data/trackerMaterials.x0 b/Validation/Geometry/data/trackerMaterials.x0 index a9b66b92db13c..7afa90e2133ad 100644 --- a/Validation/Geometry/data/trackerMaterials.x0 +++ b/Validation/Geometry/data/trackerMaterials.x0 @@ -5,12 +5,14 @@ #CommonMaterials 0 0 0 0 0 Silicon 0.000 1.000 0.000 0.000 0.000 - + T_Aluminium 1.000 0.000 0.000 0.000 0.000 T_Beryllium 1.000 0.000 0.000 0.000 0.000 T_Carbon 1.000 0.000 0.000 0.000 0.000 + +T_Kapton 1.000 0.000 0.000 0.000 0.000 T_Nomex 1.000 0.000 0.000 0.000 0.000 @@ -74,6 +76,8 @@ T_G10 1.000 0.000 0.000 0.000 0.000 T_CarbonFibreStr 1.000 0.000 0.000 0.000 0.000 +T_CarbonFibreStrBox 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 @@ -117,20 +121,20 @@ Layer3_EndringPrints 0.010 0.000 0.000 0.000 0.990 silicone_pipes_plus_coolant 0.000 0.000 0.000 1.000 0.000 -SectorA 0.276 0.000 0.111 0.294 0.319 +SectorA 0.331 0.000 0.023 0.105 0.542 SectorB 0.300 0.000 0.359 0.246 0.095 SectorC 0.214 0.000 0.120 0.177 0.489 +SectorBC 0.322 0.000 0.048 0.056 0.574 + 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 @@ -139,6 +143,10 @@ 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 +Pix_Bar_Cable_Layer1_Upgrade 0.000 0.000 1.000 0.000 0.000 + +Pix_Bar_Cable_Layer234_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 @@ -153,9 +161,11 @@ 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_InnerCFK 1.000 0.000 0.000 0.000 0.000 +Flange4_InnerCFK 1.000 0.000 0.000 0.000 0.000 + +nge1_CFK 1.000 0.000 0.000 0.000 0.000 -nge1_CFK 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 @@ -171,6 +181,39 @@ 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 +micro_twisted_boundle 0.000 0.000 0.000 0.000 1.000 + +CFK 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer1 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer2 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer3 1.000 0.000 0.000 0.000 0.000 + +CFK_Layer4 1.000 0.000 0.000 0.000 0.000 + +CoolPipesDaisyChain 0.000 0.000 0.000 1.000 0.000 + +Bpix_Pipe_Steel_Half 0.000 0.000 0.000 1.000 0.000 + +Bpix_CO2_-20C_Half 0.000 0.000 0.000 1.000 0.000 + +Bpix_Pipe_Steel 0.000 0.000 0.000 1.000 0.000 + +Bpix_CO2_-20C 0.000 0.000 0.000 1.000 0.000 + +C6F14_F2_-10C 0.000 0.000 0.000 1.000 0.000 + +SupplyTubeEpoxy 1.000 0.000 0.000 0.000 0.000 + +SupplyTubeConn3 1.000 0.000 0.000 0.000 0.000 + +SupplyTubeConn3_Upgrade 1.000 0.000 0.000 0.000 0.000 + +Polyoxymethylene 1.000 0.000 0.000 0.000 0.000 + + #pixel_fwd.in 0 0 0 0 0 Pix_Fwd_Bump 0.000 0.000 0.000 0.000 1.000 @@ -221,6 +264,41 @@ FPix_CFSkin 1.000 0.000 0.000 0.000 0.000 Pix_Fwd_ROChip 0.000 0.000 0.000 0.000 1.000 +Pix_Fwd_InnerBlade_AdhFilm 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_AluFlexCable2 0.000 0.000 1.000 0.000 0.000 + +Pix_Fwd_AluFlexCable3 0.000 0.000 1.000 0.000 0.000 + +FPix_CFSkin_InnerInnerRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_InnerOuterRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_OuterInnerRing 1.000 0.000 0.000 0.000 0.000 + +FPix_CFSkin_OuterOuterRing 1.000 0.000 0.000 0.000 0.000 + +C_C_InnerInnerRing 1.000 0.000 0.000 0.000 0.000 + +C_C_InnerOuterRing 1.000 0.000 0.000 0.000 0.000 + +C_C_OuterInnerRing 1.000 0.000 0.000 0.000 0.000 + +C_C_OuterOuterRing 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_OuterBlade_AdhFilm 1.000 0.000 0.000 0.000 0.000 + +CF_SupportArm 1.000 0.000 0.000 0.000 0.000 + +Pix_Fwd_Conn 0.000 0.000 1.000 0.000 0.000 + +Pix_Fwd_AluFlexCable 0.000 0.000 1.000 0.000 0.000 + +DiskCoolingTube_inner 0.000 0.000 0.000 1.000 0.000 + +DiskCoolingTube_outer 0.000 0.000 0.000 1.000 0.000 + +Peek 1.000 0.000 0.000 0.000 0.000 #tib_module.in 0 0 0 0 0 diff --git a/Validation/Geometry/python/plot_utils.py b/Validation/Geometry/python/plot_utils.py index b3890e4a60014..d4ae5b6abad17 100644 --- a/Validation/Geometry/python/plot_utils.py +++ b/Validation/Geometry/python/plot_utils.py @@ -190,10 +190,10 @@ def setTDRStyle(): tdrStyle.SetStatW(0.15) # Margins: - tdrStyle.SetPadTopMargin(0.1) + tdrStyle.SetPadTopMargin(0.05) tdrStyle.SetPadBottomMargin(0.1) - tdrStyle.SetPadLeftMargin(0.1) - tdrStyle.SetPadRightMargin(0.1) + tdrStyle.SetPadLeftMargin(0.12) + tdrStyle.SetPadRightMargin(0.05) # For the Global title: tdrStyle.SetOptTitle(1) diff --git a/Validation/Geometry/test/MaterialBudget.py b/Validation/Geometry/test/MaterialBudget.py index c81ee6c89de95..6c4a6045e0cb1 100644 --- a/Validation/Geometry/test/MaterialBudget.py +++ b/Validation/Geometry/test/MaterialBudget.py @@ -802,7 +802,8 @@ def createCompoundPlots(detector, plot, geometry): keys of plots dictionary (imported from plot_utils. """ - + setTDRStyle() + theDirname = 'Images' if not checkFile_(theDirname): os.mkdir(theDirname) @@ -818,7 +819,7 @@ def createCompoundPlots(detector, plot, geometry): plots[plot].abscissa, plots[plot].ordinate) stack_X0 = THStack("stack_X0", stackTitle); - theLegend = TLegend(0.70, 0.70, 0.89, 0.89); + theLegend = TLegend(0.50, 0.70, 0.70, 0.90); def setRanges(h): legendSpace = 1. + 0.3 # 30% @@ -836,20 +837,19 @@ def setRanges(h): hist_X0_elements[label].SetFillColor(color) hist_X0_elements[label].SetLineColor(kBlack) stack_X0.Add(hist_X0_elements[label]) - theLegend.AddEntry(hist_X0_elements[label], leg, "f") + if hist_X0_elements[label].Integral() > 0.: theLegend.AddEntry(hist_X0_elements[label], leg, "f") # canvas canname = "MBCan_1D_%s_%s" % (detector, plot) can = TCanvas(canname, canname, 800, 800) can.Range(0,0,25,25) - can.SetFillColor(kWhite) - gStyle.SetOptStat(0) - - setTDRStyle() + gStyle.SetOptTitle(0) # Draw setRanges(stack_X0.GetStack().Last()) stack_X0.Draw("HIST"); + stack_X0.GetXaxis().SetLabelSize(0.035) + stack_X0.GetYaxis().SetLabelSize(0.035) theLegend.Draw(); cmsMark = TLatex() @@ -857,9 +857,9 @@ def setRanges(h): cmsMark.SetTextAngle(0); cmsMark.SetTextColor(kBlack); cmsMark.SetTextFont(61) - cmsMark.SetTextSize(7e-2) + cmsMark.SetTextSize(5e-2) cmsMark.SetTextAlign(11) - cmsMark.DrawLatex(0.1,0.91,"CMS") + cmsMark.DrawLatex(0.16,0.86,"CMS") simuMark = TLatex() simuMark.SetNDC(); @@ -867,7 +867,7 @@ def setRanges(h): simuMark.SetTextColor(kBlack); simuMark.SetTextSize(3e-2) simuMark.SetTextAlign(11) - simuMark.DrawLatex(0.26,0.91,"#font[52]{Preliminary Simulation}") + simuMark.DrawLatex(0.16,0.82,"#font[52]{Simulation Internal}") # Store can.Update();