Logging message with AliLog

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

diff --git a/EMCAL/AliEMCALFast.cxx b/EMCAL/AliEMCALFast.cxx
index 766eaaf92706b8fa8336e52226aac55910e80c20..4ac26c4b1505158eabbd26cda60a2129f64955cd 100644 (file)
--- a/EMCAL/AliEMCALFast.cxx
+++ b/EMCAL/AliEMCALFast.cxx
@@ -14,16 +14,19 @@
  **************************************************************************/
 
 
-/*
-$Log$
-*/
-
-
+/* $Id$ */
+//____________________________________________________________________________
+//*-- 
 //*-- Author: Andreas Morsch (CERN)
+//*--
+//*--
+////////////////////////////////////////////////////////////////////////////
 
-#include "AliEMCALFast.h"
+#include "TMath.h"
 #include <TRandom.h>
 
+#include "AliEMCALFast.h"
+
 
 ClassImp(AliEMCALFast)
 
@@ -38,10 +41,21 @@ Float_t AliEMCALFast::SmearMomentum(Int_t ind, Float_t p)
 //  where typically a = 0.75 and b = 0.16 - 0.24 depending on multiplicity
 //  (the lower value is for dn/d(eta) about 2000, and the higher one for 8000)
 //
+//  If we include information from TRD b will be by a factor 2/3 smaller.
+//
+//  ind = 1: high multiplicity
+//  ind = 2: low  multiplicity
+//  ind = 3: high multiplicity + TRD
+//  ind = 4: low  multiplicity + TRD
+
     Float_t pSmeared;
     Float_t a = 0.75;
     Float_t b = 0.24;
+
+    if (ind == 1) b = 0.24;
     if (ind == 2) b = 0.16;
+    if (ind == 3) b = 0.16;    
+    if (ind == 4) b = 0.11;    
     
     Float_t sigma = p*TMath::Sqrt(a*a+b*b*p*p)*0.01;
     pSmeared = p + gRandom->Gaus(0., sigma);
@@ -57,14 +71,12 @@ Float_t AliEMCALFast::Efficiency(Int_t ind, Float_t p)
 // below 0.5 GeV goes down to about 70% at 0.2 GeV.
 // On top of that there is 90% geometrical acceptance for tracking due
 // to TPC (dead zones between readout chambers).  
-    Float_t eff = 0.;
 // Tracking 
-    if (p > 0.5) {
-       eff = 0.9;
-       if (ind == 2) eff = 0.95;
-    } else {
-       eff = eff-(0.5-p)*0.2/0.3;
-    }
+//      
+    Float_t eff = 0.9;
+    if (ind == 2) eff  = 0.95;
+    if (p < 0.5) eff -= (0.5-p)*0.2/0.3;
+// Geometry
     eff *= 0.9;
 // Acceptance    
     return eff;
@@ -76,8 +88,8 @@ Bool_t AliEMCALFast::EmcalAcceptance(Float_t eta, Float_t phi)
 // EMCAL eta-phi acceptance
     Bool_t acc = kFALSE;
     if (TMath::Abs(eta) < 0.7 &&
-       phi > 0. &&
-       phi < 120.*TMath::Pi()/180.)
+       phi > 60.*TMath::Pi()/180. &&
+       phi < TMath::Pi())
        acc = kTRUE;
     return acc;
 }