X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PWG4%2FAliAnaCaloTrigger.cxx;h=fcb747ba6abbb6c9ca93ae7c9c0ac3cb22ca7d9b;hb=ec6465fe79f359cc2601100cb4a851a547fa08a8;hp=e230d5f85be6b935bdda34bd2197053339d3f42e;hpb=9ea45617474086c0c2e1806bb516566e27ee3f37;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG4/AliAnaCaloTrigger.cxx b/PWG4/AliAnaCaloTrigger.cxx
index e230d5f85be..fcb747ba6ab 100644
--- a/PWG4/AliAnaCaloTrigger.cxx
+++ b/PWG4/AliAnaCaloTrigger.cxx
@@ -14,9 +14,12 @@
  **************************************************************************/
 
 //_________________________________________________________________________
-// An analysis task to check the PHOS/EMCAL simulated trigger
+// An analysis task to check the trigger data in ESD
+// Creates an ntuple for 2x2 and NxN triggers
+// Each ntuple connects the maximum trigger amplitudes 
+// and its positions with reconstructed clusters
 //
-//*-- Yves Schutz & Gustavo Conesa Balbastre
+//*-- Yves Schutz (CERN) & Gustavo Conesa Balbastre (INFN-LNF)
 //////////////////////////////////////////////////////////////////////////////
 
 #include <TChain.h>
@@ -96,10 +99,9 @@ AliAnaCaloTrigger & AliAnaCaloTrigger::operator = (const AliAnaCaloTrigger & sou
 AliAnaCaloTrigger::~AliAnaCaloTrigger()
 {
   // dtor
-  fOutputContainer->Clear() ; 
-  delete fOutputContainer ;
-  delete fNtTrigger22 ; 
-  delete fNtTriggerNN ; 
+  //fOutputContainer->Clear() ; 
+  //delete fOutputContainer ;
+
 }
 
 
@@ -175,18 +177,18 @@ void AliAnaCaloTrigger::Exec(Option_t *)
 
   if( triggerAmplitudes && triggerPosition ){
   // trigger amplitudes
-  const Float_t a22    = static_cast<Float_t>(triggerAmplitudes->At(0)) ; 
-  const Float_t a22O   = static_cast<Float_t>(triggerAmplitudes->At(1)) ; 
-  const Float_t aNN    = static_cast<Float_t>(triggerAmplitudes->At(2)) ; 
-  const Float_t aNNO   = static_cast<Float_t>(triggerAmplitudes->At(3)) ; 
+  const Float_t ka22    = static_cast<Float_t>(triggerAmplitudes->At(0)) ; 
+  const Float_t ka22O   = static_cast<Float_t>(triggerAmplitudes->At(1)) ; 
+  const Float_t kaNN    = static_cast<Float_t>(triggerAmplitudes->At(2)) ; 
+  const Float_t kaNNO   = static_cast<Float_t>(triggerAmplitudes->At(3)) ; 
 
   // trigger position
-  const Float_t x22  =  static_cast<Float_t>(triggerPosition->At(0)) ; 
-  const Float_t y22  =  static_cast<Float_t>(triggerPosition->At(1)) ;
-  const Float_t z22  =  static_cast<Float_t>(triggerPosition->At(2)) ;
-  const Float_t xNN  =  static_cast<Float_t>(triggerPosition->At(3)) ; 
-  const Float_t yNN  =  static_cast<Float_t>(triggerPosition->At(4)) ;
-  const Float_t zNN  =  static_cast<Float_t>(triggerPosition->At(5)) ; 
+  const Float_t kx22  =  static_cast<Float_t>(triggerPosition->At(0)) ; 
+  const Float_t ky22  =  static_cast<Float_t>(triggerPosition->At(1)) ;
+  const Float_t kz22  =  static_cast<Float_t>(triggerPosition->At(2)) ;
+  const Float_t kxNN  =  static_cast<Float_t>(triggerPosition->At(3)) ; 
+  const Float_t kyNN  =  static_cast<Float_t>(triggerPosition->At(4)) ;
+  const Float_t kzNN  =  static_cast<Float_t>(triggerPosition->At(5)) ; 
   
   Float_t enMax       = 0. ;
   Float_t phEnMax     = 0. ;
@@ -195,8 +197,8 @@ void AliAnaCaloTrigger::Exec(Option_t *)
   Float_t phEtaMax    = 0.5 ;
   Float_t phPhiMax    = 0. ; 
   
-  TVector3 vpos22(x22, y22, z22) ;
-  TVector3 vposNN(xNN, yNN, zNN) ;
+  TVector3 vpos22(kx22, ky22, kz22) ;
+  TVector3 vposNN(kxNN, kyNN, kzNN) ;
   Float_t eta22 = vpos22.Eta() ; 
   Float_t phi22 = vpos22.Phi() * TMath::RadToDeg() + 360. ; 
   Float_t etaNN = vposNN.Eta() ; 
@@ -226,7 +228,7 @@ void AliAnaCaloTrigger::Exec(Option_t *)
 	phiMax = vpos.Phi() ; 
       }
 
-      Float_t * pid = cluster->GetPid() ;
+      Double_t * pid = cluster->GetPid() ;
       
       if(pid[AliPID::kPhoton] > 0.9) {
 	if ( cluEnergy > phEnMax) { 
@@ -238,8 +240,8 @@ void AliAnaCaloTrigger::Exec(Option_t *)
       }
     }//if cluster
     
-    fNtTrigger22->Fill(a22, a22O, enMax, phEnMax, eta22, phi22, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
-    fNtTriggerNN->Fill(aNN, aNNO, enMax, phEnMax, etaNN, phiNN, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
+    fNtTrigger22->Fill(ka22, ka22O, enMax, phEnMax, eta22, phi22, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
+    fNtTriggerNN->Fill(kaNN, kaNNO, enMax, phEnMax, etaNN, phiNN, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
   }//CaloCluster loop
   
   }//If trigger arrays filled