Removing warnings pointed out by FC. Thanks

diff --git a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
index 128262a610304df14e5b47e412c4925eacd425c4..0624171847c22d62fb885113b423b5afc90e66d9 100644 (file)
--- a/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
+++ b/FMD/analysis/AliFMDAnaCalibBackgroundCorrection.cxx
@@ -61,11 +61,11 @@ void AliFMDAnaCalibBackgroundCorrection::SetBgCorrection(Int_t det,
   
 }
 //____________________________________________________________________
-TH1F* AliFMDAnaCalibBackgroundCorrection::GetDoubleHitCorrection(Int_t det, 
+TH1F* AliFMDAnaCalibBackgroundCorrection::GetDoubleHitCorrection(Int_t  det, 
                                                                 Char_t ring) {
   
   
-  TH1F* hCorrection    = (TH1F*)fListOfDoubleHitCorrection.FindObject(Form("hDoubleHitCorrection_FMD%d%c"));
+  TH1F* hCorrection    = (TH1F*)fListOfDoubleHitCorrection.FindObject(Form("hDoubleHitCorrection_FMD%d%c",det,ring));
   return hCorrection;
 }
 
@@ -73,7 +73,7 @@ TH1F* AliFMDAnaCalibBackgroundCorrection::GetDoubleHitCorrection(Int_t det,
 void AliFMDAnaCalibBackgroundCorrection::SetDoubleHitCorrection(Int_t det, 
                                                                Char_t ring, 
                                                                TH1F* hCorrection) {
-  hCorrection->SetName(Form("hDoubleHitCorrection_FMD%d%c"));
+  hCorrection->SetName(Form("hDoubleHitCorrection_FMD%d%c",det,ring));
   fListOfDoubleHitCorrection.Add(hCorrection);    
 }
 //____________________________________________________________________

diff --git a/FMD/analysis/AliFMDAnaParameters.h b/FMD/analysis/AliFMDAnaParameters.h
index 51dd0b2d7b7376aa976a9b0deec76cdc62611fcb..2575d030adc9b9d398100c3a0eb98b167475dd58 100644 (file)
--- a/FMD/analysis/AliFMDAnaParameters.h
+++ b/FMD/analysis/AliFMDAnaParameters.h
@@ -93,9 +93,11 @@ protected:
     : TNamed(o),
       fIsInit(o.fIsInit),
       fBackground(o.fBackground),
-      fEnergyDistribution(o.fEnergyDistribution)
-      //  fBackgroundArray(o.fBackgroundArray), 
-      //fEdistArray(o.fEdistArray)
+      fEnergyDistribution(o.fEnergyDistribution),
+      fCorner1(o.fCorner1),
+      fCorner2(o.fCorner2),
+      fEnergyPath(o.fEnergyPath),
+      fBackgroundPath(o.fBackgroundPath)
   {}
   AliFMDAnaParameters& operator=(const AliFMDAnaParameters&) { return *this; }
   virtual ~AliFMDAnaParameters() {}

diff --git a/FMD/analysis/AliFMDAnalysisTaskDensity.cxx b/FMD/analysis/AliFMDAnalysisTaskDensity.cxx
index f277ce3f2593325ed3b9ac829e024155cc7d0e82..82223adf3d1c34cef7abfdeec39237a76e07b71f 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskDensity.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskDensity.cxx
@@ -61,10 +61,10 @@ AliFMDAnalysisTaskDensity::AliFMDAnalysisTaskDensity(const char* name, Bool_t SE
     DefineOutput(0, TList::Class());
   }
   
-  fFuncPos = new TF1("funcPos","pol1",0,6);
+  /*  fFuncPos = new TF1("funcPos","pol1",0,6);
   fFuncPos->SetParameters(0.99925,0.00298301);
   fFuncNeg = new TF1("funcNeg","pol1",-6,0);
-  fFuncNeg->SetParameters(0.987583,-0.0101022);
+  fFuncNeg->SetParameters(0.987583,-0.0101022);*/
   
   
 }
@@ -205,13 +205,14 @@ void AliFMDAnalysisTaskDensity::Exec(Option_t */*option*/)
           //  std::cout<<eta<<"    "<<etacalc<<std::endl;
           //eta = etacalc;
             
-         Float_t m   = pars->GetMPV(det,ring,eta);
-         Float_t s   = pars->GetSigma(det,ring,eta);
+         //  Float_t m   = pars->GetMPV(det,ring,eta);
+         //  Float_t s   = pars->GetSigma(det,ring,eta);
          //AliFMDParameters* recopars = AliFMDParameters::Instance();
          
          Float_t mult_cut = 0.15;//m-2*s;//0.15;//0.2;//m-3*s;// 0.2;//0.01;//m-2*s;//0.2;
          if(ring == 'I')
            mult_cut = 0.10;
+         
          //mult_cut = (5*recopars->GetPedestalWidth(det,ring,sec,strip))/(recopars->GetPulseGain(det,ring,sec,strip)*recopars->GetDACPerMIP());
          
          Float_t nParticles = 0;
@@ -258,8 +259,10 @@ void AliFMDAnalysisTaskDensity::Exec(Option_t */*option*/)
          if(fESD->GetUniqueID() == kTRUE) {
            TH1F* hDoubleHitCorrection = pars->GetDoubleHitCorrection(det,ring);
            //if(det == 3) 
+           
            if(hDoubleHitCorrection->GetBinContent(hDoubleHitCorrection->FindBin(eta)) != 0)
              correction = correction / hDoubleHitCorrection->GetBinContent(hDoubleHitCorrection->FindBin(eta));
+           
            //else
            //  correction = correction / pars->GetDoubleHitCorrection()->GetBinContent(pars->GetDoubleHitCorrection()->FindBin(eta));
          }

diff --git a/FMD/analysis/AliFMDAnalysisTaskDensity.h b/FMD/analysis/AliFMDAnalysisTaskDensity.h
index e79a178cf514612c0b78ca82536115ced1df0aaf..91b29d41d7e5d530e9e9629af1a71ab4480170b6 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskDensity.h
+++ b/FMD/analysis/AliFMDAnalysisTaskDensity.h
@@ -59,8 +59,8 @@ class AliFMDAnalysisTaskDensity : public AliAnalysisTask
     AliESDVertex* fVertex;
     Bool_t        fStandalone;
     Bool_t        fStatus;
-    TF1*          fFuncPos;
-    TF1*          fFuncNeg;
+    // TF1*          fFuncPos;
+    // TF1*          fFuncNeg;
     
     ClassDef(AliFMDAnalysisTaskDensity, 0); // Analysis task for FMD analysis
 };

diff --git a/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.cxx b/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.cxx
index 4b2a634489bd648015633d6fb21949ee8299e541..d6e1dfb7244a3ceec464a5a7dcac9ed8c50cda9e 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.cxx
@@ -25,16 +25,33 @@ ClassImp(AliFMDAnalysisTaskGenerateBackground)
 
 //_____________________________________________________________________
 AliFMDAnalysisTaskGenerateBackground::AliFMDAnalysisTaskGenerateBackground():
-AliAnalysisTaskSE()
+AliAnalysisTaskSE(),
+  fListOfHits(), 
+  fListOfPrimaries(),
+  fListOfCorrection(),
+  fVertexBins(),
+  fLastTrackByStrip(),
+  fHitsByStrip(),
+  fZvtxCut(10),
+  fNvtxBins(10),
+  fNbinsEta(200),
+  fBackground(0)
 {
   // Default constructor
 }
 //_____________________________________________________________________
 AliFMDAnalysisTaskGenerateBackground::AliFMDAnalysisTaskGenerateBackground(const char* name):
   AliAnalysisTaskSE(name),
+  fListOfHits(), 
+  fListOfPrimaries(),
+  fListOfCorrection(),
+  fVertexBins(),
+  fLastTrackByStrip(),
+  fHitsByStrip(),
   fZvtxCut(10),
   fNvtxBins(10),
-  fNbinsEta(200)
+  fNbinsEta(200),
+  fBackground(0)
 {
  
   DefineOutput(1, TList::Class());
@@ -242,7 +259,7 @@ void AliFMDAnalysisTaskGenerateBackground::GenerateCorrection() {
 
 }
 //_____________________________________________________________________
-void AliFMDAnalysisTaskGenerateBackground::ReadFromFile(const Char_t* filename, Bool_t storeInOCDB, Int_t runNo) {
+void AliFMDAnalysisTaskGenerateBackground::ReadFromFile(const Char_t* filename, Bool_t storeInOCDB, Int_t /*runNo*/) {
 
   TFile infile(filename);
   TH1F* hVertex = (TH1F*)infile.Get("VertexBins");

diff --git a/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.h b/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.h
index 2b2b442915b8fa6a862ba1aa38eb6305a788764e..438e97537dbc2f5c00074facb95331896563f2bd 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.h
+++ b/FMD/analysis/AliFMDAnalysisTaskGenerateBackground.h
@@ -20,6 +20,7 @@ class AliFMDAnalysisTaskGenerateBackground : public AliAnalysisTaskSE
       fListOfCorrection(),
       fVertexBins(o.fVertexBins),
       fLastTrackByStrip(o.fLastTrackByStrip),
+      fHitsByStrip(o.fHitsByStrip),
       fZvtxCut(o.fZvtxCut),
       fNvtxBins(o.fNvtxBins),
       fNbinsEta(o.fNbinsEta),

diff --git a/FMD/analysis/AliFMDAnalysisTaskSharing.cxx b/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
index 744630f63c557947d3ef92ba7127780285822c9e..bad13e9bbe8503b883e380a49cc0bba94fcebdc4 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
@@ -207,8 +207,8 @@ Float_t AliFMDAnalysisTaskSharing::GetMultiplicityOfStrip(Float_t mult,
                                                          Float_t Enext,
                                                          UShort_t   det,
                                                          Char_t  ring,
-                                                         UShort_t sec,
-                                                         UShort_t strip) {
+                                                         UShort_t /*sec*/,
+                                                         UShort_t /*strip*/) {
   AliFMDAnaParameters* pars = AliFMDAnaParameters::Instance();
  
   Float_t merged_energy = 0;