X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FAliJetFinder.cxx;h=799613863449acda187f66566fde4d9f1237098d;hb=5480a4f29470eed5b73ac19557740c50a328eca9;hp=f5df125d61a9cc2b78c32bb74fefd2e5b952e483;hpb=ae24a5a1818012f757948116268623c6140caf05;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/AliJetFinder.cxx b/JETAN/AliJetFinder.cxx
index f5df125d61a..79961386344 100644
--- a/JETAN/AliJetFinder.cxx
+++ b/JETAN/AliJetFinder.cxx
@@ -20,236 +20,96 @@
 // manages the search for jets 
 // Authors: jgcn@mda.cinvestav.mx
 //          andreas.morsch@cern.ch
+//          magali.estienne@subatech.in2p3.fr
+//          alexandre.shabetai@cern.ch
 //---------------------------------------------------------------------
 
-#include <Riostream.h>
 #include <TFile.h>
-#include <TClonesArray.h>
 
 #include "AliJetFinder.h"
-#include "AliJet.h"
+#include "AliUA1JetHeaderV1.h"
+#include "AliAODJetEventBackground.h"
 #include "AliAODJet.h"
-#include "AliJetReader.h"
-#include "AliJetReaderHeader.h"
-#include "AliJetControlPlots.h"
-#include "AliLeading.h"
 #include "AliAODEvent.h"
 
 ClassImp(AliJetFinder)
 
+///////////////////////////////////////////////////////////////////////
+
 AliJetFinder::AliJetFinder():
-    fTreeJ(0),
-    fPlotMode(kFALSE),
-    fJets(0),
-    fGenJets(0),
-    fLeading(0),
-    fReader(0x0),
-    fHeader(0x0),
-    fAODjets(0x0),
-    fNAODjets(0),
-    fPlots(0x0),
-    fOut(0x0)
-    
+  fHeader(0x0),
+  fAODjets(0x0),
+  fNAODjets(0),
+  fAODEvBkg(0),
+  fDebug(0),
+  fCalTrkEvent(0x0)
 {
   // Constructor
-  fJets    = new AliJet();
-  fGenJets = new AliJet();
-  fLeading = new AliLeading();
-  fAODjets = 0;
 }
 
-////////////////////////////////////////////////////////////////////////
-
+//-----------------------------------------------------------------------
 AliJetFinder::~AliJetFinder()
 {
-  // destructor
-  // here reset and delete jets
-  fJets->ClearJets();
-  delete fJets;
-  fGenJets->ClearJets();
-  delete fGenJets;
-  // close file
-  if (fOut) {
-    fOut->Close();
-    fOut->Delete();
-  }
-  delete fOut;
-  // reset and delete control plots
-  if (fPlots) delete fPlots;
+  // Destructor
 }
 
-////////////////////////////////////////////////////////////////////////
-
-void AliJetFinder::SetOutputFile(const char */*name*/)
+//-----------------------------------------------------------------------
+void AliJetFinder::WriteHeader()
 {
-  //  opens output file 
-  //  fOut = new TFile(name,"recreate");
-}
+  // Write the Headers
+  TFile* f = new TFile("jets_local.root", "recreate");
+  WriteHeaderToFile();
+  f->Close();
 
-////////////////////////////////////////////////////////////////////////
-
-void AliJetFinder::PrintJets()
-{
-  // Print jet information
-  cout << " Jets found with jet algorithm:" << endl;
-  fJets->PrintJets();
-  cout << " Jets found by pythia:" << endl;
-  fGenJets->PrintJets();
 }
 
-////////////////////////////////////////////////////////////////////////
-
-void AliJetFinder::SetPlotMode(Bool_t b)
+//-----------------------------------------------------------------------
+void AliJetFinder::WriteHeaderToFile()
 {
-  // Sets the plotting mode
-  fPlotMode=b;
-  if (b && !fPlots) fPlots = new AliJetControlPlots(); 
-}
+  // write reader header
+  AliJetHeader *rh = GetJetHeader();
+  rh->Write();
 
-////////////////////////////////////////////////////////////////////////
-TTree* AliJetFinder::MakeTreeJ(char* name)
-{
-    // Create the tree for reconstructed jets
-    fTreeJ = new TTree(name, "AliJet");
-    fTreeJ->Branch("FoundJet",   &fJets,   1000);
-    fTreeJ->Branch("GenJet",     &fGenJets,1000);
-    fTreeJ->Branch("LeadingPart",&fLeading,1000);
-    return fTreeJ;
 }
 
-////////////////////////////////////////////////////////////////////////
-
-void AliJetFinder::WriteRHeaderToFile()
+//-----------------------------------------------------------------------
+Bool_t AliJetFinder::ProcessEvent()
 {
-  // write reader header
-    AliJetReaderHeader *rh = fReader->GetReaderHeader();
-    rh->Write();
-}
+  // Process one event
 
-////////////////////////////////////////////////////////////////////////
+  // Find jets
+  FindJets();
 
+  Reset();
+  return kTRUE;
 
-void AliJetFinder::Run()
-{
-  // Do some initialization
-  Init();
-  // connect files
-  fReader->OpenInputFiles();
-
-  // write headers
-  WriteHeaders();
-  // loop over events
-  Int_t nFirst, nLast, option, debug, arrayInitialised; 
-  nFirst = fReader->GetReaderHeader()->GetFirstEvent();
-  nLast  = fReader->GetReaderHeader()->GetLastEvent();
-
-  option = fReader->GetReaderHeader()->GetDetector();
-  debug  = fReader->GetReaderHeader()->GetDebug();
-  arrayInitialised = fReader->GetArrayInitialised();
-
-  // loop over events
-  for (Int_t i=nFirst;i<nLast;i++) {
-      fReader->FillMomentumArray();
-      fLeading->FindLeading(fReader);
-      fReader->GetGenJets(fGenJets);
-
-      if (option == 0) { // TPC with fMomentumArray
-	  if(debug > 1) 
-	      printf("In FindJetsTPC() routine: find jets with fMomentumArray !!!\n");
-	  FindJetsTPC();
-      } else {
-	   if(debug > 1) printf("In FindJets() routine: find jets with fUnitArray !!!\n");
-	   FindJets();
-      }
-      if (fOut) {
-	  fOut->cd();
-      }
-      
-      if (fPlots) fPlots->FillHistos(fJets);
-      fLeading->Reset();
-      fGenJets->ClearJets();
-      Reset();
-  } 
-
-  // write out
-  if (fPlots) {
-      fPlots->Normalize();
-      fPlots->PlotHistos();
-  }
-  if (fOut) {
-      fOut->cd();
-      fPlots->Write();
-      fOut->Close();
-  }
 }
 
-
-//
-// The following methods have been added to allow for event steering from the outside
-//
-
-void AliJetFinder::ConnectTree(TTree* tree, TObject* data)
+//-----------------------------------------------------------------------
+void AliJetFinder::AddJet(AliAODJet p)
 {
-    // Connect the input file
-    fReader->ConnectTree(tree, data);
-}
+  // Add new jet to the list
+  if (fAODjets) { new ((*fAODjets)[fNAODjets++]) AliAODJet(p);}
+  else { Warning("AliJetFinder::AddJet(AliAODJet p)","fAODjets is null!");}
 
-void AliJetFinder::WriteHeaders()
-{
-    // Write the Headers
-    TFile* f = new TFile("jets_local.root", "recreate");
-    WriteRHeaderToFile();
-    WriteJHeaderToFile();
-    f->Close();
 }
 
-
-Bool_t AliJetFinder::ProcessEvent()
+//-----------------------------------------------------------------------
+void AliJetFinder::ConnectAOD(const AliAODEvent* aod)
 {
-//
-// Process one event
-//
-    Int_t debug  = fReader->GetReaderHeader()->GetDebug();
-    Bool_t ok = fReader->FillMomentumArray();
-    if (!ok) return kFALSE;
-
-    // Leading particles
-    fLeading->FindLeading(fReader);
-    // Jets
-    FindJets();
-
-    if (fPlots) fPlots->FillHistos(fJets);
-    fLeading->Reset();
-    fGenJets->ClearJets();
-    Reset();  
-    return kTRUE;
-}
+  // Connect to the AOD
+  fAODjets = aod->GetJets();
+  fAODEvBkg = (AliAODJetEventBackground*)(aod->FindListObject(AliAODJetEventBackground::StdBranchName()));
 
-void AliJetFinder::FinishRun()
-{
-    // Finish a run
-    if (fPlots) {
-	fPlots->Normalize();
-	fPlots->PlotHistos();
-    }
-    
-    if (fOut) {
-	 fOut->cd();
-	 if (fPlots) {
-	     fPlots->Write();
-	 }
-	 fOut->Close();
-    }
 }
 
-void AliJetFinder::AddJet(AliAODJet p)
+//-----------------------------------------------------------------------
+void AliJetFinder::ConnectAODNonStd(AliAODEvent* aod,const char *bname)
 {
-// Add new jet to the list
-  new ((*fAODjets)[fNAODjets++]) AliAODJet(p);
-}
+  // Connect non standard AOD jet and jet background branches 
+  fAODjets = dynamic_cast<TClonesArray*>(aod->FindListObject(bname));
+  fAODEvBkg = (AliAODJetEventBackground*)(aod->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),bname)));
+  // how is this is reset? Cleared? -> by the UserExec!!
 
-void AliJetFinder::ConnectAOD(AliAODEvent* aod)
-{
-// Connect to the AOD
-    fAODjets = aod->GetJets();
 }
+