Compilation with Root6

diff --git a/ALIROOT/aliroot.cxx b/ALIROOT/aliroot.cxx
index 7d6829641dd2085d546bdcf37cdd426dfda45223..f33931ac17a7550b734429f4c350539b821e333f 100644 (file)
--- a/ALIROOT/aliroot.cxx
+++ b/ALIROOT/aliroot.cxx
@@ -66,6 +66,8 @@ extern "C" void g95_runtime_start();
 
 using std::cout;
 using std::endl;
+using std::exception;
+using std::cerr;
 
 //_____________________________________________________________________________
 int main(int argc, char **argv)

diff --git a/MUON/CMakelibMUONcalign.pkg b/MUON/CMakelibMUONcalign.pkg
index 07a801b2079454406ed625cd6be4d9a435e18b00..027b1dd9c28bb30d98360032ba11cb02bb4df79f 100644 (file)
--- a/MUON/CMakelibMUONcalign.pkg
+++ b/MUON/CMakelibMUONcalign.pkg
@@ -38,4 +38,4 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  MUONcalignLinkDef.h)
 
-set ( EINCLUDE  MUON/mapping ANALYSIS STEER/AOD STEER/STEERBase)
+set ( EINCLUDE  MUON/mapping ANALYSIS STEER/AOD STEER/STEERBase STEER/STEER)

diff --git a/PWG/CMakelibPWGEMCAL.pkg b/PWG/CMakelibPWGEMCAL.pkg
index fe98a23dc479891a71a2fc3591c4b45ff455d05c..2dd3b27c14a7b3a849222e771b4280b70cd6ce0e 100644 (file)
--- a/PWG/CMakelibPWGEMCAL.pkg
+++ b/PWG/CMakelibPWGEMCAL.pkg
@@ -65,7 +65,7 @@ string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
 set ( DHDR  PWGEMCALLinkDef.h)
 
-set ( EINCLUDE PWG/Tools PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS ANALYSIS/Tender)
+set ( EINCLUDE PWG/Tools PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS ANALYSIS/Tender)
 
 install (DIRECTORY EMCAL/data
         DESTINATION PWG/EMCAL

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx
index c944778128ba26e11e8779a3078e8c96dafc8516..2ad35ad15358f1de265aa250d61062eea1a60621 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx
@@ -42,6 +42,9 @@
 #include "AliCentrality.h"
 #include "AliAnalysisTaskDptDptQA.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskDptDptQA)
 
 AliAnalysisTaskDptDptQA::AliAnalysisTaskDptDptQA()

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx
index c184a525a1bfde2b2da7ebb97550599bff8e5ad8..ad574c7a4e5b7d8a8ace2a8ed61507b43b17bd56 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx
@@ -34,6 +34,8 @@
 
 #include "AliAnalysisTaskEMCALPhotonIsolation.h"
 
+using std::cout;
+using std::endl;
 
 ClassImp(AliAnalysisTaskEMCALPhotonIsolation)
 

diff --git a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
index b3082cdf5c3fcfef3db05fa157140b58f24ea151..c5850177c0e64592e7ae7f831cfd25cc670a72f2 100644 (file)
--- a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
+++ b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
@@ -103,10 +103,10 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 if(FASTJET_FOUND)
   set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR})
-  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
   set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h )
 else()
-  set ( EINCLUDE PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+  set ( EINCLUDE PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
 endif(FASTJET_FOUND)
 
 SET ( EXPORT ${HDRS} )

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHF.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHF.cxx
index 5fdf79d98b6e9a4d2b3af7210e57981eaae4d7ef..269f70f87ec6f243d386210c5bf68a86b0609e99 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHF.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHF.cxx
@@ -53,6 +53,9 @@
 #include "TGeoGlobalMagField.h"
 #include "AliMagF.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskEmcalJetHF)
 
 //________________________________________________________________________
@@ -551,7 +554,7 @@ Bool_t AliAnalysisTaskEmcalJetHF::Run()
         // apply jet cuts
         if(!AcceptMyJet(jet)) continue;
  
-        Double_t JetQA[5] = {0, jet->GetNumberOfTracks(), jet->GetNumberOfClusters(),jet->Eta(), jet->Phi()};
+        Double_t JetQA[5] = {0, static_cast<Double_t>(jet->GetNumberOfTracks()), static_cast<Double_t>(jet->GetNumberOfClusters()),jet->Eta(), jet->Phi()};
         fhnJetQA->Fill(JetQA);
       
       
@@ -582,7 +585,7 @@ Bool_t AliAnalysisTaskEmcalJetHF::Run()
               continue;
             }
             if(!IsJetTrack(jet,itrack,kFALSE)) continue;
-            Double_t ClusQA[6] = {caloCluster->E(),cp.PseudoRapidity() ,cp.Phi(), caloCluster->IsEMCAL(), NtrMatched, trackcluster->Phi()};
+            Double_t ClusQA[6] = {caloCluster->E(),cp.PseudoRapidity() ,cp.Phi(), static_cast<Double_t>(caloCluster->IsEMCAL()), NtrMatched, trackcluster->Phi()};
             fhnClusQA->Fill(ClusQA); //,1./Njets);    // fill Sparse Histo with trigger entries
           }//loop over tracks for JetQA
 
@@ -598,7 +601,7 @@ Bool_t AliAnalysisTaskEmcalJetHF::Run()
           continue;
         }
         if(!IsJetTrack(jet,iTrack,kFALSE)) continue;
-        Double_t trackQA[5] = {jetTrack->Pt(), jetTrack->Eta(), jetTrack->Phi(), jetTrack->IsEMCAL(), jetTrack->GetEMCALcluster()};
+        Double_t trackQA[5] = {jetTrack->Pt(), jetTrack->Eta(), jetTrack->Phi(), static_cast<Double_t>(jetTrack->IsEMCAL()), static_cast<Double_t>(jetTrack->GetEMCALcluster())};
         fhnTrackQA->Fill(trackQA); //,1./Njets);
         
       }//track loop for TrackQA

diff --git a/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx b/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx
index 02c9ceddd9d43c148ffe17ba906f20541c9be7b2..4b7a1049cf054b3eeef838f3ec0eade6849d001f 100644 (file)
--- a/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx
+++ b/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx
@@ -60,6 +60,8 @@ class AliAODv0;
 #include "AliAODTrack.h"
 #include "AliESDpid.h"
 
+using std::cout;
+using std::endl;
 
 #include "AliAnalysisTaskQAMultistrange.h"