Coding violations corrected.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 6 Aug 2009 15:35:18 +0000 (15:35 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 6 Aug 2009 15:35:18 +0000 (15:35 +0000)
JETAN/AliJetAODReader.cxx
JETAN/AliJetAODReader.h
JETAN/AliJetESDReader.cxx
JETAN/AliJetESDReader.h
JETAN/AliJetReader.h

index dcd6010..de57ba7 100644 (file)
@@ -46,8 +46,6 @@ ClassImp(AliJetAODReader)
 
 AliJetAODReader::AliJetAODReader():
     AliJetReader(),
-    fChain(0x0),
-    fTree(0x0),
     fAOD(0x0),
     fRef(new TRefArray),
     fDebug(0),
@@ -62,9 +60,7 @@ AliJetAODReader::AliJetAODReader():
     fGrid3(0),
     fGrid4(0),
     fPtCut(0),
-    fHCorrection(0),
     fApplyElectronCorrection(kFALSE),
-    fEFlag(kFALSE),
     fApplyMIPCorrection(kTRUE),
     fApplyFractionHadronicCorrection(kFALSE),
     fFractionHadronicCorrection(0.3),
@@ -75,10 +71,8 @@ AliJetAODReader::AliJetAODReader():
     fDZ(0),
     fNeta(0),
     fNphi(0),
-    fArrayInitialised(0),
     fRefArray(0x0),
     fProcId(kFALSE)
-
 {
   // Constructor    
 }
@@ -88,7 +82,6 @@ AliJetAODReader::AliJetAODReader():
 AliJetAODReader::~AliJetAODReader()
 {
   // Destructor
-    delete fChain;
     delete fAOD;
     delete fRef;
     delete fTpcGrid;
index d11bbb2..a2f7c49 100644 (file)
@@ -36,14 +36,14 @@ class AliJetAODReader : public AliJetReader
   void   CreateTasks(TChain* tree);
   Bool_t ExecTasks(Bool_t procid, TRefArray* refArray);
 
-  void SetInputEvent(TObject* /*esd*/, TObject* aod, TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
+  void SetInputEvent(const TObject* /*esd*/, const TObject* aod, const TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
   void SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
   void SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
   // Correction of hadronic energy
-  void SetHadronCorrection(Int_t flag = 1) {fHCorrection = flag;}
+  void SetHadronCorrection(const Int_t flag = 1) {fHCorrection = flag;}
   void SetHadronCorrector(AliJetHadronCorrection* corr) {fHadCorr = corr;}
-  void SetApplyElectronCorrection(Int_t flag = 1) {fECorrection = flag; fEFlag=kTRUE;}
-  void SetApplyMIPCorrection(Bool_t val);
+  void SetApplyElectronCorrection(const Int_t flag = 1) {fECorrection = flag; fEFlag=kTRUE;}
+  void SetApplyMIPCorrection(const Bool_t val);
   void SetApplyFractionHadronicCorrection(Bool_t val);
   void SetFractionHadronicCorrection(Double_t val);
 
@@ -55,8 +55,6 @@ class AliJetAODReader : public AliJetReader
   AliJetAODReader &operator=(const AliJetAODReader &det);
 
  private:
-  TChain                     *fChain;  //! chain for reconstructed tracks
-  TChain                     *fTree;   //! tree to get the EMCal geometry
   AliAODEvent                *fAOD;    //! pointer to aod
   TRefArray                  *fRef;    // pointer to array of references to tracks
   Int_t                       fDebug;  // Debug option
@@ -72,9 +70,7 @@ class AliJetAODReader : public AliJetReader
   AliJetGrid                 *fGrid3;            // Pointer to grid object
   AliJetGrid                 *fGrid4;            // Pointer to grid object
   Float_t                     fPtCut;            // Pt cut for tracks to minimise background contribution
-  Int_t                       fHCorrection;      // Hadron correction flag
   Int_t                       fApplyElectronCorrection;      // Electron correction flag
-  Bool_t                      fEFlag;            // if (fEFlag == kFALSE) => fECorrection automatically setted
   Bool_t                      fApplyMIPCorrection; // Apply MIP or not ? Exclusive with fApplyFractionHadronicCorrection
   Bool_t                      fApplyFractionHadronicCorrection; // Another type of charged particle energy deposition in EMC
   Double_t                    fFractionHadronicCorrection; // Fraction of momentum of the TPC track to be subtracted from EMC tower
@@ -86,12 +82,8 @@ class AliJetAODReader : public AliJetReader
   Bool_t                      fDZ;               // Use or not dead zones
   Int_t                       fNeta;             // Number of bins in eta of tpc grid
   Int_t                       fNphi;             // Number of bins in phi of tpc grid
-  Bool_t                      fArrayInitialised; // To check that array of units is initialised
-
   TRefArray                  *fRefArray;         // array of digit position and energy
   Bool_t                      fProcId;           // Bool_t for TProcessID synchronization
-
-
   ClassDef(AliJetAODReader,1)
 };
  
index 6db1134..0902383 100755 (executable)
@@ -216,7 +216,7 @@ void AliJetESDReader::SetFractionHadronicCorrection(Double_t val)
 
 
 //____________________________________________________________________________
-void AliJetESDReader::SetInputEvent(TObject* esd, TObject* /*aod*/, TObject* /*mc*/) {
+void AliJetESDReader::SetInputEvent(const TObject* esd, const TObject* /*aod*/, const TObject* /*mc*/) {
     // Connect the tree
      fESD   = (AliESDEvent*) esd;
 }
index e4d6b54..35983a5 100755 (executable)
@@ -44,7 +44,7 @@ class AliJetESDReader : public AliJetReader
   Int_t      GetTrackSign() const {return fSign;}  // returns sign of the track
  
   // Setters
-  void       SetInputEvent(TObject* esd, TObject* aod, TObject* mc);
+  void       SetInputEvent(const TObject* esd, const TObject* aod, const TObject* mc);
   void       SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
   void       SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
   // Correction of hadronic energy
index 72aa1d4..c74f08a 100755 (executable)
@@ -63,7 +63,7 @@ class AliJetReader : public TObject
 
   // Others
   virtual void   OpenInputFiles() {}
-  virtual void   SetInputEvent(TObject* /*esd*/, TObject* /*aod*/, TObject* /*mc*/) {;}
+  virtual void   SetInputEvent(const TObject* /*esd*/, const TObject* /*aod*/, const TObject* /*mc*/) {;}
   virtual void   ConnectTree(TTree* /*tree*/, TObject* /*data*/) {}
   virtual Bool_t GetGenJets(AliJet* /*genJets*/) {return kFALSE;}