]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Changes to compile with Root6
authorhristov <Peter.Hristov@cern.ch>
Thu, 10 Apr 2014 14:10:57 +0000 (16:10 +0200)
committerhristov <Peter.Hristov@cern.ch>
Thu, 10 Apr 2014 14:10:57 +0000 (16:10 +0200)
18 files changed:
FIT/AliFITRawData.cxx
FIT/AliFITReconstructor.cxx
ITS/AliITShit.h
ITS/UPGRADE/AliITSUClusterLines.cxx
ITS/UPGRADE/AliITSUClusterLines.h
ITS/UPGRADE/AliITSUSuze02.cxx
ITS/UPGRADE/AliITSUVertexer.cxx
MFT/CMakelibMFTbase.pkg
PWG/DevNanoAOD/AliAnalysisTaskNanoAODFilter.cxx
PWG/FLOW/Base/AliFlowAnalysisWithMultiparticleCorrelations.cxx
PWGJE/CMakelibPWGJE.pkg
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.cxx
PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskHelium3PiAOD.cxx
PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskReadNuclexAOD.cxx
PWGLF/ThermalFits/AliParticleYield.cxx
T0/AliT0CalibWalk.cxx
T0/CMakelibT0calib.pkg

index 134a6e7b3aa8d4f341c9784eea0cdf95d0292b5e..b7d4564962158daf3ef861563b23b69505596f80 100644 (file)
@@ -37,6 +37,8 @@
 
 using std::cout;
 using std::endl;
+using std::ios_base;
+
 ClassImp(AliFITRawData)
 
 //_____________________________________________________________________________
index 230523fe3822a9481889c26197357da0aef7f36e..9ebb1f6f03914eb2cab277825482638575b23c2c 100644 (file)
@@ -35,6 +35,9 @@
 #include <TMath.h>
 #include <Riostream.h>
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliFITReconstructor)
 
 AliFITReconstructor:: AliFITReconstructor(): AliReconstructor(),
index b2bc9cdaf21d7c053ec01497d93cbc062e6ca3ca..0e67dad170097d971426e5283037e6723d082d5e 100644 (file)
@@ -90,6 +90,7 @@
 
 class TParticle;
 
+using std::istream;
 class AliITShit : public AliHit {
 
  public:
index f0a2516ea4b9bc4944ee5cecc206819fe1778480..04154ff7fd4049fe7a8ee1769a32367ba9ab15d3 100644 (file)
@@ -1,6 +1,9 @@
 #include "AliITSUClusterLines.h"
 #include <TMath.h>
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliITSUClusterLines);
 
 //////////////////////////////////////////////////////////////////////
index 50586746ff9acea3e7f85352fc51db030bc1c079..a858f83b4626e693e08c66efa510c9b23f612f5f 100644 (file)
@@ -10,6 +10,9 @@
 #include <TObject.h>
 #include <Riostream.h>
 #include "AliStrLine.h"
+#include <vector>
+
+using std::vector;
 
 
 class AliITSUClusterLines : public TObject {
index db1e2004cc085d176d513612599dbfd274593873..9885530ff4d55e0e2e9a30247b0f5dcd5c814c9b 100644 (file)
@@ -1,3 +1,4 @@
+#include <Riostream.h>
 #include "TMath.h"
 #include "AliITSUSuze02.h"
 
@@ -8,6 +9,9 @@
 //  
 //*******************************************************************
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliITSUSuze02)
 
 AliITSUSuze02::AliITSUSuze02(Int_t Nrows, Int_t Ncols):
index c08ce8e2a1d5c611b8884c4289d19dac38835845..406d49ad12b6a81dd7ce04f2d54693e7602c7d52 100644 (file)
@@ -18,6 +18,9 @@ using TMath::ATan2;
 using TMath::TwoPi;
 using TMath::BubbleLow;
 
+using std::cout;
+using std::endl;
+
 //////////////////////////////////////////////////////////////////////
 // This class is used to compute the position of all the primary    // 
 // vertices in a single event using the upgraded ITS.               //
index fdd36fb87b738d33adef8b88880bb1aa2e828b15..bef1623471a9242bd1de3ae581cb37c5b2d1ae79 100644 (file)
@@ -31,7 +31,7 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR MFTbaseLinkDef.h)
 
-set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/STEERBase)
+set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/AOD STEER/STEERBase)
 
 if( ALICE_TARGET STREQUAL "win32gcc")
        
index ec8c73dd0d27c22777ebe4fdf7d12b02915d70df..b6559d931f5426880110d8f04ad11b70ddeeed69 100644 (file)
@@ -42,6 +42,9 @@
 #include "AliNanoAODReplicator.h"
 #include "AliNanoAODTrackMapping.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskNanoAODFilter)
 
 
index 56e3fac8a61a4a5506b249e69a7e57cf5d7c598d..e2ee8975b96897728aa463ead8f101f4aca15af5 100644 (file)
@@ -28,6 +28,8 @@
 using std::endl;
 using std::cout;
 using std::flush;
+using std::ofstream;
+using std::ios;
 
 //================================================================================================================
 
index a3526d748efc81a73e65a02b0e9a713fd9ad8ec4..c92f712ef3ceba68ce33f8a66d3e22272086cdfb 100644 (file)
@@ -75,7 +75,7 @@ if(FASTJET_FOUND)
   set ( EINCLUDE ${FASTJET_INCLUDE_DIR} ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
   set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h  )
 else()
-  set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
+  set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWG/TRD PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
 endif(FASTJET_FOUND)
 
 
index 379518a19f17acea399a4fdde0907a5f4cc6792d..12b7b60e6143ba9b5eb8649db530e451d236b0d2 100644 (file)
@@ -2,7 +2,6 @@
 #include <Riostream.h>
 #include <TROOT.h>
 #include <TFile.h>
-#include <TCint.h>
 #include <TChain.h>
 #include <TTree.h>
 #include <TKey.h>
index 454455bc19e70039f15938b2d394a0fb7e68f3eb..44b9adfb2e7fe295c27fed4380fddbbcf339ad8b 100644 (file)
@@ -62,6 +62,9 @@
 #include "AliParticleContainer.h"
 #include "AliClusterContainer.h"
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskEmcalJetHadEPpid)
 
 //________________________________________________________________________
index 7c4973c26b4bda9d09fc02ba3b1cd1b0f2b76821..23523623069bcc8b3cf4895a8b7f55cebd212434 100644 (file)
@@ -62,6 +62,8 @@ class AliCascadeVertexer;
 #include <TLorentzVector.h>
 #include <AliVTrack.h>
 
+using std::cout;
+using std::endl;
 
 ClassImp(AliAnalysisTaskHelium3PiAOD)
 
index 3088c0bf9fb7bd55d2b3903dfd00e471f5da56cb..61411412b704672f14ffb18b4bd0d422d49f8283 100644 (file)
@@ -66,6 +66,9 @@ class AliCascadeVertexer;
 #include <AliAODRecoDecayLF.h>
 #include <AliAODRecoDecayLF2Prong.h>
 
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskReadNuclexAOD)
 
 //________________________________________________________________________
index b0791f0104973a7081363c148b364e8e57248a79..7067d2f991311c74578f08cc6551f5105ccce91a 100644 (file)
@@ -16,6 +16,8 @@
 using std::endl;
 using std::left;
 using std::setw;
+using std::ifstream;
+using std::ofstream;
 
 ClassImp(AliParticleYield)
 
index 6a9de31e99b6ff203291c2a060a93b15d54660a5..daefdcb5908b6b2d23b34b5b532a90baf17e4a12 100644 (file)
@@ -37,6 +37,7 @@
 
 using std::cout;
 using std::endl;
+using std::ifstream;
 ClassImp(AliT0CalibWalk)
 
 //________________________________________________________________
index e10608e9ee35388fe72ff2d85517c18ff2f266ab..7130f238fe58c83cf3f0b57ff711956e472fc262 100644 (file)
@@ -32,4 +32,4 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  T0calibLinkDef.h)
 
-set ( EINCLUDE  RAW STEER/STEERBase ANALYSIS)
+set ( EINCLUDE  RAW STEER/STEERBase STEER/ESD ANALYSIS)