diff --git a/Geometry/MTDCommonData/data/etl/v6/etl.xml b/Geometry/MTDCommonData/data/etl/v6/etl.xml index 10069460f5c4b..7f8e56cd5f96a 100644 --- a/Geometry/MTDCommonData/data/etl/v6/etl.xml +++ b/Geometry/MTDCommonData/data/etl/v6/etl.xml @@ -214,7 +214,7 @@ - + diff --git a/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml b/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml index 85c583146585b..84dd49003f78d 100644 --- a/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml +++ b/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml @@ -154,6 +154,11 @@ + + + + + diff --git a/Validation/Geometry/data/mtdMaterials.l0 b/Validation/Geometry/data/mtdMaterials.l0 index 39a73240c6e0c..c0d5faf10a2f0 100644 --- a/Validation/Geometry/data/mtdMaterials.l0 +++ b/Validation/Geometry/data/mtdMaterials.l0 @@ -97,3 +97,25 @@ ServiceHybrid_PCB 0.000 0.000 0.000 0.000 Aluminium_Nitride 0.000 0.000 0.000 0.000 1.000 ThermalScreenComposite 0.000 0.000 0.000 1.000 0.000 + +ETLPatchPanel 0.000 0.000 0.000 0.000 1.000 + +Tin 0.000 0.000 0.000 0.000 1.000 + +Cables1 0.000 0.000 0.000 0.000 1.000 + +Cables2 0.000 0.000 0.000 0.000 1.000 + +Cables3 0.000 0.000 0.000 0.000 1.000 + +Cables4 0.000 0.000 0.000 0.000 1.000 + +Cables5 0.000 0.000 0.000 0.000 1.000 + +Cables6 0.000 0.000 0.000 0.000 1.000 + +Cables7 0.000 0.000 0.000 0.000 1.000 + +Carbon_fibre_str_Upgrade 0.000 0.000 0.000 1.000 0.000 + +Borated_Polyethyl. 0.000 0.000 0.000 1.000 0.000 diff --git a/Validation/Geometry/data/mtdMaterials.x0 b/Validation/Geometry/data/mtdMaterials.x0 index 39a73240c6e0c..c0d5faf10a2f0 100644 --- a/Validation/Geometry/data/mtdMaterials.x0 +++ b/Validation/Geometry/data/mtdMaterials.x0 @@ -97,3 +97,25 @@ ServiceHybrid_PCB 0.000 0.000 0.000 0.000 Aluminium_Nitride 0.000 0.000 0.000 0.000 1.000 ThermalScreenComposite 0.000 0.000 0.000 1.000 0.000 + +ETLPatchPanel 0.000 0.000 0.000 0.000 1.000 + +Tin 0.000 0.000 0.000 0.000 1.000 + +Cables1 0.000 0.000 0.000 0.000 1.000 + +Cables2 0.000 0.000 0.000 0.000 1.000 + +Cables3 0.000 0.000 0.000 0.000 1.000 + +Cables4 0.000 0.000 0.000 0.000 1.000 + +Cables5 0.000 0.000 0.000 0.000 1.000 + +Cables6 0.000 0.000 0.000 0.000 1.000 + +Cables7 0.000 0.000 0.000 0.000 1.000 + +Carbon_fibre_str_Upgrade 0.000 0.000 0.000 1.000 0.000 + +Borated_Polyethyl. 0.000 0.000 0.000 1.000 0.000 diff --git a/Validation/Geometry/macros/MaterialBudgetMtd.C b/Validation/Geometry/macros/MaterialBudgetMtd.C index 3bbf5687679b7..abfee308f4509 100644 --- a/Validation/Geometry/macros/MaterialBudgetMtd.C +++ b/Validation/Geometry/macros/MaterialBudgetMtd.C @@ -99,7 +99,7 @@ void createPlots(TString plot) { abscissaName = TString("#eta"); ordinateName = TString("t/#lambda_{I}"); ymin = 0.0; - ymax = 0.08; + ymax = 0.18; xmin = -4.0; xmax = 4.0; } else if (plot.CompareTo("l_vs_phi") == 0) { @@ -107,7 +107,7 @@ void createPlots(TString plot) { abscissaName = TString("#varphi [rad]"); ordinateName = TString("t/#lambda_{I}"); ymin = 0.0; - ymax = 0.08; + ymax = 0.18; xmin = -3.2; xmax = 3.2; } else {