EMCAL in

[u/mrichter/AliRoot.git] / EMCAL / AliEMCAL.cxx

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index 49447c57d7f637162bf3016525a0c4af1e46b443..bc3a9238b7cb6f3e264283506cc3b858d18a3fba 100644 (file)
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -17,15 +17,19 @@
 
 //_________________________________________________________________________
 // Base Class for EMCAL description:
-//    
-// 
+// This class contains material definitions    
+// for the EMCAL - It does not place the detector in Alice
 //*-- Author: Yves Schutz (SUBATECH) 
+//
+//*-- Additional Contributions: Sahal Yacoob (LBNL/UCT)
+//
 //////////////////////////////////////////////////////////////////////////////
 
 // --- Standard library ---
 #include <strstream.h>
 
 // --- ROOT system ---
+class TFile;
 #include "TBranch.h" 
 #include "TClonesArray.h" 
 #include "TTree.h" 
@@ -45,43 +49,46 @@ AliEMCAL::AliEMCAL():AliDetector()
 {
   // ctor 
   //We do not create objects, because these pointers will be overwritten during reading from file.
-  fSDigits       = 0 ;
+  fGeom     = 0;
 }
 //____________________________________________________________________________
-AliEMCAL::AliEMCAL(const char* name, const char* title): AliDetector(name,title) 
-{
-  // ctor : title is used to identify the layout
-  
-  // gets an instance of the geometry parameters class  
-  
-  if (strcmp(GetTitle(),"") != 0 ) 
-    fGeom =  AliEMCALGeometry::GetInstance(GetTitle(), "") ; 
+AliEMCAL::AliEMCAL(const char* name, const char* title): AliDetector(name,title) {
+//   ctor : title is used to identify the layout
+  fGeom     = 0;
+//   gets an instance of the geometry parameters class  
 }
 //____________________________________________________________________________
-AliEMCAL::~AliEMCAL()
-{
+AliEMCAL::~AliEMCAL(){
   // dtor
-
+    delete fHits;
 }
 
 //____________________________________________________________________________
-void AliEMCAL::CreateMaterials()
-{
+void AliEMCAL::CreateMaterials(){
   // Definitions of materials to build EMCAL and associated tracking media.
   // media number in idtmed are 1599 to 1698.
 
   // --- Air ---
   AliMaterial(0, "Air$", 14.61, 7.3, 0.001205, 30420., 67500., 0, 0) ;
 
+
   // --- Lead ---                                                                     
   AliMaterial(1, "Pb$", 207.2, 82, 11.35, 0.56, 0., 0, 0) ;
 
-  // --- Average properties of the active material ---                                                                     
-  AliMaterial(2, "EmcalMat$", fGeom->GetAmat(), 
-                             fGeom->GetZmat(),
-                             fGeom->GetDmat(),
-                             fGeom->GetRmat(), 
-                             0) ;
+
+  // --- The polysterene scintillator (CH) ---
+  Float_t aP[2] = {12.011, 1.00794} ;
+  Float_t zP[2] = {6.0, 1.0} ;
+  Float_t wP[2] = {1.0, 1.0} ;
+  Float_t dP = 1.032 ;
+
+  AliMixture(2, "Polystyrene$", aP, zP, dP, -2, wP) ;
+
+  // --- Aluminium ---
+  AliMaterial(3, "Al$", 26.98, 13., 2.7, 8.9, 999., 0, 0) ;
+  // ---         Absorption length is ignored ^
+
+
 
   // DEFINITION OF THE TRACKING MEDIA
 
@@ -89,6 +96,8 @@ void AliEMCAL::CreateMaterials()
   Int_t * idtmed = fIdtmed->GetArray() - 1599 ; 
   Int_t   isxfld = gAlice->Field()->Integ() ;
   Float_t sxmgmx = gAlice->Field()->Max() ;
+ 
+
 
    // Air                                                                           -> idtmed[1599] 
   AliMedium(0, "Air          $", 0, 0,
@@ -99,25 +108,40 @@ void AliEMCAL::CreateMaterials()
   AliMedium(1, "Lead      $", 1, 0,
             isxfld, sxmgmx, 10.0, 0.1, 0.1, 0.1, 0.1, 0, 0) ;
 
-  // The Average properties of the active material                                  -> idtmed[1601]
+ 
+ // The scintillator of the CPV made of Polystyrene scintillator                   -> idtmed[1601]
+  AliMedium(2, "CPV scint.   $", 2, 1,
+            isxfld, sxmgmx, 10.0, 0.001, 0.1, 0.001, 0.001, 0, 0) ;
+
+  // Various Aluminium parts made of Al                                             -> idtmed[1602]
+  AliMedium(3, "Al parts     $", 3, 0,
+             isxfld, sxmgmx, 10.0, 0.1, 0.1, 0.001, 0.001, 0, 0) ;
+
 
-  AliMedium(2, "EmcalMat  $", 2, 0,
-            isxfld, sxmgmx, 10.0, 0.1, 0.1, 0.1, 0.1, 0, 0) ;
 
- // --- Set decent energy thresholds for gamma and electron tracking
+
+// --- Set decent energy thresholds for gamma and electron tracking
 
   // Tracking threshold for photons and electrons in Lead 
-  gMC->Gstpar(idtmed[1600], "CUTGAM",0.5E-4) ; 
-  gMC->Gstpar(idtmed[1600], "CUTELE",1.0E-4) ;
-  gMC->Gstpar(idtmed[1601], "CUTGAM",0.5E-4) ; 
-  gMC->Gstpar(idtmed[1601], "CUTELE",1.0E-4) ;
+  gMC->Gstpar(idtmed[1600],"CUTGAM",0.00008) ;
+  gMC->Gstpar(idtmed[1600],"CUTELE",0.001) ;
+  gMC->Gstpar(idtmed[1600],"BCUTE",0.0001) ;
 
   // --- Generate explicitly delta rays in Lead ---
   gMC->Gstpar(idtmed[1600], "LOSS",3.) ;
   gMC->Gstpar(idtmed[1600], "DRAY",1.) ;
-  gMC->Gstpar(idtmed[1601], "LOSS",3.) ;
-  gMC->Gstpar(idtmed[1601], "DRAY",1.) ;
  
+// --- and in aluminium parts ---
+  gMC->Gstpar(idtmed[1602], "LOSS",3.) ;
+  gMC->Gstpar(idtmed[1602], "DRAY",1.) ;
+
+
+// --- and finally thresholds for photons and electrons in the scintillator ---
+  gMC->Gstpar(idtmed[1601],"CUTGAM",0.00008) ;
+  gMC->Gstpar(idtmed[1601],"CUTELE",0.001) ;
+  gMC->Gstpar(idtmed[1601],"BCUTE",0.0001) ;
+
+
 }
 //____________________________________________________________________________
 void AliEMCAL::SetTreeAddress()
@@ -134,24 +158,6 @@ void AliEMCAL::SetTreeAddress()
     if (branch) branch->SetAddress(&fHits);
   }
  
-  // Branch address for digit tree
-  TTree *treeD = gAlice->TreeD();
-  
-  if(fDigits)
-    fDigits->Clear();
-
-  if (treeD && fDigits) {
-    branch = treeD->GetBranch(branchname);
-    if (branch) branch->SetAddress(&fDigits);
-  }
-
-  if(fSDigits)
-    fSDigits->Clear();
-
-  if (gAlice->TreeS()  && fSDigits ) {
-    branch = gAlice->TreeS()->GetBranch("EMCAL");
-    if (branch) branch->SetAddress(&fSDigits) ;
-  } 
 }