Correcting sources of warnings

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALJetFinder.h

diff --git a/EMCAL/AliEMCALJetFinder.h b/EMCAL/AliEMCALJetFinder.h
index 3b46b2c053f792ecd2bf8aa9af223ba91893d7c7..f168282cd961d8b3d74b7f44b5af2e9bb943b612 100644 (file)
--- a/EMCAL/AliEMCALJetFinder.h
+++ b/EMCAL/AliEMCALJetFinder.h
@@ -26,10 +26,10 @@ class AliEMCALJetFinder : public TTask {
     AliEMCALJetFinder(const char* name, const char *title);
     virtual ~AliEMCALJetFinder();
     virtual void  Init();
-    virtual void  Find(Int_t ncell, Int_t ncell_tot, Float_t etc[30000], 
+    virtual void  Find(Int_t ncell, Int_t ncelltot, Float_t etc[30000], 
                      Float_t etac[30000], Float_t phic[30000],
-                     Float_t min_move, Float_t max_move, Int_t mode,
-                     Float_t prec_bg, Int_t ierror);
+                     Float_t minmove, Float_t maxmove, Int_t mode,
+                     Float_t precbg, Int_t ierror);
     virtual void  Find();
     virtual void  FindChargedJet();
     virtual void  FindTracksInJetCone();
@@ -71,15 +71,15 @@ class AliEMCALJetFinder : public TTask {
     AliEMCALJet* GetJetT(Int_t n = 0) {return fJetT[n];}
     virtual void DrawHistsForTuning(Int_t mode=0);           // *MENU*
     virtual void PrintParameters(Int_t mode=0);              // *MENU*
-    virtual const Char_t* GetFileNameForParameters(Char_t* dir="RES/");
+    virtual const Char_t* GetFileNameForParameters(const char* dir="RES/");
 
     // Access to Results
-    virtual Int_t   Njets() const;
-    virtual Float_t JetEnergy(Int_t count);
-    virtual Float_t JetPhiL(Int_t count);
-    virtual Float_t JetPhiW(Int_t count);
-    virtual Float_t JetEtaL(Int_t count);  
-    virtual Float_t JetEtaW(Int_t count);
+    virtual Int_t Njets() const;
+    virtual Float_t JetEnergy (Int_t count) const;
+    virtual Float_t JetPhiL  (Int_t count) const;
+    virtual Float_t JetPhiW  (Int_t count) const ;
+    virtual Float_t JetEtaL (Int_t count) const ;  
+    virtual Float_t JetEtaW (Int_t count) const;
     TH2F*   GetLego() const {return fLego;}
     TH2F*   GetLegoB() const {return fLegoB;}
     TH2F*   GetLegoEMCAL() const {return fhLegoEMCAL;}
@@ -94,13 +94,13 @@ class AliEMCALJetFinder : public TTask {
     Bool_t  GetEnergyWeightingFlag() const {return fWeightingMethod ;}
     Float_t GetEMCALWeight() const {return fEMCALWeight;}
     Float_t GetTrackWeight() const {return fTrackWeight;}
-    void    DrawLego(Char_t *opt="lego");         // *MENU*
-    void    DrawLegoEMCAL(Char_t *opt="lego");    // *MENU*
+    void    DrawLego(const char *opt="lego");         // *MENU*
+    void    DrawLegoEMCAL(const char *opt="lego");    // *MENU*
     void    DrawLegos();                          // *MENU*
-    void    DrawLegoBackground(Char_t *opt="lego"); // *MENU*
+    void    DrawLegoBackground(const char *opt="lego"); // *MENU*
     Bool_t  IsThisPartonsOrDiQuark(Int_t pdg);
     // I/O
-    virtual void SetOutputFileName(char* name) {fOutFileName = name;}
+    virtual void SetOutputFileName(const char* name) {fOutFileName = name;}
     virtual void FillFromHits(Int_t flag = 0);
     virtual void FillFromHitFlaggedTracks(Int_t flag = 0);
     virtual void FillFromDigits(Int_t flag = 0);
@@ -108,25 +108,25 @@ class AliEMCALJetFinder : public TTask {
     virtual void FillFromParticles();
     virtual void FillFromPartons();
 
-    virtual void SaveBackgroundEvent(Char_t *name="");
+    virtual void SaveBackgroundEvent(const char *name="");
     virtual void InitFromBackground();
     virtual void AddJet(const AliEMCALJet& jet);
     virtual void WriteJets();
     virtual void ResetJets();
     virtual TClonesArray* Jets() const {return fJets;}
-    const Char_t* GetNameOfVariant();
+    const char* GetNameOfVariant();
 
     virtual Bool_t  IsFolder() const;
     virtual void Browse(TBrowser* b);
 
-    TString fBGFileName;                               // file name for background
-    Float_t                       fEMCALWeight;        // EMCal energy weighting
-    Float_t                       fTrackWeight;        // Track energy weighting
-    Bool_t                         fRandomBg;        //  Flag for Random Background 
 
 
     
  protected:
+    TString fBGFileName;                               // file name for background
+    Float_t                       fEMCALWeight;        // EMCal energy weighting
+    Float_t                       fTrackWeight;        // Track energy weighting
+    Bool_t                         fRandomBg;        //  Flag for Random Background 
     Bool_t                         fWrite;           // Key for writing
     Bool_t                         fWeightingMethod; // Key for writing
     TClonesArray*                  fJets;            //! List of Jets
@@ -196,7 +196,7 @@ class AliEMCALJetFinder : public TTask {
     Float_t                        fPrecBg;          // max value of change for BG (in %)
     Int_t                          fError;           // error variables 
 
-    char*                          fOutFileName;     //! Output file name
+    const char*                    fOutFileName;     //! Output file name
     TFile*                         fOutFile;         //! Output file
     TFile*                         fInFile;          //! Output file
     Int_t                          fEvent;           //! Processed event
@@ -205,13 +205,12 @@ class AliEMCALJetFinder : public TTask {
     Float_t WeightedJetEnergy(Float_t eta, Float_t phi);
     Float_t EMCALConeEnergy(Float_t eta, Float_t phi);
     Float_t TrackConeEnergy(Float_t eta, Float_t phi);
-    Float_t HCConeEnergy(Float_t eta, Float_t phi);
     virtual void DumpLego();
     virtual void ResetMap();
     virtual Float_t PropagatePhi(Float_t pt, Float_t charge, Bool_t& curls);
     virtual void RearrangeParticlesMemory(Int_t npart);
 
-    ClassDef(AliEMCALJetFinder,4)                    // JetFinder for EMCAL
+    ClassDef(AliEMCALJetFinder,5)                    // JetFinder for EMCAL
 }
 ;
 #endif // ALIEMCALJetFinder_H