Example of CAF raw-data reconstruction. The simplest usage is rec.sh <run#>.

[u/mrichter/AliRoot.git] / JETAN / AliCdfJetFinder.cxx

diff --git a/JETAN/AliCdfJetFinder.cxx b/JETAN/AliCdfJetFinder.cxx
index 4a88372f8993a5ce49953ef9554a3d7025b68fec..119a7a3e303f9ed6fe4ee8d9d3d453f3f0bbcce6 100644 (file)
--- a/JETAN/AliCdfJetFinder.cxx
+++ b/JETAN/AliCdfJetFinder.cxx
@@ -46,7 +46,6 @@ Changelog
 
 #include "AliJetReader.h"
 #include "AliJetReaderHeader.h"
-#include "AliJet.h"
 #include "AliAODJet.h"
 #include "AliAODEvent.h"
 #include "AliJetFinder.h"
@@ -64,6 +63,7 @@ AliCdfJetFinder::AliCdfJetFinder():
     fFromAod(0),
     fAODwrite(0),
     fAODtracksWrite(0),
+    fAnalyseJets(0),
     fRefArr (NULL),
     fNJets(-9999),
     fNPart(-9999),
@@ -366,7 +366,7 @@ ComputeConesWeight();
 
 if (fAODwrite) { cout << "Writing AOD" << endl ; WriteJets(); }
 
-AnalizeJets();
+if (fAnalyseJets) AnalizeJets();
 
 Clean();
 
@@ -378,14 +378,12 @@ void AliCdfJetFinder::InitData()
 // initialisation of variables and data members
 
   TClonesArray * vectArray = fReader->GetMomentumArray() ;
-    if ( vectArray == 0 ) { cout << "Could not get the momentum array" << endl; return; }
+  if ( vectArray == 0 ) { cout << "Could not get the momentum array" << endl; return; }
 
   fNPart = vectArray->GetEntries()  ; // n particles in this event;
 
   if ( fNPart == 0 ) { return ; } // if event empty then exit
 
-  fJets->SetNinput ( fNPart ) ; // number of input objects
-
   fVectParticle = new varContainer* [fNPart]; // container for Particles
 
   fPtArray  = new Double_t [fNPart] ; // momentum array
@@ -583,17 +581,17 @@ for(  Int_t jetnr = 0 ; jetnr < fNJets ; jetnr++ )
   en = TMath::Sqrt ( px * px + py * py + pz * pz );
 
   AliAODJet jet (px, py, pz, en);
-  AddJet(jet);
+
 
   if (fDebug) jet.Print("");
 
   if (fFromAod && fAODtracksWrite)
-    {
-    for (  Int_t jetTrack = 0; jetTrack < fNPart; jetTrack++ )
+  {
+      for (  Int_t jetTrack = 0; jetTrack < fNPart; jetTrack++ )
       { if ( fVectParticle[jetTrack]->njet == jetnr ) { jet.AddTrack(fRefArr->At(jetTrack)) ; } }
-    }
-    // tracks REFs written in AOD
-
+  }
+  // tracks REFs written in AOD
+  AddJet(jet);
   }
 //jets vector parsed and written to AOD
 }
@@ -604,6 +602,8 @@ void AliCdfJetFinder::AnalizeJets()
 {
 // analyzing of jets and filling of histograms
 
+    const Double_t kPI = TMath::Pi();
+    
   //persistent pointer to histo20
   TH1F *hR = (TH1F*)fHistos->FindObject("histo20");