Merge branch 'master' of https://git.cern.ch/reps/AliRoot

diff --git a/EVGEN/AliGenEMCocktail.cxx b/EVGEN/AliGenEMCocktail.cxx
index c4e92a8b5e148ad9435d3af82fe26c6de0871851..7e32ec36400519dd2f369f7715ef03c8ffe029cb 100644 (file)
--- a/EVGEN/AliGenEMCocktail.cxx
+++ b/EVGEN/AliGenEMCocktail.cxx
@@ -264,7 +264,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkzeroshort->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameK0short,genkzeroshort);
                TF1 *fPtK0short = genkzeroshort->GetPt();
-               fYieldArray[kK0s] = fPtK0short->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kK0s] = fPtK0short->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -281,7 +280,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkdeltaPlPl->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameDeltaPlPl,genkdeltaPlPl);
                TF1 *fPtDeltaPlPl = genkdeltaPlPl->GetPt();
-               fYieldArray[kDeltaPlPl] = fPtDeltaPlPl->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kDeltaPlPl] = fPtDeltaPlPl->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -298,7 +296,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkdeltaPl->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameDeltaPl,genkdeltaPl);
                TF1 *fPtDeltaPl = genkdeltaPl->GetPt();
-               fYieldArray[kDeltaPl] = fPtDeltaPl->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kDeltaPl] = fPtDeltaPl->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -315,7 +312,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkdeltaMi->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameDeltaMi,genkdeltaMi);
                TF1 *fPtDeltaMi = genkdeltaMi->GetPt();
-               fYieldArray[kDeltaMi] = fPtDeltaMi->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kDeltaMi] = fPtDeltaMi->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -332,7 +328,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkdeltaZero->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameDeltaZero,genkdeltaZero);
                TF1 *fPtDeltaZero = genkdeltaZero->GetPt();
-               fYieldArray[kDeltaZero] = fPtDeltaZero->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kDeltaZero] = fPtDeltaZero->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -349,7 +344,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkrhoPl->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameRhoPl,genkrhoPl);
                TF1 *fPtRhoPl = genkrhoPl->GetPt();
-               fYieldArray[kRhoPl] = fPtRhoPl->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kRhoPl] = fPtRhoPl->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -366,7 +360,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkrhoMi->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameRhoMi,genkrhoMi);
                TF1 *fPtRhoMi = genkrhoMi->GetPt();
-               fYieldArray[kRhoMi] = fPtRhoMi->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kRhoMi] = fPtRhoMi->Integral(fPtMin,fPtMax,1.e-6);
                #else
@@ -383,7 +376,6 @@ void AliGenEMCocktail::CreateCocktail()
                genkK0star->SetYRange(fYMin, fYMax);
                AddSource2Generator(nameK0star,genkK0star);
                TF1 *fPtK0star = genkK0star->GetPt();
-               fYieldArray[kK0star] = fPtK0star->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6);
                #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
                        fYieldArray[kK0star] = fPtK0star->Integral(fPtMin,fPtMax,1.e-6);
                #else

diff --git a/PWGHF/hfe/AliAnalysisTaskHFEemcQA.cxx b/PWGHF/hfe/AliAnalysisTaskHFEemcQA.cxx
index d3b10272af538e1d3b7ac0940d09d5126328d4cc..59a33a4b57d3954d25917865d55577a5ba272b91 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFEemcQA.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskHFEemcQA.cxx
@@ -30,6 +30,9 @@
 
 //QA task for EMCAL electron analysis 
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskHFEemcQA)
   //________________________________________________________________________
   AliAnalysisTaskHFEemcQA::AliAnalysisTaskHFEemcQA(const char *name) 

diff --git a/PWGHF/hfe/AliHFEpidTPC.cxx b/PWGHF/hfe/AliHFEpidTPC.cxx
index a7e07dd6b8532800576027669a5615bf3f869b1b..23044fd3e708e82ec3e9ff184740e6df6c1ae486 100644 (file)
--- a/PWGHF/hfe/AliHFEpidTPC.cxx
+++ b/PWGHF/hfe/AliHFEpidTPC.cxx
@@ -398,8 +398,8 @@ Double_t AliHFEpidTPC::GetCorrectedTPCnSigmaJpsi(Double_t eta, Double_t centrali
   //
   Double_t corrtpcNsigma = tpcNsigma;
   if(fkCentralityEtaCorrectionMeanJpsi&&fkCentralityEtaCorrectionWidthJpsi){
-    TAxis *caxis = fkCentralityEtaCorrectionMeanJpsi->GetXaxis();
-    TAxis *eaxis = fkCentralityEtaCorrectionMeanJpsi->GetYaxis();
+    const TAxis *caxis = fkCentralityEtaCorrectionMeanJpsi->GetXaxis();
+    const TAxis *eaxis = fkCentralityEtaCorrectionMeanJpsi->GetYaxis();
     Int_t cbin = caxis->FindBin(centralityEstimator);
     Int_t ebin = eaxis->FindBin(eta);
     Double_t cbinlowedge = caxis->GetBinLowEdge(cbin);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalQGTagging.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalQGTagging.cxx
index 1c2d886dbd3d7c0b25be241ea2afc7f8f257365c..63f5b1852694180f721d0e176730dfb4918733e2 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalQGTagging.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalQGTagging.cxx
@@ -42,6 +42,9 @@
 
 #include "AliAnalysisTaskEmcalQGTagging.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskEmcalQGTagging)
 
 //________________________________________________________________________

diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskEmcalJetHF.cxx b/PWGJE/FlavourJetTasks/AliAnalysisTaskEmcalJetHF.cxx
index 791a5edba96b7f577041b4a98b5bfbc52422434f..8169f21d57c8b9faf58c790d3f1442840f619148 100644 (file)
--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskEmcalJetHF.cxx
+++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskEmcalJetHF.cxx
@@ -67,6 +67,9 @@
 #include "TGeoGlobalMagField.h"
 #include "AliMagF.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskEmcalJetHF)
 
 //________________________________________________________________________

diff --git a/PWGPP/CMakelibPWGPPMUONdep.pkg b/PWGPP/CMakelibPWGPPMUONdep.pkg
index d7764a4ca7eb9d66ba05b314d208bcc628c9dfd1..1066c0613cbea4bc2d64f06ca5adc9779be63c82 100644 (file)
--- a/PWGPP/CMakelibPWGPPMUONdep.pkg
+++ b/PWGPP/CMakelibPWGPPMUONdep.pkg
@@ -53,4 +53,5 @@ set ( EINCLUDE
   STEER/ESD
   STEER/STEERBase
   CORRFW
+  PWG/muon
   )

diff --git a/PWGPP/MUON/dep/AliAnalysisTaskMuonFakes.cxx b/PWGPP/MUON/dep/AliAnalysisTaskMuonFakes.cxx
index 60f1e6d76053d66f529ea3d79b03ca5faaad5a70..534de3988f44b1837f26305540c86f18f880cbdd 100644 (file)
--- a/PWGPP/MUON/dep/AliAnalysisTaskMuonFakes.cxx
+++ b/PWGPP/MUON/dep/AliAnalysisTaskMuonFakes.cxx
@@ -54,6 +54,10 @@
 
 #include "AliAnalysisTaskMuonFakes.h"
 
+using std::cout;
+using std::endl;
+using std::flush;
+
 ClassImp(AliAnalysisTaskMuonFakes)
 
 //________________________________________________________________________

diff --git a/STARLIGHT/starlight/include/inputParameters.h b/STARLIGHT/starlight/include/inputParameters.h
index 34d8cc113a229fbd0006d239a52deaf844429693..6264915189d4a55b142f024dc57b5b6f93e84a8b 100644 (file)
--- a/STARLIGHT/starlight/include/inputParameters.h
+++ b/STARLIGHT/starlight/include/inputParameters.h
@@ -139,7 +139,7 @@ public:
     }
 
     template<typename S, bool v>
-    inline friend std::ostream& operator<<(std::ostream& os, const parameter<S,v>& par);
+    friend std::ostream& operator<<(std::ostream& os, const parameter<S,v>& par);