Compatibility with the trunk of ROOT

diff --git a/FMD/AliFMDBaseDigit.cxx b/FMD/AliFMDBaseDigit.cxx
index 7e0468bba350491b83a616303ff0fe62c2c2dcec..2bf937c1d056abc2177bff87c775714b3fe22c26 100644 (file)
--- a/FMD/AliFMDBaseDigit.cxx
+++ b/FMD/AliFMDBaseDigit.cxx
@@ -72,6 +72,8 @@
 #include "AliFMDDebug.h" // Better debug macros
 
 //====================================================================
+using std::cout;
+using std::flush;
 ClassImp(AliFMDBaseDigit)
 #if 0
   ; // This is here to keep Emacs from indenting the next line

diff --git a/FMD/AliFMDHit.cxx b/FMD/AliFMDHit.cxx
index 76ec41a85ef1358556e49127870acab2435c5303..2b59850a404caeda003e0723293322bc5fe7214c 100644 (file)
--- a/FMD/AliFMDHit.cxx
+++ b/FMD/AliFMDHit.cxx
@@ -42,6 +42,9 @@
 // #include "AliFMDDebug.h"            // ALIFMDDEBUG_H ALILOG_H
 
 //____________________________________________________________________
+using std::setw;
+using std::cout;
+using std::endl;
 ClassImp(AliFMDHit)
 #if 0
   ; // This is here to keep Emacs for indenting the next line

diff --git a/FMD/AliFMDIndex.cxx b/FMD/AliFMDIndex.cxx
index 16e80c3e00459931516638c1e9dac6ee31aeaa6d..062009e8379018a56213d2e03a24a82a229dab9c 100644 (file)
--- a/FMD/AliFMDIndex.cxx
+++ b/FMD/AliFMDIndex.cxx
@@ -38,6 +38,8 @@
 #include <AliFMDMap.h>
 
 //====================================================================
+using std::cout;
+using std::flush;
 ClassImp(AliFMDIndex)
 #if 0
   ; // This is here to keep Emacs from indenting the next line

diff --git a/FMD/AliFMDRecPoint.cxx b/FMD/AliFMDRecPoint.cxx
index cae558bc6e56ff9100c727474482f52dd4f9ddf4..94d5b743881ab88e76d88f88797a82e3b190d284 100644 (file)
--- a/FMD/AliFMDRecPoint.cxx
+++ b/FMD/AliFMDRecPoint.cxx
@@ -31,6 +31,8 @@
 #include <Riostream.h>         // ROOT_Riostream
 
 //____________________________________________________________________
+using std::cout;
+using std::endl;
 ClassImp(AliFMDRecPoint)
 #if 0
   ; // This is here to keep Emacs for indenting the next line

diff --git a/MUON/AliMUONCDB.cxx b/MUON/AliMUONCDB.cxx
index a5460ceb6f7a5cd83eaa9cf7b3d37e9fba1c9d02..69751988c6bef6289e655ca3ad90f7dd8761035e 100644 (file)
--- a/MUON/AliMUONCDB.cxx
+++ b/MUON/AliMUONCDB.cxx
@@ -97,6 +97,12 @@
 #include <sstream>
 #include <set>
 
+using std::endl;
+using std::cout;
+using std::cerr;
+using std::ostringstream;
+using std::ifstream;
+
 namespace
 {
   //_____________________________________________________________________________

diff --git a/MUON/AliMUONClusterFinderMLEM.cxx b/MUON/AliMUONClusterFinderMLEM.cxx
index 21d26f511bff93fcf8a882e15a8b422c40a9606e..55b4799033a70fb80509733a05f408fea81b6242 100644 (file)
--- a/MUON/AliMUONClusterFinderMLEM.cxx
+++ b/MUON/AliMUONClusterFinderMLEM.cxx
@@ -47,6 +47,8 @@
 #include <TMath.h>
 #include "AliCodeTimer.h"
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONClusterFinderMLEM)
 /// \endcond

diff --git a/MUON/AliMUONClusterFinderPeakCOG.cxx b/MUON/AliMUONClusterFinderPeakCOG.cxx
index 8babf5aa3b314753ef9f0d0dbb00e1b93277f1fc..83cbe8fc6146dadb550436a097c197351c574544 100644 (file)
--- a/MUON/AliMUONClusterFinderPeakCOG.cxx
+++ b/MUON/AliMUONClusterFinderPeakCOG.cxx
@@ -45,6 +45,8 @@
 //#include <TCanvas.h>
 #include <TMath.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONClusterFinderPeakCOG)
 /// \endcond

diff --git a/MUON/AliMUONClusterFinderPeakFit.cxx b/MUON/AliMUONClusterFinderPeakFit.cxx
index 43ed7d9c66bf3b13e8f77f31239cf3b09d500500..b48b84e42747234ff3febc3409cd8a6335831270 100644 (file)
--- a/MUON/AliMUONClusterFinderPeakFit.cxx
+++ b/MUON/AliMUONClusterFinderPeakFit.cxx
@@ -50,6 +50,8 @@
 #include <TMath.h>
 //#include <TCanvas.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONClusterFinderPeakFit)
 /// \endcond

diff --git a/MUON/AliMUONClusterSplitterMLEM.cxx b/MUON/AliMUONClusterSplitterMLEM.cxx
index 53ba85dab3e6783992d1b58698410ad487a6107e..c27028b281c5bc93aaee6ee091fce228c97cf87b 100644 (file)
--- a/MUON/AliMUONClusterSplitterMLEM.cxx
+++ b/MUON/AliMUONClusterSplitterMLEM.cxx
@@ -48,6 +48,8 @@
 #include <TRandom.h>
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONClusterSplitterMLEM)
 /// \endcond

diff --git a/MUON/AliMUONESDInterface.cxx b/MUON/AliMUONESDInterface.cxx
index b25dbd3d35774bdaaaf565c81f9288bdd3af5324..7d61e3ec30bab50acd9174eaff145d51eb43eeed 100644 (file)
--- a/MUON/AliMUONESDInterface.cxx
+++ b/MUON/AliMUONESDInterface.cxx
@@ -72,6 +72,8 @@
 /// \author Philippe Pillot
 //-----------------------------------------------------------------------------
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONESDInterface)
 /// \endcond

diff --git a/MUON/AliMUONHit.cxx b/MUON/AliMUONHit.cxx
index a396b37a32775592931b7cb3bf27d5102cd70b67..eede6b4d5b42602b9190958a5f882b2c7959d8f3 100644 (file)
--- a/MUON/AliMUONHit.cxx
+++ b/MUON/AliMUONHit.cxx
@@ -34,6 +34,10 @@
 #include <TMath.h>
 #include <TString.h>
 
+using std::endl;
+using std::cout;
+using std::setw;
+using std::setprecision;
 /// \cond CLASSIMP
 ClassImp(AliMUONHit)
 /// \endcond

diff --git a/MUON/AliMUONLocalTrigger.cxx b/MUON/AliMUONLocalTrigger.cxx
index 4e81712167c5d777ffefc991897e40686da36d26..8edceef1bed6063a1a5ba978e28e73522ffdc693 100644 (file)
--- a/MUON/AliMUONLocalTrigger.cxx
+++ b/MUON/AliMUONLocalTrigger.cxx
@@ -31,6 +31,8 @@
 /// \author Ph. Crochet
 //-----------------------------------------------------------------------------
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONLocalTrigger)
 /// \endcond

diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx
index e43fe80222dec99a7f9b09ad4a3db13860f9f9b2..25fc4be82cf0a5e7edf09fb329eab98440ec3a17 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.cxx
+++ b/MUON/AliMUONLocalTriggerBoard.cxx
@@ -33,6 +33,8 @@
 #include <TBits.h>
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONLocalTriggerBoard)
 /// \endcond

diff --git a/MUON/AliMUONMCDataInterface.cxx b/MUON/AliMUONMCDataInterface.cxx
index ea41968c42acf7be673a02c71af427218a8fdb05..d1fde983b557c29dde95362611f20b46ed2e9d04 100644 (file)
--- a/MUON/AliMUONMCDataInterface.cxx
+++ b/MUON/AliMUONMCDataInterface.cxx
@@ -57,6 +57,8 @@
 #include <cstdlib>
 #include <cassert>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONMCDataInterface)
 /// \endcond

diff --git a/MUON/AliMUONPad.cxx b/MUON/AliMUONPad.cxx
index d92d9758acad1b4d0183eb6e445809b6a044bd93..5be049dda7610dcf4ad5f225c9cc3a416ff85ba0 100644 (file)
--- a/MUON/AliMUONPad.cxx
+++ b/MUON/AliMUONPad.cxx
@@ -40,6 +40,12 @@
 /// \author Laurent Aphecetche
 //-----------------------------------------------------------------------------
 
+using std::setw;
+using std::cout;
+using std::endl;
+using std::ios_base;
+using std::cerr;
+using std::ios;
 /// \cond CLASSIMP
 ClassImp(AliMUONPad)
 /// \endcond

diff --git a/MUON/AliMUONPreClusterFinderV3.cxx b/MUON/AliMUONPreClusterFinderV3.cxx
index 4368c74ca0e2522e119364eb67715b533b1fe06c..83f3cefc0c25859327fe17308d6fd8cca0faf49b 100644 (file)
--- a/MUON/AliMUONPreClusterFinderV3.cxx
+++ b/MUON/AliMUONPreClusterFinderV3.cxx
@@ -47,6 +47,8 @@
 /// \author Laurent Aphecetche
 //-----------------------------------------------------------------------------
 
+using std::endl;
+using std::cout;
 ClassImp(AliMUONPreClusterFinderV3)
 
 //_____________________________________________________________________________

diff --git a/MUON/AliMUONRegionalTrigger.cxx b/MUON/AliMUONRegionalTrigger.cxx
index f7b37a48c050442916bee6043dcbf5e79e72a621..5c5169a8412573a4dda6d71f663b7729039308a0 100644 (file)
--- a/MUON/AliMUONRegionalTrigger.cxx
+++ b/MUON/AliMUONRegionalTrigger.cxx
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#include <iostream>
 
 #include "AliMUONRegionalTrigger.h"
 #include "AliLog.h"
@@ -26,8 +27,8 @@
 // Author:  Ch. Finck
 //-----------------------------------------------------------------------------
 
-using std endl;
-using std cout;
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONRegionalTrigger)
 /// \endcond

diff --git a/MUON/AliMUONRegionalTriggerBoard.cxx b/MUON/AliMUONRegionalTriggerBoard.cxx
index 4d5c22dcf9c66a8f89a3f4500adde1d2e95aac82..ef620d23fa5f6d5523f00589e22635ab6abc6987 100644 (file)
--- a/MUON/AliMUONRegionalTriggerBoard.cxx
+++ b/MUON/AliMUONRegionalTriggerBoard.cxx
@@ -34,6 +34,8 @@
 
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONRegionalTriggerBoard)
 /// \endcond

diff --git a/MUON/AliMUONResponseFactory.cxx b/MUON/AliMUONResponseFactory.cxx
index f033025dcdc46855f4c64886ae8409a381680036..c9f8979192654f4e5f615b9f7ee3eca3a68db140 100644 (file)
--- a/MUON/AliMUONResponseFactory.cxx
+++ b/MUON/AliMUONResponseFactory.cxx
@@ -35,6 +35,7 @@
 #include "AliMUONResponseTrigger.h"
 #include "AliMUONResponseTriggerV1.h"
 
+using std::endl;
 /// \cond CLASSIMP
 ClassImp(AliMUONResponseFactory)
 /// \endcond

diff --git a/MUON/AliMUONResponseV0.cxx b/MUON/AliMUONResponseV0.cxx
index 1f596e2b07769dc6cf6378eb80917dacc5ef413b..5bc82aea728017280d5d068f973aa26f4de1f086 100644 (file)
--- a/MUON/AliMUONResponseV0.cxx
+++ b/MUON/AliMUONResponseV0.cxx
@@ -45,6 +45,8 @@
 #include <TMath.h>
 #include <TRandom.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONResponseV0)
 /// \endcond

diff --git a/MUON/AliMUONSimpleClusterServer.cxx b/MUON/AliMUONSimpleClusterServer.cxx
index b0f37fe13d6e323b11e913e8730f2612ce8cadb1..b6bfe99e28901698edfb0fe7d6284c4e85e24930 100644 (file)
--- a/MUON/AliMUONSimpleClusterServer.cxx
+++ b/MUON/AliMUONSimpleClusterServer.cxx
@@ -49,6 +49,8 @@
 /// 
 /// \author Laurent Aphecetche, Subatech
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP  
 ClassImp(AliMUONSimpleClusterServer)
 /// \endcond

diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx
index 9b97d8efcf5f04a79ddd97981f686a77c5e678af..c5df6525edbea9e44d8c153129b2c13a9e52cdc7 100644 (file)
--- a/MUON/AliMUONSlatGeometryBuilder.cxx
+++ b/MUON/AliMUONSlatGeometryBuilder.cxx
@@ -53,6 +53,8 @@
 #include <TGeoTube.h>
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONSlatGeometryBuilder)
 /// \endcond

diff --git a/MUON/AliMUONSt1GeometryBuilder.cxx b/MUON/AliMUONSt1GeometryBuilder.cxx
index bcc9ebbc1e06e2ab2052d280c30eabe7bd127841..d4561101d835f874d61855c7b5726c6662f46dbc 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilder.cxx
+++ b/MUON/AliMUONSt1GeometryBuilder.cxx
@@ -36,6 +36,8 @@
 #include "AliMUONGeometryModule.h"
 #include "AliMUONGeometryEnvelopeStore.h"
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONSt1GeometryBuilder)
 /// \endcond

diff --git a/MUON/AliMUONSt1GeometryBuilderV2.cxx b/MUON/AliMUONSt1GeometryBuilderV2.cxx
index a6fb1e64ae8cf8369825d629d67033c6840b88fe..d3d16b8f9cd336f5c75aecf11f99612c915f6709 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilderV2.cxx
+++ b/MUON/AliMUONSt1GeometryBuilderV2.cxx
@@ -61,6 +61,8 @@
 #include <TVirtualMC.h>
 #include <TArrayI.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONSt1GeometryBuilderV2)
 /// \endcond

diff --git a/MUON/AliMUONTrack.cxx b/MUON/AliMUONTrack.cxx
index 130eb7e5c70750d6d37a53fb92297791526d4aad..c1ffa44b893cb91c420d370c115572b71d2a7217 100644 (file)
--- a/MUON/AliMUONTrack.cxx
+++ b/MUON/AliMUONTrack.cxx
@@ -37,6 +37,11 @@
 
 #include <Riostream.h>
 
+using std::setw;
+using std::endl;
+using std::cout;
+using std::streamsize;
+using std::setprecision;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrack) // Class implementation in ROOT context
 /// \endcond

diff --git a/MUON/AliMUONTrackExtrap.cxx b/MUON/AliMUONTrackExtrap.cxx
index e136fef62be51699619990f78fccfa123c987e41..72e9b3aeccd87f2d69ce40c8eb32042acdfdcf89 100644 (file)
--- a/MUON/AliMUONTrackExtrap.cxx
+++ b/MUON/AliMUONTrackExtrap.cxx
@@ -37,6 +37,8 @@
 
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackExtrap) // Class implementation in ROOT context
 /// \endcond

diff --git a/MUON/AliMUONTrackParam.cxx b/MUON/AliMUONTrackParam.cxx
index 02859bce758fbf35faf21dcf2a124f7c9a11f63a..af0500dc42c23f99b2a4223f6f6f007336763131 100644 (file)
--- a/MUON/AliMUONTrackParam.cxx
+++ b/MUON/AliMUONTrackParam.cxx
@@ -30,6 +30,10 @@
 
 #include <Riostream.h>
 
+using std::setw;
+using std::setprecision;
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackParam) // Class implementation in ROOT context
 /// \endcond

diff --git a/MUON/AliMUONTrackReconstructor.cxx b/MUON/AliMUONTrackReconstructor.cxx
index fde9b412e499dcccb1870ddc1f358c557ab5b387..018f7baa7eb013b584240d3ccfcb85a00902dff0 100644 (file)
--- a/MUON/AliMUONTrackReconstructor.cxx
+++ b/MUON/AliMUONTrackReconstructor.cxx
@@ -50,6 +50,8 @@
 // Functions to be minimized with Minuit
 void TrackChi2(Int_t &nParam, Double_t *gradient, Double_t &chi2, Double_t *param, Int_t flag);
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackReconstructor) // Class implementation in ROOT context
 /// \endcond

diff --git a/MUON/AliMUONTrackReconstructorK.cxx b/MUON/AliMUONTrackReconstructorK.cxx
index 25ef67bda12634c8ad96a92cc0fca10fe01c58d2..9788dc08f6dcfee4be89eb661c2333b381decd56 100644 (file)
--- a/MUON/AliMUONTrackReconstructorK.cxx
+++ b/MUON/AliMUONTrackReconstructorK.cxx
@@ -48,6 +48,8 @@
 #include <TMatrixD.h>
 #include <TClonesArray.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackReconstructorK) // Class implementation in ROOT context
 /// \endcond

diff --git a/MUON/AliMUONTrackerDataMaker.cxx b/MUON/AliMUONTrackerDataMaker.cxx
index 92193f2dc5b829137cd32e7431def76fa363c717..01f151bf6e660e0a84c6852208b7097c72dd06bd 100644 (file)
--- a/MUON/AliMUONTrackerDataMaker.cxx
+++ b/MUON/AliMUONTrackerDataMaker.cxx
@@ -41,6 +41,8 @@
 #include "AliRawReader.h"
 #include "Riostream.h"
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackerDataMaker)
 /// \endcond

diff --git a/MUON/AliMUONTriggerGeometryBuilder.cxx b/MUON/AliMUONTriggerGeometryBuilder.cxx
index 8b1e3a23586aaa5e46ec0491367ea774ea43e92e..d34aa8af53a9cbc4ed9be9b76e1de1edcdbf0e35 100644 (file)
--- a/MUON/AliMUONTriggerGeometryBuilder.cxx
+++ b/MUON/AliMUONTriggerGeometryBuilder.cxx
@@ -37,6 +37,8 @@
 #include "AliMUONGeometryModule.h"
 #include "AliMUONGeometryEnvelopeStore.h"
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerGeometryBuilder)
 /// \endcond

diff --git a/MUON/AliMUONTriggerSubprocessor.cxx b/MUON/AliMUONTriggerSubprocessor.cxx
index 9973511ccc73cc107fd14e6d0a468ee94ef6da9b..11ff1c5eee48c69c7aa36a87a794f362ae81cf3c 100644 (file)
--- a/MUON/AliMUONTriggerSubprocessor.cxx
+++ b/MUON/AliMUONTriggerSubprocessor.cxx
@@ -40,6 +40,7 @@
 ///
 /// \author L. Aphecetche
 
+using std::ifstream;
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerSubprocessor)
 /// \endcond

diff --git a/MUON/AliMUONTriggerTrack.cxx b/MUON/AliMUONTriggerTrack.cxx
index 3ba4f56bf6271cb2dddb1548f769e99a04235579..13bd46c8f1a85aa0c6b6c67836b6d036509bfe09 100644 (file)
--- a/MUON/AliMUONTriggerTrack.cxx
+++ b/MUON/AliMUONTriggerTrack.cxx
@@ -30,6 +30,8 @@
 #include <Riostream.h>
 #include "AliLog.h"
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerTrack)
 /// \endcond

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 1718b69fc85919ea8347d59e88e48a120678173b..d25249e171405fa90f5cc8d0ea6be370f8fad68e 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -56,6 +56,9 @@
 
 #include "AliMUONVHitStore.h"
 
+using std::endl;
+using std::cout;
+using std::setw;
 /// \cond CLASSIMP
 ClassImp(AliMUONv1)
 /// \endcond

diff --git a/PMD/AliPMDCalibGain.cxx b/PMD/AliPMDCalibGain.cxx
index e800f59781c2c75e7452c16c28e88930fce8d155..b1af5003e6fa06d7d1d15845e0a60fd9abf0709b 100644 (file)
--- a/PMD/AliPMDCalibGain.cxx
+++ b/PMD/AliPMDCalibGain.cxx
@@ -37,6 +37,7 @@
 #include "AliPMDddldata.h"
 #include "AliPMDCalibGain.h"
 
+using std::ifstream;
 ClassImp(AliPMDCalibGain)
 
 AliPMDCalibGain::AliPMDCalibGain():

diff --git a/STEER/AOD/AliAODTrack.cxx b/STEER/AOD/AliAODTrack.cxx
index cbd5c2f5c31e048cd29a754aa4c1018b889e3e63..f7f54b851271e8dcfa452657b6951c6255add3fc 100644 (file)
--- a/STEER/AOD/AliAODTrack.cxx
+++ b/STEER/AOD/AliAODTrack.cxx
@@ -421,7 +421,7 @@ void AliAODTrack::ConvertAliPIDtoAODPID()
 
 
 //______________________________________________________________________________
-template <class T> void AliAODTrack::SetP(const T *p, const Bool_t cartesian) 
+template <typename T> void AliAODTrack::SetP(const T *p, const Bool_t cartesian) 
 {
   // Set the momentum
 
@@ -446,7 +446,7 @@ template <class T> void AliAODTrack::SetP(const T *p, const Bool_t cartesian)
 }
 
 //______________________________________________________________________________
-template <class T> void AliAODTrack::SetPosition(const T *x, const Bool_t dca) 
+template <typename T> void AliAODTrack::SetPosition(const T *x, const Bool_t dca) 
 {
   // set the position
 

diff --git a/STEER/AOD/AliAODTrack.h b/STEER/AOD/AliAODTrack.h
index 4aef0fe69eb9f5f9195135b3260231cd6bb7d60e..933fb21863a30ea97c642119a26c54d02a127d4c 100644 (file)
--- a/STEER/AOD/AliAODTrack.h
+++ b/STEER/AOD/AliAODTrack.h
@@ -154,10 +154,10 @@ class AliAODTrack : public AliVTrack {
   void ConvertAliPIDtoAODPID();
   void SetDetPID(AliAODPid *aodpid) {fDetPid = aodpid;}
 
-  template <class T> void GetPID(T *pid) const {
+  template <typename T> void GetPID(T *pid) const {
     for(Int_t i=0; i<10; ++i) pid[i]=fPID[i];}
  
-  template <class T> void SetPID(const T *pid) {
+  template <typename T> void SetPID(const T *pid) {
     if(pid) for(Int_t i=0; i<10; ++i) fPID[i]=pid[i];
     else {for(Int_t i=0; i<10; fPID[i++]=0.) ; fPID[AliAODTrack::kUnknown]=1.;}}
 
@@ -180,22 +180,22 @@ class AliAODTrack : public AliVTrack {
   //
   Int_t   GetTOFBunchCrossing(Double_t b=0, Bool_t tpcPIDonly=kFALSE) const;
   //
-  template <class T> void GetP(T *p) const {
+  template <typename T> void GetP(T *p) const {
     p[0]=fMomentum[0]; p[1]=fMomentum[1]; p[2]=fMomentum[2];}
 
-//  template <class T> void GetPxPyPz(T *p) const {
+//  template <typename T> void GetPxPyPz(T *p) const {
 //    p[0] = Px(); p[1] = Py(); p[2] = Pz();}
   Bool_t GetPxPyPz(Double_t *p) const;
 
-  template <class T> Bool_t GetPosition(T *x) const {
+  template <typename T> Bool_t GetPosition(T *x) const {
     x[0]=fPosition[0]; x[1]=fPosition[1]; x[2]=fPosition[2];
     return TestBit(kIsDCA);}
 
-  template <class T> void SetCovMatrix(const T *covMatrix) {
+  template <typename T> void SetCovMatrix(const T *covMatrix) {
     if(!fCovMatrix) fCovMatrix=new AliAODRedCov<6>();
     fCovMatrix->SetCovMatrix(covMatrix);}
 
-  template <class T> Bool_t GetCovMatrix(T *covMatrix) const {
+  template <typename T> Bool_t GetCovMatrix(T *covMatrix) const {
     if(!fCovMatrix) return kFALSE;
     fCovMatrix->GetCovMatrix(covMatrix); return kTRUE;}
 
@@ -301,7 +301,7 @@ class AliAODTrack : public AliVTrack {
   void SetID(Short_t id) { fID = id; }
   void SetLabel(Int_t label) { fLabel = label; }
 
-  template <class T> void SetPosition(const T *x, Bool_t isDCA = kFALSE);
+  template <typename T> void SetPosition(const T *x, Bool_t isDCA = kFALSE);
   void SetDCA(Double_t d, Double_t z);
   void SetUsedForVtxFit(Bool_t used = kTRUE) { used ? SetBit(kUsedForVtxFit) : ResetBit(kUsedForVtxFit); }
   void SetUsedForPrimVtxFit(Bool_t used = kTRUE) { used ? SetBit(kUsedForPrimVtxFit) : ResetBit(kUsedForPrimVtxFit); }
@@ -320,7 +320,7 @@ class AliAODTrack : public AliVTrack {
   void SetPt(Double_t pt) { fMomentum[0] = pt; };
   void SetPhi(Double_t phi) { fMomentum[1] = phi; }
   void SetTheta(Double_t theta) { fMomentum[2] = theta; }
-  template <class T> void SetP(const T *p, Bool_t cartesian = kTRUE);
+  template <typename T> void SetP(const T *p, Bool_t cartesian = kTRUE);
   void SetP() {fMomentum[0]=fMomentum[1]=fMomentum[2]=-999.;}
 
   void SetXYAtDCA(Double_t x, Double_t y) {fPositionAtDCA[0] = x; fPositionAtDCA[1] = y;}

diff --git a/STEER/AODLinkDef.h b/STEER/AODLinkDef.h
index 81750f183fb60339ac3e88188e4859f8b7435a1e..674024a59bfa877785f925c68bcb32baabc8856f 100644 (file)
--- a/STEER/AODLinkDef.h
+++ b/STEER/AODLinkDef.h
@@ -7,6 +7,7 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+#pragma link off all methods;
  
 #pragma link C++ enum   AliAODVertex::AODVtx_t;
 #pragma link C++ enum   AliAODTrack::AODTrk_t;
@@ -51,5 +52,6 @@
 #pragma link C++ class AliAODVZERO+;
 #pragma link C++ class AliAODZDC+;
 
+#pragma link C++ method AliAODTrack::SetPosition<double>(double const*, bool);
 
 #endif