Coding rule violations corrected

diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx
index b5f5fd6..35fe220 100644 (file)
--- a/STRUCT/AliABSO.cxx
+++ b/STRUCT/AliABSO.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2000/02/23 13:46:04  morsch
+Detailed composition of insulation material.
+
 Revision 1.7  2000/01/12 15:36:28  morsch
 Base class only
 
@@ -93,8 +96,8 @@ void AliABSO::CreateMaterials()
   //
   // Define materials for muon absorber
   //
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t apoly[2]  = { 12.01,1. };
   Float_t zpoly[2]  = { 6.,1. };
@@ -205,68 +208,68 @@ void AliABSO::CreateMaterials()
   // *************** 
   //
   //    Carbon 
-  AliMedium(6,  "C_C0             ",  6, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(26, "C_C1             ", 26, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(46, "C_C2             ", 46, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(6,  "C_C0             ",  6, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(26, "C_C1             ", 26, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(46, "C_C2             ", 46, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Aluminum 
-  AliMedium(9,  "ALU_C0          ",  9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(29, "ALU_C1          ", 29, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(49, "ALU_C2          ", 49, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(9,  "ALU_C0          ",  9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(29, "ALU_C1          ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(49, "ALU_C2          ", 49, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Iron 
-  AliMedium(10, "FE_C0           ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(30, "FE_C1           ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(50, "FE_C2           ", 50, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(10, "FE_C0           ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(30, "FE_C1           ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(50, "FE_C2           ", 50, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Copper
-  AliMedium(11, "Cu_C0            ", 11, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(31, "Cu_C1            ", 31, 0, ISXFLD, SXMGMX, tmaxfd, -stemax, deemax, epsil, stmin);
-  AliMedium(51, "Cu_C2            ", 51, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(11, "Cu_C0            ", 11, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(31, "Cu_C1            ", 31, 0, isxfld, sxmgmx, tmaxfd, -stemax, deemax, epsil, stmin);
+  AliMedium(51, "Cu_C2            ", 51, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Tungsten 
-  AliMedium(12, "W_C0            ", 12, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(32, "W_C1            ", 32, 0, ISXFLD, SXMGMX, tmaxfd, -stemax, deemax, epsil, stmin);
-  AliMedium(52, "W_C2            ", 52, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(12, "W_C0            ", 12, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(32, "W_C1            ", 32, 0, isxfld, sxmgmx, tmaxfd, -stemax, deemax, epsil, stmin);
+  AliMedium(52, "W_C2            ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //    Ni/Tungsten 
-  AliMedium(21, "Ni/W0           ", 21, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(41, "Ni/W1           ", 41, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(61, "Ni/W3           ", 61, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(21, "Ni/W0           ", 21, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(41, "Ni/W1           ", 41, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(61, "Ni/W3           ", 61, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Lead 
-  AliMedium(13, "PB_C0           ", 13, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(33, "PB_C1           ", 33, 0, ISXFLD, SXMGMX, tmaxfd, -stemax, deemax, epsil, stmin);
-  AliMedium(53, "PB_C2           ", 53, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(13, "PB_C0           ", 13, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(33, "PB_C1           ", 33, 0, isxfld, sxmgmx, tmaxfd, -stemax, deemax, epsil, stmin);
+  AliMedium(53, "PB_C2           ", 53, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Insulation Powder 
-  AliMedium(14, "INS_C0          ", 14, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(34, "INS_C1          ", 34, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(54, "INS_C2          ", 54, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(14, "INS_C0          ", 14, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(34, "INS_C1          ", 34, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(54, "INS_C2          ", 54, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Air 
-  AliMedium(15, "AIR_C0          ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "AIR_C1          ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(55, "AIR_C2          ", 55, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_C0          ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_C1          ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(55, "AIR_C2          ", 55, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Vacuum 
-  AliMedium(16, "VA_C0           ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(36, "VA_C1           ", 36, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(56, "VA_C2           ", 56, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(16, "VA_C0           ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(36, "VA_C1           ", 36, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(56, "VA_C2           ", 56, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Concrete 
-  AliMedium(17, "CC_C0           ", 17, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(37, "CC_C1           ", 37, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(57, "CC_C2           ", 57, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(17, "CC_C0           ", 17, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(37, "CC_C1           ", 37, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(57, "CC_C2           ", 57, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Polyethilene 
-  AliMedium(18, "CH2_C0          ", 18, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(38, "CH2_C1          ", 38, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(58, "CH2_C2          ", 58, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(18, "CH2_C0          ", 18, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(38, "CH2_C1          ", 38, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(58, "CH2_C2          ", 58, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Steel 
-  AliMedium(19, "ST_C0           ", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(39, "ST_C1           ", 39, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(59, "ST_C3           ", 59, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(19, "ST_C0           ", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(39, "ST_C1           ", 39, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(59, "ST_C3           ", 59, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________

diff --git a/STRUCT/AliABSO.h b/STRUCT/AliABSO.h
index 101fdac..20b3f11 100644 (file)
--- a/STRUCT/AliABSO.h
+++ b/STRUCT/AliABSO.h
@@ -1,5 +1,5 @@
-#ifndef ABSO_H
-#define ABSO_H
+#ifndef ALIABSO_H
+#define ALIABSO_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx
index da18a39..4412b9a 100644 (file)
--- a/STRUCT/AliBODY.cxx
+++ b/STRUCT/AliBODY.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  1999/09/29 09:24:30  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -92,7 +95,7 @@ void AliBODY::CreateGeometry()
   */
   //End_Html
 
-  Float_t DALIC[10];
+  Float_t dALIC[10];
   Int_t *idtmed = fIdtmed->GetArray()+1;
   //
   if(gAlice->GetModule("ZDC")) {
@@ -100,41 +103,42 @@ void AliBODY::CreateGeometry()
     // If the ZDC is present we have an asymmetric box
     // made by a four sides polygone
     //
-    DALIC[0]=45;
-    DALIC[1]=360;
-    DALIC[2]=4;
-    DALIC[3]=2;
-    DALIC[4]=-3000;
-    DALIC[5]=0;
-    DALIC[6]=2000;
-    DALIC[7]=15000;
-    DALIC[8]=0;
-    DALIC[9]=2000;
-    gMC->Gsvolu("ALIC","PGON",idtmed[1],DALIC,10);
+    dALIC[0]=45;
+    dALIC[1]=360;
+    dALIC[2]=4;
+    dALIC[3]=2;
+    dALIC[4]=-3000;
+    dALIC[5]=0;
+    dALIC[6]=2000;
+    dALIC[7]=15000;
+    dALIC[8]=0;
+    dALIC[9]=2000;
+    gMC->Gsvolu("ALIC","PGON",idtmed[1],dALIC,10);
   } else {
     //
     // If the ZDC is not present make just a BOX
     //
-    DALIC[0]=2000;
-    DALIC[1]=2000;
-    DALIC[2]=3000;
-    gMC->Gsvolu("ALIC","BOX ",idtmed[1],DALIC,3);
+    dALIC[0]=2000;
+    dALIC[1]=2000;
+    dALIC[2]=3000;
+    gMC->Gsvolu("ALIC","BOX ",idtmed[1],dALIC,3);
   }
 }
  
 //_____________________________________________________________________________
 void AliBODY::CreateMaterials()
 {
-  Int_t ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+// Create materials and media
+  Int_t isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   //
   AliMaterial(1,"Vacuum  $",1.e-16,1.e-16,1.e-16,1.e16,1.e16);
   AliMaterial(2,"Air     $",14.61,7.3,0.001205,30420,67500);
   AliMaterial(3,"Be      $", 9.01,4 ,1.848   ,35.30,36.70);
   //
-  AliMedium(1,"Vacuum  $",1,0,ISXFLD,SXMGMX,10,1,0.1,0.1,10);
-  AliMedium(2,"Air     $",2,0,ISXFLD,SXMGMX,10,-1,-0.1,0.1 ,-10);
-  AliMedium(3,"Be pipe $",3,0,ISXFLD,SXMGMX,10,0.1,0.1,0.01,0.01);
+  AliMedium(1,"Vacuum  $",1,0,isxfld,sxmgmx,10,1,0.1,0.1,10);
+  AliMedium(2,"Air     $",2,0,isxfld,sxmgmx,10,-1,-0.1,0.1 ,-10);
+  AliMedium(3,"Be pipe $",3,0,isxfld,sxmgmx,10,0.1,0.1,0.01,0.01);
 }
  
 //_____________________________________________________________________________

diff --git a/STRUCT/AliBODY.h b/STRUCT/AliBODY.h
index 946bcec..eb4c56d 100644 (file)
--- a/STRUCT/AliBODY.h
+++ b/STRUCT/AliBODY.h
@@ -1,5 +1,5 @@
-#ifndef BODY_H
-#define BODY_H
+#ifndef ALIBODY_H
+#define ALIBODY_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliDIPO.h b/STRUCT/AliDIPO.h
index 3e10cec..6ccb8f9 100644 (file)
--- a/STRUCT/AliDIPO.h
+++ b/STRUCT/AliDIPO.h
@@ -1,5 +1,5 @@
-#ifndef DIPO_H
-#define DIPO_H
+#ifndef ALIDIPO_H
+#define ALIDIPO_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliDIPOv1.cxx b/STRUCT/AliDIPOv1.cxx
index 06cc0e3..a399d10 100644 (file)
--- a/STRUCT/AliDIPOv1.cxx
+++ b/STRUCT/AliDIPOv1.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  1999/09/29 09:24:30  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -200,8 +203,8 @@ void AliDIPOv1::CreateMaterials()
   // Create Materials for Dipole Magnet version 1
   //
   
-  Int_t ISXFLD   = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t isxfld   = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -231,32 +234,32 @@ void AliDIPOv1::CreateMaterials()
   
   //    Air 
 
-  AliMedium(1, "AIR_DI_US         ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(2, "AIR_DI_US         ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(3, "AIR_L3_US         ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(1, "AIR_DI_US         ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(2, "AIR_DI_US         ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(3, "AIR_L3_US         ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Aluminum 
   
-  AliMedium(8, "ALU_DI_US         ", 9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(11, "ALU_DI_SH         ", 9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(8, "ALU_DI_US         ", 9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(11, "ALU_DI_SH         ", 9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Iron 
   
-  AliMedium(31, "FE_NF_US          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(32, "FE_DI_US          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(33, "FE_L3_US          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(34, "FE_NF_SH          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "FE_DI_SH          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(36, "FE_L3_SH          ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(31, "FE_NF_US          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(32, "FE_DI_US          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(33, "FE_L3_US          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(34, "FE_NF_SH          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "FE_DI_SH          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(36, "FE_L3_SH          ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Vacuum 
   
-  AliMedium(37, "VA_NF_US          ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(38, "VA_DI_US          ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(39, "VA_L3_US          ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(37, "VA_NF_US          ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(38, "VA_DI_US          ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(39, "VA_L3_US          ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Steel 
   
-  AliMedium(75, "ST_L3_US          ", 24, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(75, "ST_L3_US          ", 24, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 

diff --git a/STRUCT/AliDIPOv1.h b/STRUCT/AliDIPOv1.h
index ad27e0f..8faca3f 100644 (file)
--- a/STRUCT/AliDIPOv1.h
+++ b/STRUCT/AliDIPOv1.h
@@ -1,5 +1,5 @@
-#ifndef DIPOv1_H
-#define DIPOv1_H
+#ifndef ALIDIPOV1_H
+#define ALIDIPOV1_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx
index 1ba71d5..8af824f 100644 (file)
--- a/STRUCT/AliDIPOv2.cxx
+++ b/STRUCT/AliDIPOv2.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.10  2000/06/09 19:32:56  morsch
+New detailed and corrected version from Galina Chabratova
+
 Revision 1.9  2000/04/27 09:29:53  fca
 Reverting to version 1.6.2
 
@@ -82,11 +85,11 @@ void AliDIPOv2::CreateGeometry()
   Float_t cpar[5], tpar[3], ypar[12];
   Float_t dz, dx, dy;
   Int_t idrotm[1899];
-  Float_t acc_max, the1, phi1, the2, phi2, the3, phi3;
+  Float_t accMax, the1, phi1, the2, phi2, the3, phi3;
   
   Int_t *idtmed = fIdtmed->GetArray()-1799;
 
-  acc_max = 9.;   // ANGLE POLAIRE MAXIMUM 
+  accMax = 9.;   // ANGLE POLAIRE MAXIMUM 
 
   //       DIPOLE MAGNET 
 
@@ -655,8 +658,8 @@ void AliDIPOv2::CreateMaterials()
   // Create Materials for Magnetic Dipole version 2
   //
   
-  Int_t ISXFLD   = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t isxfld   = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -739,49 +742,49 @@ void AliDIPOv2::CreateMaterials()
   // *************** 
   
   //    Aluminum 
-  AliMedium(9, "ALU_C0          ",  9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(29, "ALU_C1          ", 29, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(49, "ALU_C2          ", 49, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(9, "ALU_C0          ",  9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(29, "ALU_C1          ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(49, "ALU_C2          ", 49, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Iron 
-  AliMedium(10, "FE_C0           ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(30, "FE_C1           ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(50, "FE_C2           ", 50, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(10, "FE_C0           ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(30, "FE_C1           ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(50, "FE_C2           ", 50, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Air 
-  AliMedium(15, "AIR_C0          ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "AIR_C1          ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(55, "AIR_C2          ", 55, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_C0          ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_C1          ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(55, "AIR_C2          ", 55, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Vacuum 
-  AliMedium(16, "VA_C0           ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(36, "VA_C1           ", 36, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(56, "VA_C2           ", 56, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(16, "VA_C0           ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(36, "VA_C1           ", 36, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(56, "VA_C2           ", 56, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Steel 
-  AliMedium(19, "ST_C0           ", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(39, "ST_C1           ", 39, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(59, "ST_C3           ", 59, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(19, "ST_C0           ", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(39, "ST_C1           ", 39, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(59, "ST_C3           ", 59, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Coil 
-  AliMedium(14, "Coil_C1         ", 14, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(34, "Coil_C2         ", 34, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(54, "Coil_C3         ", 54, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(14, "Coil_C1         ", 14, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(34, "Coil_C2         ", 34, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(54, "Coil_C3         ", 54, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //    Resin 
-  AliMedium(13, "RESIN_C0         ", 13, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(33, "RESIN_C1         ", 33, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(53, "RESIN_C2         ", 53, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(13, "RESIN_C0         ", 13, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(33, "RESIN_C1         ", 33, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(53, "RESIN_C2         ", 53, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //    G10 
-  AliMedium(11, "G10_C0         ", 11, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(31, "G10_C1         ", 31, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(51, "G10_C2         ", 51, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(11, "G10_C0         ", 11, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(31, "G10_C1         ", 31, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(51, "G10_C2         ", 51, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //Aluminium Contactor
-  AliMedium(12, "AlCond_C0         ", 12, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(32, "AlCond_C1         ", 32, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(52, "AlCond_C2         ", 52, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(12, "AlCond_C0         ", 12, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(32, "AlCond_C1         ", 32, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(52, "AlCond_C2         ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 

diff --git a/STRUCT/AliDIPOv2.h b/STRUCT/AliDIPOv2.h
index b0915e7..423b016 100644 (file)
--- a/STRUCT/AliDIPOv2.h
+++ b/STRUCT/AliDIPOv2.h
@@ -1,5 +1,5 @@
-#ifndef DIPOv2_H
-#define DIPOv2_H
+#ifndef ALIDIPOV2_H
+#define ALIDIPOV2_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliFRAME.h b/STRUCT/AliFRAME.h
index 6ee7a58..c20ed32 100644 (file)
--- a/STRUCT/AliFRAME.h
+++ b/STRUCT/AliFRAME.h
@@ -1,5 +1,5 @@
-#ifndef FRAME_H
-#define FRAME_H
+#ifndef ALIFRAME_H
+#define ALIFRAME_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx
index f7a91a6..a838d8a 100644 (file)
--- a/STRUCT/AliFRAMEv0.cxx
+++ b/STRUCT/AliFRAMEv0.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.12  2000/02/23 16:25:24  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 Revision 1.11  1999/11/01 20:42:42  fca
 FRAME version 1 is now the symmetric one.
 
@@ -39,12 +43,14 @@ ClassImp(AliFRAMEv0)
 //_____________________________________________________________________________
 AliFRAMEv0::AliFRAMEv0()
 {
+// Constructor
 }
 
 //_____________________________________________________________________________
 AliFRAMEv0::AliFRAMEv0(const char *name, const char *title)
   : AliFRAME(name,title)
 {
+// Constructor
   printf("Create FRAMEv0 object\n");  
   fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame1099h.euc";
   fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";

diff --git a/STRUCT/AliFRAMEv0.h b/STRUCT/AliFRAMEv0.h
index 062e920..b0a7dc1 100644 (file)
--- a/STRUCT/AliFRAMEv0.h
+++ b/STRUCT/AliFRAMEv0.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEv0_H
-#define FRAMEv0_H
+#ifndef ALIFRAMEV0_H
+#define ALIFRAMEV0_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliFRAMEv1.cxx b/STRUCT/AliFRAMEv1.cxx
index 305793c..8b259aa 100644 (file)
--- a/STRUCT/AliFRAMEv1.cxx
+++ b/STRUCT/AliFRAMEv1.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.8  2000/02/23 16:25:24  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 Revision 1.7  1999/11/01 20:42:42  fca
 FRAME version 1 is now the symmetric one.
 
@@ -36,12 +40,14 @@ ClassImp(AliFRAMEv1)
 //_____________________________________________________________________________
 AliFRAMEv1::AliFRAMEv1()
 {
+// Constructor
 }
 
 //_____________________________________________________________________________
 AliFRAMEv1::AliFRAMEv1(const char *name, const char *title)
   : AliFRAME(name,title)
 {
+// Constructor
   printf("Create FRAMEv1 object\n");  
   fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame1099i.euc";
   fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";
@@ -96,6 +102,7 @@ void AliFRAMEv1::CreateGeometry()
 //___________________________________________
 void AliFRAMEv1::CreateMaterials()
 {
+// Create materials and media (from Euclid file)
   char *filetmp;
   printf("Create FRAMEv1 materials\n");
   filetmp = gSystem->ExpandPathName(fEuclidMaterial.Data());

diff --git a/STRUCT/AliFRAMEv1.h b/STRUCT/AliFRAMEv1.h
index 1207357..84addbc 100644 (file)
--- a/STRUCT/AliFRAMEv1.h
+++ b/STRUCT/AliFRAMEv1.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEv1_H
-#define FRAMEv1_H
+#ifndef ALIFRAMEV1_H
+#define ALIFRAMEV1_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index 4915d22..2c6012a 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.7  2000/01/12 15:33:28  morsch
+Muon filter removed
+
 Revision 1.6  1999/09/29 09:24:30  fca
 Introduction of the Copyright and cvs Log
 
@@ -99,16 +102,14 @@ void AliHALL::CreateGeometry()
 
   
   Float_t r2;
-  Float_t phid, phim, tpar[3], pbox[3], zfil_out, h, r, tspar[5];
+  Float_t phid, phim, tpar[3], pbox[3], h, r, tspar[5];
   Float_t w1, dh, am, bm, dl,cm, hm, dr, dx, xl;
   Int_t idrotm[1999];
   Float_t trdpar[4], trapar[11], hullen;
-  Float_t dz, phi, par[3], zfil_in;
+  Float_t dz, phi, par[3], zFilterIn;
   
   Int_t *idtmed = fIdtmed->GetArray()-1899;
   
-  zfil_in  = 1471.;
-  zfil_out = 1591.;
   //     RB24/26 TUNNEL FLOOR 
   
   r   = 220.;
@@ -290,8 +291,8 @@ void AliHALL::CreateMaterials()
   //
   
 
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t aconc[10] = { 1.,12.01,15.994,22.99,24.305,26.98,28.086,39.1,40.08,55.85 };
   Float_t zconc[10] = { 1.,6.,8.,11.,12.,13.,14.,19.,20.,26. };
@@ -324,21 +325,21 @@ void AliHALL::CreateMaterials()
   
   //     IRON 
   
-  AliMedium(10, "FE_C0             ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(30, "FE_C1             ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(50, "FE_C2             ", 50, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(10, "FE_C0             ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(30, "FE_C1             ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(50, "FE_C2             ", 50, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Air 
   
-  AliMedium(15, "AIR_C0           ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "AIR_C1           ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(55, "AIR_C2           ", 55, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_C0           ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_C1           ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(55, "AIR_C2           ", 55, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Concrete 
   
-  AliMedium(17, "CC_C0            ", 17, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(37, "CC_C1            ", 37, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(57, "CC_C2            ", 57, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(17, "CC_C0            ", 17, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(37, "CC_C1            ", 37, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(57, "CC_C2            ", 57, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________

diff --git a/STRUCT/AliHALL.h b/STRUCT/AliHALL.h
index 54de0f7..c701da7 100644 (file)
--- a/STRUCT/AliHALL.h
+++ b/STRUCT/AliHALL.h
@@ -1,5 +1,5 @@
-#ifndef HALL_H
-#define HALL_H
+#ifndef ALIHALL_H
+#define ALIHALL_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx
index a37f3b8..b79058a 100644 (file)
--- a/STRUCT/AliMAG.cxx
+++ b/STRUCT/AliMAG.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  1999/09/29 09:24:30  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -202,8 +205,8 @@ void AliMAG::CreateMaterials()
   // Create materials for L3 magnet
   //
   
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t epsil, stmin, deemax, tmaxfd, stemax;
   // --- Define the various materials for GEANT --- 
@@ -233,18 +236,18 @@ void AliMAG::CreateMaterials()
   
   //    IRON 
   
-  AliMedium(10, "FE_C0             ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(30, "FE_C1             ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(10, "FE_C0             ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(30, "FE_C1             ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //     ALUMINUM 
 
-  AliMedium(9, "ALU_C0            ",  9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(29, "ALU_C1            ", 29, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(9, "ALU_C0            ",  9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(29, "ALU_C1            ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //     AIR 
   
-  AliMedium(15, "AIR_C0            ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "AIR_C1            ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_C0            ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_C1            ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________

diff --git a/STRUCT/AliMAG.h b/STRUCT/AliMAG.h
index 999697c..477eda7 100644 (file)
--- a/STRUCT/AliMAG.h
+++ b/STRUCT/AliMAG.h
@@ -1,5 +1,5 @@
-#ifndef MAG_H
-#define MAG_H
+#ifndef ALIMAG_H
+#define ALIMAG_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliPIPE.h b/STRUCT/AliPIPE.h
index e71b5d9..7f39115 100644 (file)
--- a/STRUCT/AliPIPE.h
+++ b/STRUCT/AliPIPE.h
@@ -1,5 +1,5 @@
-#ifndef PIPE_H
-#define PIPE_H
+#ifndef ALIPIPE_H
+#define ALIPIPE_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index b990982..dd339ee 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.7  2000/02/23 16:25:24  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 Revision 1.6  1999/09/29 09:24:30  fca
 Introduction of the Copyright and cvs Log
 
@@ -33,12 +37,14 @@ ClassImp(AliPIPEv0)
 //_____________________________________________________________________________
 AliPIPEv0::AliPIPEv0()
 {
+// Constructor
 }
 
 //_____________________________________________________________________________
 AliPIPEv0::AliPIPEv0(const char *name, const char *title)
   : AliPIPE(name,title)
 {
+// Constructor
 }
 
  
@@ -59,8 +65,8 @@ void AliPIPEv0::CreateGeometry()
 */
 //End_Html
 
-  const char *pipename = "$(ALICE_ROOT)/Euclid/bpipeb.euc";
-  const char *pumpname = "$(ALICE_ROOT)/Euclid/bpumpa.euc";
+  const char *kPipeName = "$(ALICE_ROOT)/Euclid/bpipeb.euc";
+  const char *kPumpName = "$(ALICE_ROOT)/Euclid/bpumpa.euc";
   char *filtmp;
   char topvol[5];
   printf("Create PIPEv0 geometry ");
@@ -69,28 +75,28 @@ void AliPIPEv0::CreateGeometry()
 
 //
 // The peam pipe up to the Front Absorber
-  filtmp=gSystem->ExpandPathName(pipename);
+  filtmp=gSystem->ExpandPathName(kPipeName);
   FILE *file = fopen(filtmp,"r");
   delete [] filtmp;
   if(file) {
     fclose(file);
     printf(" Reading PIPE \n");
-    ReadEuclid(pipename,topvol);
+    ReadEuclid(kPipeName,topvol);
   } else {
-    printf(" THE GEOM FILE %s DOES NOT EXIST !\n",pipename);
+    printf(" THE GEOM FILE %s DOES NOT EXIST !\n",kPipeName);
     exit(1);
   }
 //
 // The Ion Pump
-  filtmp=gSystem->ExpandPathName(pumpname);
+  filtmp=gSystem->ExpandPathName(kPumpName);
   file = fopen(filtmp,"r");
   delete [] filtmp;
   if(file) {
     fclose(file);
     printf(" Reading PUMP \n");
-    ReadEuclid(pumpname,topvol);
+    ReadEuclid(kPumpName,topvol);
   } else {
-    printf(" THE GEOM FILE %s DOES NOT EXIST !\n",pumpname);
+    printf(" THE GEOM FILE %s DOES NOT EXIST !\n",kPumpName);
     exit(1);
   }
 //
@@ -114,22 +120,25 @@ void AliPIPEv0::CreateGeometry()
 //___________________________________________
 void AliPIPEv0::DrawModule()
 {
+// Set drawing options
+    ;
 }
 
 //___________________________________________
 void AliPIPEv0::CreateMaterials()
 {
+// Create materials and media from Euclid file
   printf("Create PIPEv0 materials\n");
-  const char *name = "$(ALICE_ROOT)/Euclid/pipe.tme";
+  const char *kName = "$(ALICE_ROOT)/Euclid/pipe.tme";
   char *filtmp;
-  filtmp=gSystem->ExpandPathName(name);
+  filtmp=gSystem->ExpandPathName(kName);
   FILE *file = fopen(filtmp,"r");
   delete [] filtmp;
   if(file) {
     fclose(file);
-    ReadEuclidMedia(name);
+    ReadEuclidMedia(kName);
   } else {
-    printf(" THE MEDIA FILE %s DOES NOT EXIST !\n",name);
+    printf(" THE MEDIA FILE %s DOES NOT EXIST !\n",kName);
     exit(1);
   }
 }

diff --git a/STRUCT/AliPIPEv0.h b/STRUCT/AliPIPEv0.h
index 0cccdc8..1fb30b3 100644 (file)
--- a/STRUCT/AliPIPEv0.h
+++ b/STRUCT/AliPIPEv0.h
@@ -1,5 +1,5 @@
-#ifndef PIPEv0_H
-#define PIPEv0_H
+#ifndef ALIPIPEV0_H
+#define ALIPIPEV0_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliPIPEv1.cxx b/STRUCT/AliPIPEv1.cxx
index 1fa6e2e..f43b321 100644 (file)
--- a/STRUCT/AliPIPEv1.cxx
+++ b/STRUCT/AliPIPEv1.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  1999/09/29 09:24:30  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -69,22 +72,22 @@ void AliPIPEv1::CreateGeometry()
   */
   //End_Html
 
-  Float_t tpar[3], dzmo, zpos, abs_d, abs_l;
+  Float_t tpar[3], dzmo, zpos, absorberDistance, absorberEnd;
   Float_t r2, dr;
 
-  const Double_t z_flange = 150;
+  const Double_t kZFlange = 150;
   
   Int_t *idtmed = fIdtmed->GetArray()-1999;
   
   
-  abs_d   = 90.;  // DEFINES DRIFT LENGTH 
+  absorberDistance   = 90.;  // DEFINES DRIFT LENGTH 
   //z_nose  = 102.;
   //z_cone  = 285.;
   //theta1  = 24.;  // 1. angle defining the front absorber 
   //theta2  = 5.;   // 2. angle defining the front absorbe 
   //acc_max = 9.;   // ANGLE POLAIRE MAXIMUM 
   //acc_min = 2.;   // ANGLE POLAIRE MINIMUM DE DETECTION 
-  abs_l   = 503.;
+  absorberEnd   = 503.;
   //d_steel = 1.;   // THICKNESS OF STEEL SUPPORT 
   //d_poly  = 7.5;
   //d_pb    = 2.5;
@@ -126,14 +129,14 @@ void AliPIPEv1::CreateGeometry()
   
   tpar[0] = 0.;
   tpar[1] = 3.;
-  tpar[2] = (abs_d + 700.) / 2.;
-  dzmo = tpar[2] - abs_d;
+  tpar[2] = (absorberDistance + 700.) / 2.;
+  dzmo = tpar[2] - absorberDistance;
   gMC->Gsvolu("QQMO", "TUBE", idtmed[2015], tpar, 3);
   gMC->Gspos("QQMO", 1, "ALIC", 0., 0., -dzmo, 0, "ONLY");
   
   //       BEAM PIPE IN DRIFT SPACE 
   
-  //     -30-z_flange 
+  //     -30-kZFlange 
   tpar[0] = 0.;
   tpar[1] = 3.;
   tpar[2] = 30;
@@ -160,10 +163,10 @@ void AliPIPEv1::CreateGeometry()
   
   
   
-  //     -30 - Z_FLANGE 
+  //     -30 - kZFlange 
   tpar[0] = 0.;
   tpar[1] = 3.;
-  tpar[2] = (z_flange - 30)/2;
+  tpar[2] = (kZFlange - 30)/2;
   gMC->Gsvolu("QDT5", "TUBE", idtmed[2015], tpar, 3);
   
   tpar[0] = 2.9;
@@ -174,7 +177,7 @@ void AliPIPEv1::CreateGeometry()
   
   //     STRAIGHT STEEL PIECE 
   
-  zpos    = -z_flange;
+  zpos    = -kZFlange;
   r2      = 2.9;
   dr      = .015;
   tpar[0] = 0.;
@@ -193,7 +196,7 @@ void AliPIPEv1::CreateGeometry()
   tpar[1] = 5.7;
   tpar[2] = 2.;
   gMC->Gsvolu("QN63", "TUBE", idtmed[2018], tpar, 3);
-  zpos = tpar[2] - z_flange;
+  zpos = tpar[2] - kZFlange;
   gMC->Gspos("QN63", 1, "ALIC", 0., 0., zpos, 0, "ONLY");
   
   
@@ -202,27 +205,27 @@ void AliPIPEv1::CreateGeometry()
   
   if (gAlice->GetModule("ABSO") == 0) {
     
-    gMC->Gspos("QN63", 2, "ALIC", 0., 0., z_flange, 0, "ONLY");
+    gMC->Gspos("QN63", 2, "ALIC", 0., 0., kZFlange, 0, "ONLY");
     r2      = 2.9;
     dr      = .1;
     tpar[0] = 0.;
     tpar[1] = r2 + dr;
-    tpar[2] = (z_flange - abs_d) / 2.;
+    tpar[2] = (kZFlange - absorberDistance) / 2.;
     gMC->Gsvolu("QDT8", "TUBE", idtmed[2015], tpar, 3);
     tpar[0] = r2;
     gMC->Gsvolu("QTB8", "TUBE", idtmed[2004], tpar, 3);
     gMC->Gspos("QTB8", 1, "QDT8", 0., 0., 0., 0, "ONLY");
-    zpos    = abs_d + tpar[2];
+    zpos    = absorberDistance + tpar[2];
     gMC->Gspos("QDT8", 1, "ALIC", 0., 0., zpos, 0, "ONLY");
     dr      = .015;
     tpar[0] = 0.;
     tpar[1] = r2 + dr;
-    tpar[2] = (abs_l - z_flange) / 2.;
+    tpar[2] = (absorberEnd - kZFlange) / 2.;
     gMC->Gsvolu("QDTS", "TUBE", idtmed[2015], tpar, 3);
     tpar[0] = r2;
     gMC->Gsvolu("QTBS", "TUBE", idtmed[2018], tpar, 3);
     gMC->Gspos("QTBS", 1, "QDTS", 0., 0., 0., 0, "ONLY");
-    zpos = tpar[2] + z_flange;
+    zpos = tpar[2] + kZFlange;
     gMC->Gspos("QDTS", 1, "ALIC", 0., 0., zpos, 0, "ONLY");
   }
   if (gAlice->GetModule("SHIL") == 0) {
@@ -230,12 +233,12 @@ void AliPIPEv1::CreateGeometry()
     dr      = .015;
     tpar[0] = 0.;
     tpar[1] = r2 + dr;
-    tpar[2] = (700. - abs_l) / 2.;
+    tpar[2] = (700. - absorberEnd) / 2.;
     gMC->Gsvolu("QDT9", "TUBE", idtmed[2015], tpar, 3);
     tpar[0] = r2;
     gMC->Gsvolu("QTB9", "TUBE", idtmed[2018], tpar, 3);
     gMC->Gspos("QTB9", 1, "QDT9", 0., 0., 0., 0, "ONLY");
-    zpos = abs_l + tpar[2];
+    zpos = absorberEnd + tpar[2];
     gMC->Gspos("QDT9", 1, "ALIC", 0., 0., zpos, 0, "ONLY");
   }
 }
@@ -284,8 +287,8 @@ void AliPIPEv1::CreateMaterials()
   // Create materials for beam pipe
   //
 
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -314,18 +317,18 @@ void AliPIPEv1::CreateMaterials()
   
   //    Air 
   
-  AliMedium(15, "AIR_L3_US", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_L3_US", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Beryllium 
   
-  AliMedium(5, "BE_L3_US", 5, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(5, "BE_L3_US", 5, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Vacuum 
   
-  AliMedium(16, "VA_L3_US", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(16, "VA_L3_US", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Steel 
   
-  AliMedium(19, "ST_L3_US", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(19, "ST_L3_US", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 

diff --git a/STRUCT/AliPIPEv1.h b/STRUCT/AliPIPEv1.h
index 9150c91..7367b60 100644 (file)
--- a/STRUCT/AliPIPEv1.h
+++ b/STRUCT/AliPIPEv1.h
@@ -1,5 +1,5 @@
-#ifndef PIPEv1_H
-#define PIPEv1_H
+#ifndef ALIPIPEV1_H
+#define ALIPIPEV1_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STRUCT/AliPIPEv3.cxx b/STRUCT/AliPIPEv3.cxx
index b50f4de..9b51b75 100644 (file)
--- a/STRUCT/AliPIPEv3.cxx
+++ b/STRUCT/AliPIPEv3.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  1999/10/06 19:57:07  fca
+Correct materials in pipe
+
 Revision 1.5  1999/09/29 09:24:30  fca
 Introduction of the Copyright and cvs Log
 
@@ -360,8 +363,8 @@ void AliPIPEv3::CreateMaterials()
   // Create materials for beam pipe
   //
 
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -391,24 +394,24 @@ void AliPIPEv3::CreateMaterials()
   
   //    Air 
   
-  AliMedium(15, "AIR_L3_US", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_L3_US", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Beryllium 
   
-  AliMedium(5, "BE_L3_US", 5, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(5, "BE_L3_US", 5, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   
     //    Aluminium 
   
-  AliMedium(4, "AL_L3_US", 4, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(4, "AL_L3_US", 4, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //   Vacuum
 
-  AliMedium(16, "VA_L3_US", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(16, "VA_L3_US", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Steel 
   
-  AliMedium(19, "ST_L3_US", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(19, "ST_L3_US", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 //
 void AliPIPEv3::Undulation(char *undul, Float_t pitch, Float_t thick,
@@ -428,8 +431,8 @@ void AliPIPEv3::Undulation(char *undul, Float_t pitch, Float_t thick,
   // Thus apear the constants 0.293 and 0.707.
   //
 
-  const Float_t const1 = .293;
-  const Float_t const2 = .707;
+  const Float_t kConst1 = .293;
+  const Float_t kConst2 = .707;
 
   // Local variables
   Int_t j, nwave;
@@ -440,16 +443,16 @@ void AliPIPEv3::Undulation(char *undul, Float_t pitch, Float_t thick,
 
   // Function Body
 
-  dcone1[0] = const1 * pitch / 2;
+  dcone1[0] = kConst1 * pitch / 2;
   dcone1[1] = rundul;
   dcone1[2] = dcone1[1] + thick;
-  dcone1[3] = dcone1[1] + const2 * pitch;
+  dcone1[3] = dcone1[1] + kConst2 * pitch;
   dcone1[4] = dcone1[3] + thick;
 
-  dcone2[0] = const2 * pitch / 2;
+  dcone2[0] = kConst2 * pitch / 2;
   dcone2[1] = dcone1[3];
   dcone2[2] = dcone1[4];
-  dcone2[3] = dcone2[1] + const1 * pitch;
+  dcone2[3] = dcone2[1] + kConst1 * pitch;
   dcone2[4] = dcone2[3] + thick;
 
   dcone3[0] = dcone2[0];
@@ -467,13 +470,13 @@ void AliPIPEv3::Undulation(char *undul, Float_t pitch, Float_t thick,
   dcone5[0] = dcone1[0];
   dcone5[1] = dcone1[1] - thick;
   dcone5[2] = dcone1[1];
-  dcone5[3] = dcone5[1] - const2 * pitch;
+  dcone5[3] = dcone5[1] - kConst2 * pitch;
   dcone5[4] = dcone5[3] + thick;
 
   dcone6[0] = dcone2[0];
   dcone6[1] = dcone5[3];
   dcone6[2] = dcone5[4];
-  dcone6[3] = dcone6[1] - const1 * pitch;
+  dcone6[3] = dcone6[1] - kConst1 * pitch;
   dcone6[4] = dcone6[3] + thick;
   dcone7[0] = dcone6[0];
   dcone7[1] = dcone6[3];

diff --git a/STRUCT/AliPIPEv3.h b/STRUCT/AliPIPEv3.h
index ea341e8..9fc3ee1 100644 (file)
--- a/STRUCT/AliPIPEv3.h
+++ b/STRUCT/AliPIPEv3.h
@@ -1,5 +1,5 @@
-#ifndef PIPEv3_H
-#define PIPEv3_H
+#ifndef ALIPIPEV3_H
+#define ALIPIPEV3_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -22,8 +22,8 @@ public:
   virtual void  CreateMaterials();
   virtual Int_t IsVersion() const {return 3;}
   virtual void  DrawModule();
-  virtual void  Undulation(char *, Float_t, Float_t, Float_t, Float_t,
-                           char (*)[5]);
+  virtual void  Undulation(char *undul, Float_t pitch, Float_t thick, Float_t zundul, Float_t rundul,
+                           char (*cone)[5]);
   ClassDef(AliPIPEv3,1)  //Class for PIPE version 3
 };
 

diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx
index fd34179..cc243f9 100644 (file)
--- a/STRUCT/AliSHIL.cxx
+++ b/STRUCT/AliSHIL.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2000/02/23 13:48:33  morsch
+Detailed composition of insulation material.
+
 Revision 1.7  2000/01/12 15:37:57  morsch
 Base class only
 
@@ -77,8 +80,8 @@ void AliSHIL::CreateMaterials()
   //
   // Defines materials for the muon shield
   //
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
 // Steel  
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -186,71 +189,71 @@ void AliSHIL::CreateMaterials()
   // *************** 
   
   //    Aluminum 
-  AliMedium(9,  "ALU_C0          ", 9, 0,  ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(29, "ALU_C1          ", 29, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(49, "ALU_C2          ", 49, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(9,  "ALU_C0          ", 9, 0,  isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(29, "ALU_C1          ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(49, "ALU_C2          ", 49, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Iron 
-  AliMedium(10, "FE_C0           ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(30, "FE_C1           ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(50, "FE_C2           ", 50, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(10, "FE_C0           ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(30, "FE_C1           ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(50, "FE_C2           ", 50, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //    Iron 
-  AliMedium(11, "Cu_C0           ", 11, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(31, "Cu_C1           ", 31, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(51, "Cu_C2           ", 51, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(11, "Cu_C0           ", 11, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(31, "Cu_C1           ", 31, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(51, "Cu_C2           ", 51, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Tungsten 
-  AliMedium(12, "W_C0            ", 12, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(32, "W_C1            ", 32, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(52, "W_C2            ", 52, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(12, "W_C0            ", 12, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(32, "W_C1            ", 32, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(52, "W_C2            ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Lead 
-  AliMedium(13, "PB_C0           ", 13, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(33, "PB_C1           ", 33, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(53, "PB_C2           ", 53, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(13, "PB_C0           ", 13, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(33, "PB_C1           ", 33, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(53, "PB_C2           ", 53, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //    Insulation Powder 
-  AliMedium(14, "INS_C0          ", 14, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(34, "INS_C1          ", 34, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(54, "INS_C2          ", 54, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(14, "INS_C0          ", 14, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(34, "INS_C1          ", 34, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(54, "INS_C2          ", 54, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Air 
-  AliMedium(15, "AIR_C0          ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(35, "AIR_C1          ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(55, "AIR_C2          ", 55, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR_C0          ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_C1          ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(55, "AIR_C2          ", 55, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Vacuum 
-  AliMedium(16, "VA_C0           ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(36, "VA_C1           ", 36, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(56, "VA_C2           ", 56, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(16, "VA_C0           ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(36, "VA_C1           ", 36, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(56, "VA_C2           ", 56, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Steel 
-  AliMedium(19, "ST_C0           ", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(39, "ST_C1           ", 39, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(59, "ST_C3           ", 59, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(19, "ST_C0           ", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(39, "ST_C1           ", 39, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(59, "ST_C3           ", 59, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
   //    Lead/Tungsten 
-  AliMedium(20, "PB/W0           ", 20, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(40, "PB/W1           ", 40, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(60, "PB/W3           ", 60, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(20, "PB/W0           ", 20, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(40, "PB/W1           ", 40, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(60, "PB/W3           ", 60, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
   //    Ni/Tungsten 
-  AliMedium(21, "Ni/W0           ", 21, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(41, "Ni/W1           ", 41, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(61, "Ni/W3           ", 61, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(21, "Ni/W0           ", 21, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(41, "Ni/W1           ", 41, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(61, "Ni/W3           ", 61, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
 //    Concrete 
-  AliMedium(17, "CC_C0           ", 17, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(37, "CC_C1           ", 37, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(57, "CC_C2           ", 57, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(17, "CC_C0           ", 17, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(37, "CC_C1           ", 37, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(57, "CC_C2           ", 57, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
 }
 
 //_____________________________________________________________________________
 void AliSHIL::DrawModule () 
 {
- 
+    // Drawing options
 }
 
 //_____________________________________________________________________________

diff --git a/STRUCT/AliSHIL.h b/STRUCT/AliSHIL.h
index ff2894c..24e3de5 100644 (file)
--- a/STRUCT/AliSHIL.h
+++ b/STRUCT/AliSHIL.h
@@ -1,5 +1,5 @@
-#ifndef SHIL_H
-#define SHIL_H
+#ifndef ALISHIL_H
+#define ALISHIL_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */