Unique material names (R. Grosso)

diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx
index 10536f51bb389760c2477a867da505e0976e468d..2831771d72c2ef5f850e09d55960d9b8ef457fc6 100644 (file)
--- a/STRUCT/AliABSO.cxx
+++ b/STRUCT/AliABSO.cxx
@@ -144,79 +144,79 @@ void AliABSO::CreateMaterials()
   Float_t epsil, stmin, tmaxfd, deemax, stemax;
   //
   //     Carbon 
-  AliMaterial( 6, "CARBON$   ", 12.01, 6., 1.75, 24.4, 49.9);
-  AliMaterial(26, "CARBON$   ", 12.01, 6., 1.75, 24.4, 49.9);
-  AliMaterial(46, "CARBON$   ", 12.01, 6., 1.75, 24.4, 49.9);
+  AliMaterial( 6, "CARBON0$  ", 12.01, 6., 1.75, 24.4, 49.9);
+  AliMaterial(26, "CARBON1$  ", 12.01, 6., 1.75, 24.4, 49.9);
+  AliMaterial(46, "CARBON2$  ", 12.01, 6., 1.75, 24.4, 49.9);
   //
   //     Aluminum 
-  AliMaterial(9,  "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(29, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(49, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(9,  "ALUMINIUM0$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(29, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(49, "ALUMINIUM2$", 26.98, 13., 2.7, 8.9, 37.2);
   //
   //     Iron 
-  AliMaterial(10, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(30, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(50, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(10, "IRON0$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(30, "IRON1$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(50, "IRON2$    ", 55.85, 26., 7.87, 1.76, 17.1);
   //
   //     Copper
-  AliMaterial(11, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
-  AliMaterial(31, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
-  AliMaterial(51, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(11, "COPPER0$  ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(31, "COPPER1$  ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(51, "COPPER2$  ", 63.55, 29., 8.96, 1.43, 15.1);
   //
   //     Tungsten 
-  AliMaterial(12, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3);
-  AliMaterial(32, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3);
-  AliMaterial(52, "TUNGSTEN$ ", 183.85, 74., 19.3, .35, 10.3);
+  AliMaterial(12, "TUNGSTEN0$", 183.85, 74., 19.3, .35, 10.3);
+  AliMaterial(32, "TUNGSTEN1$", 183.85, 74., 19.3, .35, 10.3);
+  AliMaterial(52, "TUNGSTEN2$", 183.85, 74., 19.3, .35, 10.3);
   //
   //     Ni-W-Cu 
-  AliMixture(21, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu);
-  AliMixture(41, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu);
-  AliMixture(61, "Ni-W-Cu$", aniwcu, zniwcu, 18.78, 3, wniwcu);
+  AliMixture(21, "Ni-W-Cu0$", aniwcu, zniwcu, 18.78, 3, wniwcu);
+  AliMixture(41, "Ni-W-Cu1$", aniwcu, zniwcu, 18.78, 3, wniwcu);
+  AliMixture(61, "Ni-W-Cu2$", aniwcu, zniwcu, 18.78, 3, wniwcu);
   //
   //     Lead 
-  AliMaterial(13, "LEAD$     ", 207.19, 82., 11.35, .56, 18.5);
-  AliMaterial(33, "LEAD$     ", 207.19, 82., 11.35, .56, 18.5);
-  AliMaterial(53, "LEAD$     ", 207.19, 82., 11.35, .56, 18.5);
+  AliMaterial(13, "LEAD0$    ", 207.19, 82., 11.35, .56, 18.5);
+  AliMaterial(33, "LEAD1$    ", 207.19, 82., 11.35, .56, 18.5);
+  AliMaterial(53, "LEAD2$    ", 207.19, 82., 11.35, .56, 18.5);
   //
   //     Air 
-  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(15, "AIR0$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR1$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR2$     ", aAir, zAir, dAir, 4, wAir);
   //
   //     Vacuum 
-  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
-  AliMixture(36, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
-  AliMixture(56, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(16, "VACUUM0$", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(36, "VACUUM1$", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(56, "VACUUM2$", aAir, zAir, dAir1, 4, wAir);
   //
   //     Concrete 
-  AliMixture(17, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
-  AliMixture(37, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
-  AliMixture(57, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(17, "CONCRETE0$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(37, "CONCRETE1$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(57, "CONCRETE2$", aconc, zconc, 2.35, 10, wconc);
   //
   //     Poly CH2 
-  AliMixture(18, "POLYETHYLEN$", apoly, zpoly, .95, -2, wpoly);
+  AliMixture(18, "POLYETHYLEN0$", apoly, zpoly, .95, -2, wpoly);
   //
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
   // positive 
   //
-  AliMixture(38, "POLYETHYLEN$", apoly, zpoly, .95, 2, wpoly);
-  AliMixture(58, "POLYETHYLEN$", apoly, zpoly, .95, 2, wpoly);
+  AliMixture(38, "POLYETHYLEN1$", apoly, zpoly, .95, 2, wpoly);
+  AliMixture(58, "POLYETHYLEN2$", apoly, zpoly, .95, 2, wpoly);
   //
   //     stainless Steel 
-  AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMixture(39, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMixture(59, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(19, "STAINLESS STEEL0$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(39, "STAINLESS STEEL1$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(59, "STAINLESS STEEL2$", asteel, zsteel, 7.88, 4, wsteel);
   //
   //     Insulation powder 
-  AliMixture(14, "INSULATION$", ains, zins, 0.41, 4, wins);
-  AliMixture(34, "INSULATION$", ains, zins, 0.41, 4, wins);
-  AliMixture(54, "INSULATION$", ains, zins, 0.41, 4, wins);
+  AliMixture(14, "INSULATION0$", ains, zins, 0.41, 4, wins);
+  AliMixture(34, "INSULATION1$", ains, zins, 0.41, 4, wins);
+  AliMixture(54, "INSULATION2$", ains, zins, 0.41, 4, wins);
   // Polymere Concrete 
-  AliMixture(20, "Poly Concrete$", aPolyCc, zPolyCc, 3.53, -9, wPolyCc);
-  AliMixture(40, "Poly Concrete$", aPolyCc, zPolyCc, 3.53,  9, wPolyCc);
-  AliMixture(60, "Poly Concrete$", aPolyCc, zPolyCc, 3.53,  9, wPolyCc);
+  AliMixture(20, "Poly Concrete0$", aPolyCc, zPolyCc, 3.53, -9, wPolyCc);
+  AliMixture(40, "Poly Concrete1$", aPolyCc, zPolyCc, 3.53,  9, wPolyCc);
+  AliMixture(60, "Poly Concrete2$", aPolyCc, zPolyCc, 3.53,  9, wPolyCc);
 
   //
   // **************** 

diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx
index f3fbbc5c84197f43499ef3677b91ff95ea9d23cc..555207e662617a1f9ba0de35407d4890378f3a08 100644 (file)
--- a/STRUCT/AliDIPOv2.cxx
+++ b/STRUCT/AliDIPOv2.cxx
@@ -852,46 +852,46 @@ void AliDIPOv2::CreateMaterials()
   
   // --- Define the various materials for GEANT --- 
   //     Aluminum 
-  AliMaterial( 9, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(29, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(49, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial( 9, "ALUMINIUM0$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(29, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(49, "ALUMINIUM2$", 26.98, 13., 2.7, 8.9, 37.2);
   
   //     Iron 
-  AliMaterial(10, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(30, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(50, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(10, "IRON0$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(30, "IRON1$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(50, "IRON2$    ", 55.85, 26., 7.87, 1.76, 17.1);
   //     Copper
-  AliMaterial(17, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
-  AliMaterial(37, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
-  AliMaterial(57, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(17, "COPPER0$  ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(37, "COPPER1$  ", 63.55, 29., 8.96, 1.43, 15.1);
+  AliMaterial(57, "COPPER2$  ", 63.55, 29., 8.96, 1.43, 15.1);
   //     Air 
-  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(15, "AIR0$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR1$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR2$     ", aAir, zAir, dAir, 4, wAir);
   //     Vacuum 
-  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
-  AliMixture(36, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
-  AliMixture(56, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(16, "VACUUM0$", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(36, "VACUUM1$", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(56, "VACUUM2$", aAir, zAir, dAir1, 4, wAir);
   
   //     stainless Steel 
-  AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMixture(39, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMixture(59, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(19, "STAINLESS STEEL0$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(39, "STAINLESS STEEL1$", asteel, zsteel, 7.88, 4, wsteel);
+  AliMixture(59, "STAINLESS STEEL2$", asteel, zsteel, 7.88, 4, wsteel);
   
   //     Coil 
-  AliMixture(14, "Al$", acoil, zcoil, 2.122, 3, wcoil);
-  AliMixture(34, "Al$", acoil, zcoil, 2.122, 3, wcoil);
-  AliMixture(54, "Al$", acoil, zcoil, 2.122, 3, wcoil);
+  AliMixture(14, "Al0$", acoil, zcoil, 2.122, 3, wcoil);
+  AliMixture(34, "Al1$", acoil, zcoil, 2.122, 3, wcoil);
+  AliMixture(54, "Al2$", acoil, zcoil, 2.122, 3, wcoil);
 
   //RESIN
-  AliMixture(13, "RESIN$", aresi, zresi, 1.05, 3, wresi);
-  AliMixture(33, "RESIN$", aresi, zresi, 1.05, 3, wresi);
-  AliMixture(53, "RESIN$", aresi, zresi, 1.05, 3, wresi);  
+  AliMixture(13, "RESIN0$", aresi, zresi, 1.05, 3, wresi);
+  AliMixture(33, "RESIN1$", aresi, zresi, 1.05, 3, wresi);
+  AliMixture(53, "RESIN2$", aresi, zresi, 1.05, 3, wresi);  
 
   //G10
-  AliMixture(11, "G10$", aG10, zG10, 1.7, 5, wG10);
-  AliMixture(31, "G10$", aG10, zG10, 1.7, 5, wG10);
-  AliMixture(51, "G10$", aG10, zG10, 1.7, 5, wG10); 
+  AliMixture(11, "G100$", aG10, zG10, 1.7, 5, wG10);
+  AliMixture(31, "G101$", aG10, zG10, 1.7, 5, wG10);
+  AliMixture(51, "G102$", aG10, zG10, 1.7, 5, wG10); 
  
   // **************** 
   //     Defines tracking media parameters. 

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index 6db990763f29784bd4c88513fe28883f50bbd62d..08a36af86c3f590dc4b085f6e1221f9bdb2820a8 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -298,17 +298,17 @@ void AliHALL::CreateMaterials()
 
   //     FOR CONCRETE 
   
-  AliMaterial(10, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(30, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(50, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1); 
+  AliMaterial(10, "IRON0$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(30, "IRON1$    ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(50, "IRON2$    ", 55.85, 26., 7.87, 1.76, 17.1); 
 
-  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(15, "AIR0$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR1$     ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR2$     ", aAir, zAir, dAir, 4, wAir);
 
-  AliMixture(17, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
-  AliMixture(37, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
-  AliMixture(57, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(17, "CONCRETE0$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(37, "CONCRETE1$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(57, "CONCRETE2$", aconc, zconc, 2.35, 10, wconc);
   
   // **************** 
   //     Defines tracking media parameters. 

diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx
index b878b54a5c89d5aa1ccfd852d0a2c371762196f3..ea606f8e3aab44656e3abca9b2253f7aec3353aa 100644 (file)
--- a/STRUCT/AliMAG.cxx
+++ b/STRUCT/AliMAG.cxx
@@ -242,16 +242,16 @@ void AliMAG::CreateMaterials()
 
 
   //     Aluminum 
-  AliMaterial(9, "Al$", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(29, "Al$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(9, "Al0$", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(29, "Al1$", 26.98, 13., 2.7, 8.9, 37.2);
   
   //     Iron 
-  AliMaterial(10, "Fe$", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(30, "Fe$", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(10, "Fe0$", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(30, "Fe1$", 55.85, 26., 7.87, 1.76, 17.1);
   
   //     Air 
-  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
-  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(15, "AIR0$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR1$      ", aAir, zAir, dAir, 4, wAir);
   
   // **************** 
   //     Defines tracking media parameters.