Fixes of warnings pointed out by F.Carminati

diff --git a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
index ff056e62fd94112e738616a6aa61f4f30f316199..f11acc982655d80ff108a8b28323b44c1ba30ebe 100644 (file)
--- a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
+++ b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
@@ -22,7 +22,7 @@ AliFMDAnaCalibBackgroundCorrection::AliFMDAnaCalibBackgroundCorrection() : TObje
 
 //____________________________________________________________________
 AliFMDAnaCalibBackgroundCorrection::AliFMDAnaCalibBackgroundCorrection(const AliFMDAnaCalibBackgroundCorrection& o)
-  : TObject(o), fArray(o.fArray), fAxis(o.fAxis)
+  : TObject(o), fArray(o.fArray), fAxis(o.fAxis), fIsInit(o.fIsInit)
 {
   // Copy ctor 
 }
@@ -43,6 +43,7 @@ TH2F* AliFMDAnaCalibBackgroundCorrection::GetBgCorrection(Int_t det,
                                                          Int_t vtxbin) {
   TObjArray* ringArray = GetRingArray(det,ring);
   TH2F* hCorrection    = (TH2F*)ringArray->At(vtxbin);
+  return hCorrection;
 }
 
 //____________________________________________________________________

diff --git a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.h b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.h
index 3ca9f07d79608e6b0f4a360e700309b047c4d7ab..f71f7bdbfd20a053e9337d8d9797c3d113285358 100644 (file)
--- a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.h
+++ b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.h
@@ -31,6 +31,7 @@ class AliFMDAnaCalibBackgroundCorrection : public TObject
   TObjArray  fArray;
   TAxis      fAxis;
   Bool_t     fIsInit;
+  
   ClassDef(AliFMDAnaCalibBackgroundCorrection,1);
 };
 

diff --git a/FMD/analysis/AliFMDAnaCalibEnergyDistribution.cxx b/FMD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
index 26f4ea82a71f86bb4e6eb602269b5b68ec99e920..365a4fac9264b236b30a29b300487bf59187cd55 100644 (file)
--- a/FMD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
+++ b/FMD/analysis/AliFMDAnaCalibEnergyDistribution.cxx
@@ -4,7 +4,7 @@
 ClassImp(AliFMDAnaCalibEnergyDistribution)
 
 AliFMDAnaCalibEnergyDistribution::AliFMDAnaCalibEnergyDistribution() : TObject(),
-  fArray() {
+  fArray(), fIsInit(kFALSE){
   
   
   

diff --git a/FMD/analysis/AliFMDAnaCalibEnergyDistribution.h b/FMD/analysis/AliFMDAnaCalibEnergyDistribution.h
index 6834d3120dcfc73abdd7d9add15486b643929c6f..3178bf00504d76ef6dcb88de82e4b24bbba019b7 100644 (file)
--- a/FMD/analysis/AliFMDAnaCalibEnergyDistribution.h
+++ b/FMD/analysis/AliFMDAnaCalibEnergyDistribution.h
@@ -19,7 +19,6 @@ class AliFMDAnaCalibEnergyDistribution : public TObject
   void      Init();
   TObjArray fArray;
   Bool_t    fIsInit;
-  
   ClassDef(AliFMDAnaCalibEnergyDistribution,1);
 };
 

diff --git a/FMD/analysis/AliFMDAnaParameters.cxx b/FMD/analysis/AliFMDAnaParameters.cxx
index f3c58022432868576b90b095a45e5381aece267e..f82dbef26f7de236a00b7100f0315da4fba628ca 100644 (file)
--- a/FMD/analysis/AliFMDAnaParameters.cxx
+++ b/FMD/analysis/AliFMDAnaParameters.cxx
@@ -55,8 +55,6 @@ AliFMDAnaParameters::Instance()
 //____________________________________________________________________
 AliFMDAnaParameters::AliFMDAnaParameters() :
   fIsInit(kFALSE),
-  fBackgroundArray(0),
-  fEdistArray(0),
   fBackground(0),
   fEnergyDistribution(0)
 {
@@ -122,9 +120,6 @@ Int_t AliFMDAnaParameters::GetNvtxBins() {
 //____________________________________________________________________
 TH1F* AliFMDAnaParameters::GetEnergyDistribution(Int_t det, Char_t ring) {
   
-  //  TObjArray* detArray   = (TObjArray*)fEdistArray->At(det);
-  // Int_t ringNumber      = (ring == 'I' ? 0 : 1);
-  // TH1F* hEnergyDist     = (TH1F*)detArray->At(ringNumber);  
   return fEnergyDistribution->GetEnergyDistribution(det, ring);
 }
 //____________________________________________________________________
@@ -175,32 +170,8 @@ TH2F* AliFMDAnaParameters::GetBackgroundCorrection(Int_t det,
     return 0;
   } 
   
-  
-  
-  /*
-  TObjArray* correction = GetBackgroundArray();
-  
-  TObjArray* detArray   = (TObjArray*)correction->At(det);
-  Int_t ringNumber      = (ring == 'I' ? 0 : 1);
-  TObjArray* ringArray  = (TObjArray*)detArray->At(ringNumber);
-  TH2F* bgHist          = (TH2F*)ringArray->At(vtxbin);
-  */
   return fBackground->GetBgCorrection(det,ring,vtxbin);
 }
-//____________________________________________________________________
-TAxis* AliFMDAnaParameters::GetRefAxis() {
-  
-  TAxis* refAxis = (TAxis*)fBackgroundArray->At(0);
-  
-  return refAxis;
-}
-//____________________________________________________________________
-TObjArray* AliFMDAnaParameters::GetBackgroundArray() {
-  
-  TObjArray* correction = (TObjArray*)fBackgroundArray->At(1);
-  
-  return correction;
-}
 
 //____________________________________________________________________
 AliCDBEntry* AliFMDAnaParameters::GetEntry(const char* path, Bool_t fatal) const

diff --git a/FMD/analysis/AliFMDAnaParameters.h b/FMD/analysis/AliFMDAnaParameters.h
index f8260ede17983cf0cbc4fae48f99252cbb22a5a3..a7ff67ef0690f478e0640bc4ada442e1b6b902c8 100644 (file)
--- a/FMD/analysis/AliFMDAnaParameters.h
+++ b/FMD/analysis/AliFMDAnaParameters.h
@@ -74,8 +74,10 @@ protected:
   AliFMDAnaParameters(const AliFMDAnaParameters& o) 
     : TNamed(o),
       fIsInit(o.fIsInit),
-      fBackgroundArray(o.fBackgroundArray), 
-      fEdistArray(o.fEdistArray)
+      fBackground(o.fBackground),
+      fEnergyDistribution(o.fEnergyDistribution)
+      //  fBackgroundArray(o.fBackgroundArray), 
+      //fEdistArray(o.fEdistArray)
   {}
   AliFMDAnaParameters& operator=(const AliFMDAnaParameters&) { return *this; }
   virtual ~AliFMDAnaParameters() {}
@@ -92,8 +94,8 @@ protected:
   
   
   Bool_t fIsInit;
-  TObjArray*  fBackgroundArray;
-  TObjArray*  fEdistArray;
+  //TObjArray*  fBackgroundArray;
+  // TObjArray*  fEdistArray;
   AliFMDAnaCalibBackgroundCorrection* fBackground;
   AliFMDAnaCalibEnergyDistribution* fEnergyDistribution;
   static const char* fgkBackgroundCorrection;

diff --git a/FMD/analysis/AliFMDAnalysisTaskCollector.h b/FMD/analysis/AliFMDAnalysisTaskCollector.h
index a39837d0858a4f048c2bda0bcfcdfd268a1ffd90..a7de28fea7670c90f1d3dbee10c4e179bb917cae 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskCollector.h
+++ b/FMD/analysis/AliFMDAnalysisTaskCollector.h
@@ -27,6 +27,8 @@ class AliFMDAnalysisTaskCollector : public AliAnalysisTask
       fArray(o.fArray),
       fEdistHist(o.fEdistHist),
       fZvtxDist(o.fZvtxDist)  {}
+    
+    AliFMDAnalysisTaskCollector& operator=(const AliFMDAnalysisTaskCollector&) { return *this; }
     virtual ~AliFMDAnalysisTaskCollector() {;}
     // Implementation of interface methods
     virtual void ConnectInputData(Option_t *option = "");