More mods to suit ROOT head

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index 4b10fec1db966628f7debe2fc879f544c642d755..093964d74352bf95861d0c3add9ae722c40b33fe 100644 (file)
--- a/ALIROOT/binaliroot.pkg
+++ b/ALIROOT/binaliroot.pkg
@@ -35,7 +35,7 @@ ELIBSCPP:=$(filter-out EPEMGEN,$(ELIBSCPP))
 PACKLDFLAGS:=$(LDFLAGS) $(ELIBSCPP:%=-Wl,-u,_G__cpp_setupG__%)
 # On Mac OS X gcc we need f2c
 ELIBS+=f2c
-ELIBSDIR+=$(dir $(shell find $(FINK_ROOT) -name 'libf2c.*'))
+ELIBSDIR+=$(FINK_ROOT)/lib
 endif
 
 # The two variables below are used for the creation of profile target.

diff --git a/EMCAL/jetfinder/AliEMCALJetFinder.h b/EMCAL/jetfinder/AliEMCALJetFinder.h
index de780ec2068455fc3a4fbe2cccce8d8f226f8004..89f13a92e079ccfff9b8a12566d415d1b97e38d9 100644 (file)
--- a/EMCAL/jetfinder/AliEMCALJetFinder.h
+++ b/EMCAL/jetfinder/AliEMCALJetFinder.h
@@ -8,15 +8,18 @@
 //*-- Author:
 //*-- Andreas Morsch (CERN)
 
-#include <TTask.h>
-#include "AliEMCALJet.h"
+#include <TFile.h>
 #include <TString.h>
+#include <TTask.h>
 
 class TClonesArray;
 class TH2F;
 class TH1F;
 class TCanvas;
 class TList;
+
+#include "AliEMCALJet.h"
+
 class AliEMCALHadronCorrection;
 
 class AliEMCALJetFinder : public TTask {

diff --git a/EVE/binalieve.pkg b/EVE/binalieve.pkg
index 178c60d550bf8d9e70f61bea95e086f61d30e346..6358c4b4748c8f8919d928bd2e73f425b8106388 100644 (file)
--- a/EVE/binalieve.pkg
+++ b/EVE/binalieve.pkg
@@ -39,6 +39,6 @@ ELIBSCPP:=$(filter-out EPEMGEN,$(ELIBSCPP))
 PACKLDFLAGS:=$(LDFLAGS) $(ELIBSCPP:%=-Wl,-u,_G__cpp_setupG__%)
 # On Mac OS X gcc we need f2c
 ELIBS+=f2c
-ELIBSDIR+=$(dir $(shell find $(FINK_ROOT) -name 'libf2c.*'))
+ELIBSDIR+=$(FINK_ROOT)/lib
 
 endif

diff --git a/PWG0/TPC/AliROCRawAnalysisSelector.cxx b/PWG0/TPC/AliROCRawAnalysisSelector.cxx
index 847e6762243efad20718ed988eab19a8553b38be..ab0cd7d49e68483762959827ae3aae7ab61b1b70 100644 (file)
--- a/PWG0/TPC/AliROCRawAnalysisSelector.cxx
+++ b/PWG0/TPC/AliROCRawAnalysisSelector.cxx
@@ -30,6 +30,7 @@
 #include <TTree.h>
 #include <TCanvas.h>
 #include <TTimeStamp.h>
+#include <TROOT.h>
 
 #include <TPC/AliTPCRawHistograms.h>
 

diff --git a/PWG0/dNdEta/AliMultiplicityCorrection.cxx b/PWG0/dNdEta/AliMultiplicityCorrection.cxx
index a44e832863a797782ca4059352df1fdb6ceea852..22b47d2055538508b409b25359f3a4ddbecafd99 100644 (file)
--- a/PWG0/dNdEta/AliMultiplicityCorrection.cxx
+++ b/PWG0/dNdEta/AliMultiplicityCorrection.cxx
@@ -32,6 +32,7 @@
 #include <TCanvas.h>
 #include <TString.h>
 #include <TF1.h>
+#include <TMath.h>
 
 ClassImp(AliMultiplicityCorrection)
 

diff --git a/PWG0/dNdEta/AlidNdEtaCorrection.cxx b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
index 8ae04a066bbed3d457222fe0a0bbcb3e823299bc..3079eddde3c154350d964f06f92679a3993966c8 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrection.cxx
+++ b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
@@ -1,3 +1,18 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
 /* $Id$ */
 
 #include "AlidNdEtaCorrection.h"
@@ -6,6 +21,7 @@
 #include <TCanvas.h>
 #include <TH3F.h>
 #include <TH1D.h>
+#include <TDirectory.h>
 #include <AliCorrection.h>
 #include <AliCorrectionMatrix2D.h>
 #include <AliCorrectionMatrix3D.h>

diff --git a/PWG0/esdTrackCuts/AliESDtrackCuts.cxx b/PWG0/esdTrackCuts/AliESDtrackCuts.cxx
index 982d2151f0243bcb72164c2b80cefe3aae2c5063..b76fcba7f4539ad15fb71d43e8d83869b4962936 100644 (file)
--- a/PWG0/esdTrackCuts/AliESDtrackCuts.cxx
+++ b/PWG0/esdTrackCuts/AliESDtrackCuts.cxx
@@ -1,3 +1,20 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 #include "AliESDtrackCuts.h"
 
 
@@ -5,6 +22,7 @@
 #include <AliESD.h>
 #include <AliLog.h>
 #include <TTree.h>
+#include <TDirectory.h>
 
 //____________________________________________________________________
 ClassImp(AliESDtrackCuts)

diff --git a/PWG2/EBYE/AliBalance.cxx b/PWG2/EBYE/AliBalance.cxx
index 469a5329e70135a406e8c34fadb159ede8367a93..7f87a129632098ff45edee2fcd7aacb62f39787f 100644 (file)
--- a/PWG2/EBYE/AliBalance.cxx
+++ b/PWG2/EBYE/AliBalance.cxx
@@ -23,6 +23,7 @@
 //ROOT
 #include <Riostream.h>
 #include <TMath.h>
+#include <TAxis.h>
 #include <TLorentzVector.h>
 #include <TGraphErrors.h>
 

diff --git a/PWG2/RESONANCES/AliRsnAnalysis.h b/PWG2/RESONANCES/AliRsnAnalysis.h
index e052e418707a372255af6f4429a4f8fc1721820e..7acaa4c540aec0134390f921e8dc8c0ac46f0dcd 100644 (file)
--- a/PWG2/RESONANCES/AliRsnAnalysis.h
+++ b/PWG2/RESONANCES/AliRsnAnalysis.h
@@ -17,6 +17,7 @@
 #ifndef AliRsnANALYSIS_H
 #define AliRsnANALYSIS_H
 
+#include <Htypes.h>
 #include <TNamed.h>
 
 #include "AliPID.h"

diff --git a/SHUTTLE/libSHUTTLE.pkg b/SHUTTLE/libSHUTTLE.pkg
index d3bfc9bc35150ee753007f016cce2ecceec4da81..5c09ac229a17bd7a0b5510ba7623fca29bd66691 100644 (file)
--- a/SHUTTLE/libSHUTTLE.pkg
+++ b/SHUTTLE/libSHUTTLE.pkg
@@ -12,6 +12,8 @@ EINCLUDE := $(DIMDIR)/dim
 ELIBS := dim
 ELIBSDIR := $(DIMDIR)/$(ODIR)
 
+EINCLUDE += $(ALIEN_ROOT)/api/include
+
 DHDR= SHUTTLELinkDef.h 
 
 EXPORT:=