From e742b9b00f6e8da7fdce797baf9a99a41d3fb407 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 11 Jul 2014 14:55:40 +0200 Subject: [PATCH] Compilation with Root6 --- ALIROOT/aliroot.cxx | 2 ++ MUON/CMakelibMUONcalign.pkg | 2 +- PWG/CMakelibPWGEMCAL.pkg | 2 +- PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx | 3 +++ PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx | 2 ++ PWGJE/CMakelibPWGJEEMCALJetTasks.pkg | 4 ++-- .../UserTasks/AliAnalysisTaskEmcalJetHF.cxx | 9 ++++++--- PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx | 2 ++ 8 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ALIROOT/aliroot.cxx b/ALIROOT/aliroot.cxx index 7d6829641dd..f33931ac17a 100644 --- 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 07a801b2079..027b1dd9c28 100644 --- 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 fe98a23dc47..2dd3b27c14a 100644 --- 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 c944778128b..2ad35ad1535 100644 --- 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 c184a525a1b..ad574c7a4e5 100644 --- 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 b3082cdf5c3..c5850177c0e 100644 --- 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 5fdf79d98b6..269f70f87ec 100644 --- 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(jet->GetNumberOfTracks()), static_cast(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(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(jetTrack->IsEMCAL()), static_cast(jetTrack->GetEMCALcluster())}; fhnTrackQA->Fill(trackQA); //,1./Njets); }//track loop for TrackQA diff --git a/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx b/PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx index 02c9ceddd9d..4b7a1049cf0 100644 --- 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" -- 2.39.3