corrected warnings with gcc 4.3

diff --git a/EMCAL/AliCaloCalibPedestal.h b/EMCAL/AliCaloCalibPedestal.h
index 8329314c83f046ff52fc3375bc0978fad89738c6..ff12c92ea72f340fbd22e343df028e16f65de40a 100644 (file)
--- a/EMCAL/AliCaloCalibPedestal.h
+++ b/EMCAL/AliCaloCalibPedestal.h
@@ -46,8 +46,8 @@ class AliCaloCalibPedestal : public TObject {
   AliCaloCalibPedestal& operator = (const  AliCaloCalibPedestal &source);
   
   //Functions to ask for the constants (in case a GUI needs them, for an example
   AliCaloCalibPedestal& operator = (const  AliCaloCalibPedestal &source);
   
   //Functions to ask for the constants (in case a GUI needs them, for an example

-  static const int GetSampleMax() {return fgkSampleMax;};
-  static const int GetSampleMin() {return fgkSampleMin;};
+  int GetSampleMax() const {return fgkSampleMax;};
+  int GetSampleMin() const {return fgkSampleMin;};

 
   // Event processing methods:  
   Bool_t ProcessEvent(AliRawReader *rawReader);
 
   // Event processing methods:  
   Bool_t ProcessEvent(AliRawReader *rawReader);

diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h
index 05df484fecc3523f32fed0c11ec0e4e3c4166ac8..decc5a0274fd82b540c5a3fed4ed46bd83687c91 100644 (file)
--- a/EMCAL/AliEMCALGeometry.h
+++ b/EMCAL/AliEMCALGeometry.h
@@ -87,7 +87,7 @@ public:
   //////////////////////////////////////
   // Return EMCAL geometrical parameters
   //
   //////////////////////////////////////
   // Return EMCAL geometrical parameters
   //

-  Char_t* GetNameOfEMCALEnvelope() const {return "XEN1";}
+  Char_t* GetNameOfEMCALEnvelope() const { Char_t* env = "XEN1"; return env ;}

   Float_t GetArm1PhiMin() const { return fArm1PhiMin ; }
   Float_t GetArm1PhiMax() const { return fArm1PhiMax ; }
   Float_t GetArm1EtaMin() const { return fArm1EtaMin;}
   Float_t GetArm1PhiMin() const { return fArm1PhiMin ; }
   Float_t GetArm1PhiMax() const { return fArm1PhiMax ; }
   Float_t GetArm1EtaMin() const { return fArm1EtaMin;}

diff --git a/EMCAL/AliEMCALHistoUtilities.cxx b/EMCAL/AliEMCALHistoUtilities.cxx
index 176b9bf342f29b9be7d4a72e4498a8e2113a9e2b..fb49798bbdc3e2e5160711f569f34cac0b41bc95 100644 (file)
--- a/EMCAL/AliEMCALHistoUtilities.cxx
+++ b/EMCAL/AliEMCALHistoUtilities.cxx
@@ -362,16 +362,16 @@ AliRunLoader* AliEMCALHistoUtilities::InitKinematics(const Int_t nev, const char
   static AliRunLoader *rl = 0;
 
   if((rl == 0 || nev==0) && galiceName) {
   static AliRunLoader *rl = 0;
 
   if((rl == 0 || nev==0) && galiceName) {

-    printf("<I> AliEMCALHistoUtilities::InitKinematics() : nev %i : rl %p : %s (IN)\n", 
-        nev, rl, galiceName);  
+    //printf("<I> AliEMCALHistoUtilities::InitKinematics() : nev %i : rl %p : %s (IN)\n", 
+       // nev, rl, galiceName);  

     if(rl)  {
       rl->UnloadgAlice();
       delete rl;
     }
     rl = AliRunLoader::Open(galiceName,AliConfig::GetDefaultEventFolderName(),"read");
     rl->LoadgAlice(); // obligatory
     if(rl)  {
       rl->UnloadgAlice();
       delete rl;
     }
     rl = AliRunLoader::Open(galiceName,AliConfig::GetDefaultEventFolderName(),"read");
     rl->LoadgAlice(); // obligatory

-    printf("<I> AliEMCALHistoUtilities::InitKinematics() : nev %i : rl %p : %s (OUT)\n", 
-        nev, rl, galiceName);  
+    //printf("<I> AliEMCALHistoUtilities::InitKinematics() : nev %i : rl %p : %s (OUT)\n", 
+        //nev, rl, galiceName);  

   }
   if(rl) {
     rl->GetEvent(nev);
   }
   if(rl) {
     rl->GetEvent(nev);

diff --git a/EMCAL/AliEMCALShishKebabModule.cxx b/EMCAL/AliEMCALShishKebabModule.cxx
index 46813b0607239c64c16bd273a4dd89ef26b89cf0..563f7a929d3963d1d0417cfdd1a260150fcfe663 100644 (file)
--- a/EMCAL/AliEMCALShishKebabModule.cxx
+++ b/EMCAL/AliEMCALShishKebabModule.cxx
@@ -161,7 +161,7 @@ Double_t xmin, Double_t xmax, Int_t npar, Double_t *par, Double_t eps, Int_t max
 Double_t AliEMCALShishKebabModule::Y2(Double_t *x, Double_t *par)
 { 
   // For position calulation of second module
 Double_t AliEMCALShishKebabModule::Y2(Double_t *x, Double_t *par)
 { 
   // For position calulation of second module

-  if(par);
+  //if(par);//For what is this?, commented due to compilation warnings

   Double_t theta = x[0];
   Double_t cos = TMath::Cos(theta);
   Double_t sin = TMath::Sin(theta);
   Double_t theta = x[0];
   Double_t cos = TMath::Cos(theta);
   Double_t sin = TMath::Sin(theta);

diff --git a/EMCAL/Calib/AliEMCALCalibCoefs.cxx b/EMCAL/Calib/AliEMCALCalibCoefs.cxx
index d8faa7876fe5bfe4d35410973231d05ef8f436db..6c2e5f14377655cb01c10d257ce8265445908568 100644 (file)
--- a/EMCAL/Calib/AliEMCALCalibCoefs.cxx
+++ b/EMCAL/Calib/AliEMCALCalibCoefs.cxx
@@ -220,7 +220,7 @@ const char* coment)
   if(man == 0) {
     printf("<E> AliEMCALCalibCoefs::GetCalibTableForDb : define AliCDBManager, NO saving  !! \n"); 
   } else {
   if(man == 0) {
     printf("<E> AliEMCALCalibCoefs::GetCalibTableForDb : define AliCDBManager, NO saving  !! \n"); 
   } else {

-    printf("<I> AliCDBManager %p \n", man); 
+    //printf("<I> AliCDBManager %p \n", man); 

     AliCDBId id("EMCAL/Calib/Data",firstRun,lastRun); // create in EMCAL/Calib/Data DBFolder 
     TString dBFolder(dbLocation);
     AliCDBStorage* loc = man->GetStorage(dBFolder.Data());
     AliCDBId id("EMCAL/Calib/Data",firstRun,lastRun); // create in EMCAL/Calib/Data DBFolder 
     TString dBFolder(dbLocation);
     AliCDBStorage* loc = man->GetStorage(dBFolder.Data());

diff --git a/EMCAL/Calib/AliEMCALFolder.cxx b/EMCAL/Calib/AliEMCALFolder.cxx
index 94ecf2496633468ce31617d55852d8b336159291..53beb3c1ed26b01707d9a236a8ebf7a42689f84a 100644 (file)
--- a/EMCAL/Calib/AliEMCALFolder.cxx
+++ b/EMCAL/Calib/AliEMCALFolder.cxx
@@ -438,7 +438,8 @@ void  AliEMCALFolder::Save(const char *fn, const char *opt)
   f.NextEventPut(this, eventNum, runNumber);
   printf(" Save %s to file %s\n", GetName(), FN.Data());
   */
   f.NextEventPut(this, eventNum, runNumber);
   printf(" Save %s to file %s\n", GetName(), FN.Data());
   */

-  if(fn || opt);
+  //if(fn || opt);//For what is this?, commented due to compilation warnings
+

 }
 
 //_____________________________________________________________
 }
 
 //_____________________________________________________________

diff --git a/EMCAL/Calib/AliEMCALPi0Calibration.cxx b/EMCAL/Calib/AliEMCALPi0Calibration.cxx
index 2823ae0d770cdac79d4614ab85a5ca01848f94e6..ce50a7df83f1e6996d8cbde759bdad710ca0b49f 100644 (file)
--- a/EMCAL/Calib/AliEMCALPi0Calibration.cxx
+++ b/EMCAL/Calib/AliEMCALPi0Calibration.cxx
@@ -180,15 +180,15 @@ AliEMCALPi0Calibration::AliEMCALPi0Calibration(const AliAnalysisTaskSE& obj) :
   fArrOpts(0),
   fKeyOpts(0)
 { 
   fArrOpts(0),
   fKeyOpts(0)
 { 

-  if(&obj);

   // Copy constructor - unused
   // Copy constructor - unused

+//  if(&obj); //FOR WHAT IS THIS, commented due to warnings

 }
 
 AliEMCALPi0Calibration& AliEMCALPi0Calibration::operator=(const AliAnalysisTaskSE& other)
 { 
 }
 
 AliEMCALPi0Calibration& AliEMCALPi0Calibration::operator=(const AliAnalysisTaskSE& other)
 { 

-  if(&other);
-  return *this;

   // Assignment
   // Assignment

+//  if(&other); //FOR WHAT IS THIS, commented due to warnings
+  return *this;

 }
 
 AliEMCALPi0Calibration::~AliEMCALPi0Calibration()
 }
 
 AliEMCALPi0Calibration::~AliEMCALPi0Calibration()


@@ -1170,7 +1170,7 @@ TCanvas *AliEMCALPi0Calibration::Linearity(TList *l, int ifun)
     line = new TLine(0.0,0.0, 101.,0.0);
     line->Draw();
     TLatex *lat = u::Lat("linearity better 0.2% after correction",20., 0.15, 12, 0.06, 1); 
     line = new TLine(0.0,0.0, 101.,0.0);
     line->Draw();
     TLatex *lat = u::Lat("linearity better 0.2% after correction",20., 0.15, 12, 0.06, 1); 

-    if(lat);
+    //if(lat); //For what is this?, commented due to compilation warnings

   }
   if(1) {
     TString latexName;
   }
   if(1) {
     TString latexName;


@@ -1191,7 +1191,7 @@ TCanvas *AliEMCALPi0Calibration::Linearity(TList *l, int ifun)
     gr3->SetMarkerSize(1.5);
 
     TLatex *lat = u::Lat(latexName.Data(),82., 11., 12, 0.06, 1);
     gr3->SetMarkerSize(1.5);
 
     TLatex *lat = u::Lat(latexName.Data(),82., 11., 12, 0.06, 1);

-    if(lat);
+    if(lat); //For what is this?, commented due to compilation warnings

     // Exp. data
     TF1 *fexp = new TF1(*f);
     fexp->SetName("fexp");
     // Exp. data
     TF1 *fexp = new TF1(*f);
     fexp->SetName("fexp");


@@ -1361,7 +1361,7 @@ TCanvas* AliEMCALPi0Calibration::DrawDeffVsEnergy()
   Int_t markerColor=1;
   c->cd(1);
   TF1 *fdeff= new TF1("fdeff","[0]+[1]*log(x)",0.4, 100.4);
   Int_t markerColor=1;
   c->cd(1);
   TF1 *fdeff= new TF1("fdeff","[0]+[1]*log(x)",0.4, 100.4);

-  if(fdeff);
+  if(fdeff); //For what is this?, commented due to compilation warnings

   TGraphErrors *gr = u::DrawGraphErrors(np, p,deff, ep, edeff,
     markerColor,21+markerColor,"AP"," D_{eff} vs E_{#gamma} ","E_{#gamma}         "," D_{eff} in cm ",
                                        -1, "", 0);
   TGraphErrors *gr = u::DrawGraphErrors(np, p,deff, ep, edeff,
     markerColor,21+markerColor,"AP"," D_{eff} vs E_{#gamma} ","E_{#gamma}         "," D_{eff} in cm ",
                                        -1, "", 0);

diff --git a/PWG4/PartCorr/AliAnalysisTaskPHOSExample.h b/PWG4/PartCorr/AliAnalysisTaskPHOSExample.h
index 25ed2f0670015566204e8a4c4bf9b8c06c3e6ebd..77fe48c55139f6dabe22815eee5ba81d88114c98 100644 (file)
--- a/PWG4/PartCorr/AliAnalysisTaskPHOSExample.h
+++ b/PWG4/PartCorr/AliAnalysisTaskPHOSExample.h
@@ -33,7 +33,7 @@ public:
   virtual void Init() ;        
   virtual void LocalInit() { Init() ; }
   virtual void UserExec(Option_t * opt = "") ;
   virtual void Init() ;        
   virtual void LocalInit() { Init() ; }
   virtual void UserExec(Option_t * opt = "") ;

-  const Float_t  GetPhotonId() const { return fPhotonId ; }
+  Float_t  GetPhotonId() const { return fPhotonId ; }

   void SetDebugLevel(Int_t level) { fDebug = level ; }
   void SetPhotonId(Float_t threshold) { fPhotonId = threshold ; }
   virtual void Terminate(Option_t * opt = "") ;
   void SetDebugLevel(Int_t level) { fDebug = level ; }
   void SetPhotonId(Float_t threshold) { fPhotonId = threshold ; }
   virtual void Terminate(Option_t * opt = "") ;