X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliABSO.cxx;h=6943700fb9d67341b9dc1094c9da5593f60d8324;hb=baf5b4276209446738033d1f6588c4dcc6bbc981;hp=35fe220c1f43720e498a0dde9f1efa0ccf816e8f;hpb=b43eb0dca6a0b57b484b305675272fd82dda8b02;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx
index 35fe220c1f4..6943700fb9d 100644
--- a/STRUCT/AliABSO.cxx
+++ b/STRUCT/AliABSO.cxx
@@ -13,18 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$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
-
-Revision 1.6  1999/09/29 09:24:29  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -49,6 +38,7 @@ Introduction of the Copyright and cvs Log
 
 #include "AliABSO.h"
 #include "AliRun.h"
+#include "AliMagF.h"
 #include "AliConst.h"
  
 ClassImp(AliABSO)
@@ -116,6 +106,17 @@ void AliABSO::CreateMaterials()
   Float_t aniwcu[3] ={58.6934, 183.84, 63.546};
   Float_t zniwcu[3] ={28., 74., 29};
   Float_t wniwcu[3] ={0.015,0.95,0.035};
+// Poly Concrete
+//                      H     Li     F       C      Al     Si      Ca      Pb     O
+  Float_t aPolyCc[9] = {1. ,  6.941, 18.998, 12.01, 26.98, 28.086, 40.078, 207.2, 15.999};
+  Float_t zPolyCc[9] = {1. ,  3.   ,  9.   ,  6.  , 13.  , 14.   , 20.   ,  82. ,  8.   };
+  Float_t wPolyCc[9] = {4.9,  1.2  ,  1.3  ,  1.1 ,  0.15,  0.02 ,  0.06 ,   0.7,  1.1  };
+  Float_t wtot=0;
+  Int_t   i=0;
+
+  for (i=0; i<9; i++) wtot+=wPolyCc[i];
+  for (i=0; i<9; i++) wPolyCc[i]/=wtot;  
+
 //
 // Insulation powder
 //                    Si         O       Ti     Al
@@ -126,9 +127,9 @@ void AliABSO::CreateMaterials()
   Float_t epsil, stmin, tmaxfd, deemax, stemax;
   //
   //     Carbon 
-  AliMaterial(6,  "CARBON$   ", 12.01, 6., 2.265, 18.8, 49.9);
-  AliMaterial(26, "CARBON$   ", 12.01, 6., 2.265, 18.8, 49.9);
-  AliMaterial(46, "CARBON$   ", 12.01, 6., 2.265, 18.8, 49.9);
+  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);
   //
   //     Aluminum 
   AliMaterial(9,  "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
@@ -195,6 +196,10 @@ void AliABSO::CreateMaterials()
   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);
+  // 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);
 
   //
   // **************** 
@@ -270,6 +275,11 @@ void AliABSO::CreateMaterials()
   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);
+  //
+  // Polymer Concrete 
+  AliMedium(20, "PCc_C0           ", 20, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(40, "PCc_C1           ", 40, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(60, "PCc_C3           ", 60, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________
@@ -289,3 +299,9 @@ void AliABSO::Init()
   printf("\n");
 }
  
+Int_t  AliABSO::GetMatId(Int_t imat) const 
+{
+// Get geant material number
+    Int_t kmat=(*fIdmate)[imat]; 
+    return kmat;
+}