Compilation with Root6
authorhristov <Peter.Hristov@cern.ch>
Fri, 11 Jul 2014 12:55:40 +0000 (14:55 +0200)
committerhristov <Peter.Hristov@cern.ch>
Fri, 11 Jul 2014 12:55:55 +0000 (14:55 +0200)
ALIROOT/aliroot.cxx
MUON/CMakelibMUONcalign.pkg
PWG/CMakelibPWGEMCAL.pkg
PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx
PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhotonIsolation.cxx
PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHF.cxx
PWGLF/QATasks/AliAnalysisTaskQAMultistrange.cxx

index 7d68296..f33931a 100644 (file)
@@ -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)
index 07a801b..027b1dd 100644 (file)
@@ -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)
index fe98a23..2dd3b27 100644 (file)
@@ -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
index c944778..2ad35ad 100644 (file)
@@ -42,6 +42,9 @@
 #include "AliCentrality.h"
 #include "AliAnalysisTaskDptDptQA.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskDptDptQA)
 
 AliAnalysisTaskDptDptQA::AliAnalysisTaskDptDptQA()
index c184a52..ad574c7 100644 (file)
@@ -34,6 +34,8 @@
 
 #include "AliAnalysisTaskEMCALPhotonIsolation.h"
 
+using std::cout;
+using std::endl;
 
 ClassImp(AliAnalysisTaskEMCALPhotonIsolation)
 
index b3082cd..c585017 100644 (file)
@@ -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} )
index 5fdf79d..269f70f 100644 (file)
@@ -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
index 02c9ced..4b7a104 100644 (file)
@@ -60,6 +60,8 @@ class AliAODv0;
 #include "AliAODTrack.h"
 #include "AliESDpid.h"
 
+using std::cout;
+using std::endl;
 
 #include "AliAnalysisTaskQAMultistrange.h"