Dimuons added. (R. Arnaldi)

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

diff --git a/JETAN/AliUA1JetFinderV2.cxx b/JETAN/AliUA1JetFinderV2.cxx
index bf7ed34d34dbb73adfb7865cf14e56796cc4f81a..16d3f9b819e09865e3962364f59d554670033c04 100644 (file)
--- a/JETAN/AliUA1JetFinderV2.cxx
+++ b/JETAN/AliUA1JetFinderV2.cxx
@@ -86,6 +86,7 @@ void AliUA1JetFinderV2::FindJetsC()
   AliUA1JetHeaderV1* header  = (AliUA1JetHeaderV1*) fHeader;
   TClonesArray*      lvArray = fReader->GetMomentumArray();
   Int_t              nIn     = lvArray->GetEntries();
+  fDebug   = fHeader->GetDebug();
   
   if (nIn == 0) return;
   
@@ -315,7 +316,6 @@ void AliUA1JetFinderV2::FindJets()
   Int_t              nIn      = fUnit->GetEntries();
   Float_t            ptMin   = fReader->GetReaderHeader()->GetPtCut();
 
-  fDebug   = fReader->GetReaderHeader()->GetDebug();
   if (nIn == 0) return;
 
   Int_t nCandidateCut = 0;
@@ -738,19 +738,18 @@ void AliUA1JetFinderV2::FindJets()
 }
 
 ////////////////////////////////////////////////////////////////////////
-void AliUA1JetFinderV2::RunAlgoritm(Int_t nIn, Float_t* etCell, Float_t* etaCell, Float_t* phiCell, 
-                                   Int_t* flagCell, const Float_t* etCell2, const Float_t* etaCell2, 
-                                   const Float_t* phiCell2, const Int_t* flagCell2, Float_t etbgTotal, 
-                                   Double_t dEtTotal, Int_t& nJets, Float_t* etJet, Float_t* etaJet, 
-                                   Float_t* phiJet, Float_t* etallJet, Int_t* ncellsJet)
+void AliUA1JetFinderV2::RunAlgoritm(Int_t nIn, Float_t* etCell, Float_t* const etaCell, Float_t* phiCell, 
+                  Int_t* const flagCell, const Float_t* etCell2, const Float_t* etaCell2, const Float_t* phiCell2, 
+                  const Int_t* flagCell2, Float_t etbgTotal, Double_t dEtTotal, 
+                  Int_t& nJets, Float_t* const etJet, Float_t* const etaJet, Float_t* const phiJet,
+                  Float_t* const etallJet, Int_t* const ncellsJet)
 {
   //
   // Main method for jet finding
   // UA1 base cone finder
   //
 
-  Int_t nCell  = nIn; 
-  fDebug = fReader->GetReaderHeader()->GetDebug();
+  Int_t nCell  = nIn;
 
   // Dump lego
   // Check enough space! *to be done*
@@ -937,8 +936,8 @@ void AliUA1JetFinderV2::RunAlgoritm(Int_t nIn, Float_t* etCell, Float_t* etaCell
 
 ////////////////////////////////////////////////////////////////////////
 void AliUA1JetFinderV2::RunAlgoritmC(Float_t etbgTotal, Double_t dEtTotal, Int_t& nJets,
-                                  Float_t* etJet,Float_t* etaJet, Float_t* phiJet,
-                                  Float_t* etallJet, Int_t* ncellsJet)
+                  Float_t* const etJet,Float_t* const etaJet, Float_t* const phiJet,
+                  Float_t* const etallJet, Int_t* const ncellsJet)
 {
   // Dump lego
   // Check enough space! *to be done*
@@ -1141,10 +1140,10 @@ void AliUA1JetFinderV2::RunAlgoritmC(Float_t etbgTotal, Double_t dEtTotal, Int_t
 }
 
 ////////////////////////////////////////////////////////////////////////
-void AliUA1JetFinderV2::SubtractBackg(const Int_t& nIn, const Int_t&nJ, Float_t&etbgTotalN, const Float_t* ptT, 
-                                     const Int_t*vectT, const Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, 
-                                     const Int_t* cFlag2T, const Int_t* sFlagT, Float_t* etJet, const Float_t* etaJet, 
-                                     const Float_t* phiJet, Float_t* etsigJet, Int_t* multJet, Int_t* injet)
+void AliUA1JetFinderV2::SubtractBackg(const Int_t& nIn, const Int_t&nJ, Float_t& etbgTotalN, const Float_t* ptT, const Int_t* vectT, 
+                                     const Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, const Int_t* cFlag2T, 
+                                     const Int_t* sFlagT, Float_t* const etJet, const Float_t* etaJet, const Float_t* phiJet, 
+                                     Float_t* const etsigJet, Int_t* const multJet, Int_t* const injet)
 {
   //
   // Background subtraction using cone method but without correction in dE/deta distribution
@@ -1154,7 +1153,6 @@ void AliUA1JetFinderV2::SubtractBackg(const Int_t& nIn, const Int_t&nJ, Float_t&
   //calculate energy inside and outside cones
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
   fOpt = fReader->GetReaderHeader()->GetDetector();
-  fDebug = fReader->GetReaderHeader()->GetDebug();
   Float_t rc= header->GetRadius();
   Float_t etIn[30];
   Float_t etOut = 0;
@@ -1348,9 +1346,9 @@ void AliUA1JetFinderV2::SubtractBackg(const Int_t& nIn, const Int_t&nJ, Float_t&
 
 ////////////////////////////////////////////////////////////////////////
 void AliUA1JetFinderV2::SubtractBackgC(const Int_t& nIn, const Int_t&nJ, Float_t&etbgTotalN,
-                                      const Float_t* ptT, const Float_t* etaT, const Float_t* phiT,
-                                      Float_t* etJet, const Float_t* etaJet, const Float_t* phiJet, Float_t* etsigJet,
-                                      Int_t* multJet, Int_t* injet)
+                      const Float_t* ptT, const Float_t* etaT, const Float_t* phiT,
+                      Float_t* const etJet, const Float_t* etaJet, const Float_t* phiJet,
+                      Float_t* const etsigJet,Int_t* const multJet, Int_t* const injet)
 {
   //background subtraction using cone method but without correction in dE/deta distribution
   
@@ -1414,9 +1412,9 @@ void AliUA1JetFinderV2::SubtractBackgC(const Int_t& nIn, const Int_t&nJ, Float_t
 
 ////////////////////////////////////////////////////////////////////////
 void AliUA1JetFinderV2::SubtractBackgStat(const Int_t& nIn, const Int_t&nJ,Float_t&etbgTotalN,
-                     const Float_t* ptT, const Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, 
-                     const Int_t* sFlagT, Float_t* etJet, const Float_t* etaJet, const Float_t* phiJet, 
-                     Float_t* etsigJet, Int_t* multJet, Int_t* injet)
+                                         const Float_t* ptT, const Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, 
+                                         const Int_t* sFlagT, Float_t* const etJet, const Float_t* etaJet, const Float_t* phiJet,
+                                         Float_t* const etsigJet, Int_t* const multJet, Int_t* const injet)
 {
 
   //background subtraction using statistical method
@@ -1478,10 +1476,10 @@ void AliUA1JetFinderV2::SubtractBackgStat(const Int_t& nIn, const Int_t&nJ,Float
 }
 
 ////////////////////////////////////////////////////////////////////////
-void AliUA1JetFinderV2::SubtractBackgCone(const Int_t& nIn, const Int_t&nJ,Float_t& etbgTotalN, Float_t* ptT,
-                                         Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, const Int_t* sFlagT,
-                                         Float_t* etJet, const Float_t* etaJet, const Float_t* phiJet, Float_t* etsigJet,
-                                         Int_t* multJet, Int_t* injet)
+void AliUA1JetFinderV2::SubtractBackgCone(const Int_t& nIn, const Int_t&nJ,Float_t& etbgTotalN,
+                      Float_t* ptT, Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, const Int_t* sFlagT,
+                      Float_t* const etJet, const Float_t* etaJet, const Float_t* phiJet,
+                      Float_t* const etsigJet, Int_t* const multJet, Int_t* const injet)
 {
   // Cone background subtraction method taking into acount dEt/deta distribution
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
@@ -1593,9 +1591,9 @@ void AliUA1JetFinderV2::SubtractBackgCone(const Int_t& nIn, const Int_t&nJ,Float
 
 ////////////////////////////////////////////////////////////////////////
 void AliUA1JetFinderV2::SubtractBackgRatio(const Int_t& nIn, const Int_t&nJ,Float_t& etbgTotalN,
-                     Float_t* ptT, Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, const Int_t* sFlagT,
-                     Float_t* etJet, const Float_t* etaJet, const Float_t* phiJet, Float_t* etsigJet,
-                     Int_t* multJet, Int_t* injet)
+                      Float_t* ptT, Float_t* etaT, const Float_t* phiT, const Int_t* cFlagT, const Int_t* sFlagT,
+                      Float_t* const etJet, const Float_t* etaJet, const Float_t* phiJet,
+                      Float_t* const etsigJet, Int_t* const multJet, Int_t* const injet)
 {
   // Ratio background subtraction method taking into acount dEt/deta distribution
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
@@ -1732,7 +1730,7 @@ void AliUA1JetFinderV2::InitTask(TChain* tree)
                   header->GetLegoEtaMax(),  header->GetLegoNbinPhi(),
                   header->GetLegoPhiMin(),  header->GetLegoPhiMax());
   
-  fDebug = fReader->GetReaderHeader()->GetDebug();
+  fDebug = fHeader->GetDebug();
   fOpt = fReader->GetReaderHeader()->GetDetector();
   
   // Tasks initialization