Removing warnings in MONITOR

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

diff --git a/JETAN/AliJetReader.cxx b/JETAN/AliJetReader.cxx
index a208746861a502c4926ab5e3a04740449ab0c4d4..0c90c95b307e792885484c25c4e9475f4a4af0ae 100755 (executable)
--- a/JETAN/AliJetReader.cxx
+++ b/JETAN/AliJetReader.cxx
@@ -16,37 +16,49 @@
 //------------------------------------------------------------------------
 // Jet reader base class
 // manages the reading of input for jet algorithms
-// Author: jgcn@mda.cinvestav.mx
+// Authors: jgcn@mda.cinvestav.mx
+//          magali.estienne@IReS.in2p3.fr
 //------------------------------------------------------------------------
 
 // root
 #include <TClonesArray.h>
+#include <TRefArray.h>
+#include "TTask.h"
 //AliRoot
 #include "AliJetReader.h"
 #include "AliJetReaderHeader.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliHeader.h"
+#include "AliJetFillUnitArrayTracks.h" 
+#include "AliJetFillUnitArrayEMCalDigits.h"
+#include "AliJetUnitArray.h"
+#include "AliJetHadronCorrectionv1.h"
 
 ClassImp(AliJetReader)
 
 ////////////////////////////////////////////////////////////////////////
-
 AliJetReader::AliJetReader():
-  fChain(0),
-  fChainMC(0),
-  fMomentumArray(0),
+  // Constructor
+  fChain(0), 
+  fMomentumArray(new TClonesArray("TLorentzVector",2000)),
   fArrayMC(0),
+  fFillUnitArray(new TTask("fillUnitArray","Fill unit array jet finder")),
   fESD(0),
   fReaderHeader(0),
-  fAliHeader(0),
   fSignalFlag(0),
-  fCutFlag(0)
-    
+  fCutFlag(0),
+  fUnitArray(new TClonesArray("AliJetUnitArray",60000)),
+  fRefArray(new TRefArray()),
+  fUnitArrayNoCuts(new TClonesArray("AliJetUnitArray",60000)),
+  fArrayInitialised(0),
+  fFillUAFromTracks(new AliJetFillUnitArrayTracks()), 
+  fFillUAFromEMCalDigits(new AliJetFillUnitArrayEMCalDigits()),
+  fNumCandidate(0),
+  fNumCandidateCut(0)
 {
   // Default constructor
-  fMomentumArray = new TClonesArray("TLorentzVector",2000);
   fSignalFlag = TArrayI();
-  fCutFlag = TArrayI();
+  fCutFlag    = TArrayI();
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -54,15 +66,27 @@ AliJetReader::AliJetReader():
 AliJetReader::~AliJetReader()
 {
   // Destructor
-  delete fChain;
-  delete fChainMC;
-  delete fESD;
-  delete fAliHeader;
   if (fMomentumArray) {
       fMomentumArray->Delete();
       delete fMomentumArray;
   }
+  
+  if (fUnitArray) {
+      fUnitArray->Delete();
+      delete fUnitArray;
+  }
+  
+  if (fUnitArrayNoCuts) {
+    fUnitArrayNoCuts->Delete();
+    delete fUnitArrayNoCuts;
+  }
+
+  if (fFillUnitArray) {
+    fFillUnitArray->Delete();
+    delete fFillUnitArray;
+  }
   delete fArrayMC;
+  
 }
 
 
@@ -72,4 +96,5 @@ void AliJetReader::ClearArray()
 
 {
   if (fMomentumArray)  fMomentumArray->Clear();
+  if (fFillUnitArray)  fFillUnitArray->Clear();
 }