From: fca Date: Fri, 17 Oct 2008 07:35:21 +0000 (+0000) Subject: Fixing compilation errors X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=2f720eae02cdb1ed7b0b3b13222803d90672ca8b Fixing compilation errors --- diff --git a/UNICOR/AliDEvent.cxx b/UNICOR/AliDEvent.cxx index 438d1404a5b..bfbf59a87a7 100644 --- a/UNICOR/AliDEvent.cxx +++ b/UNICOR/AliDEvent.cxx @@ -40,7 +40,7 @@ Double_t AliDEvent::ParticleY(Int_t i, Double_t mass) const // rapidity double pp = ParticleP(i); - double ee = sqrt(fabs(mass*mass + pp*pp)); + double ee = TMath::Sqrt(TMath::Abs(mass*mass + pp*pp)); double pz = ParticlePz(i); double yy = log((ee+pz)/(ee-pz))/2; return yy; diff --git a/UNICOR/AliDEventAliceESD.cxx b/UNICOR/AliDEventAliceESD.cxx index 816905b7b7a..6bda7fd7eaa 100644 --- a/UNICOR/AliDEventAliceESD.cxx +++ b/UNICOR/AliDEventAliceESD.cxx @@ -27,7 +27,7 @@ Bool_t AliDEventAliceESD::Good() const { // event cuts - if (fabs(Zver())>1) return kFALSE; + if (TMath::Abs(Zver())>1) return kFALSE; if (AliESDEvent::GetPrimaryVertex()->GetZRes()>0.1) return kFALSE; return kTRUE; } @@ -47,8 +47,8 @@ Bool_t AliDEventAliceESD::ParticleGood(Int_t i, Int_t pidi) const Float_t r,z; track->GetImpactParameters(r,z); - // if (fabs(z)>0.2) return 0; // impact parameter in z - // if (fabs(r)>0.1) return 0; // impact parameter in xy + // if (TMath::Abs(z)>0.2) return 0; // impact parameter in z + // if (TMath::Abs(r)>0.1) return 0; // impact parameter in xy // pid diff --git a/UNICOR/AliDPair.h b/UNICOR/AliDPair.h index c6e44d561a1..44f6d96a29e 100644 --- a/UNICOR/AliDPair.h +++ b/UNICOR/AliDPair.h @@ -46,7 +46,7 @@ class AliDPair : public TObject { double Qinv2() {return -q.M2();} double QCM() {return CMq.Vect().Mag();} double QCMpar() {return CMq.Vect()*ubeta;} - double QCMper() {return sqrt(fabs(QCM()*QCM()-QCMpar()*QCMpar()));} + double QCMper() {return TMath::Sqrt(TMath::Abs(QCM()*QCM()-QCMpar()*QCMpar()));} double QCMout() {return +CMq.Vect().X()*ubetat.X()+CMq.Vect().Y()*ubetat.Y();} double QCMside() {return -CMq.Vect().X()*ubetat.Y()+CMq.Vect().Y()*ubetat.X();} double QCMlong() {return CMq.Vect().Z();} diff --git a/UNICOR/UNICORLinkDef.h b/UNICOR/UNICORLinkDef.h new file mode 100644 index 00000000000..3fbeb28942f --- /dev/null +++ b/UNICOR/UNICORLinkDef.h @@ -0,0 +1,24 @@ +#ifdef __CINT__ +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + +/* $Id: ZDCbaseLinkDef.h 27132 2008-07-06 13:56:18Z coppedis $ */ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliDAnal+; +#pragma link C++ class AliDAnalCorrel+; +#pragma link C++ class AliDAnalGlobal+; +#pragma link C++ class AliDAnalPtfluc+; +#pragma link C++ class AliDAnalSingle+; +#pragma link C++ class AliDAnalysisTask+; +#pragma link C++ class AliDEvent+; +#pragma link C++ class AliDEventAliceESD+; +#pragma link C++ class AliDHN+; +#pragma link C++ class AliDLoop+; +#pragma link C++ class AliDPair+; + + +#endif diff --git a/UNICOR/libUNICOR.pkg b/UNICOR/libUNICOR.pkg index 27652d45c64..a646c178606 100644 --- a/UNICOR/libUNICOR.pkg +++ b/UNICOR/libUNICOR.pkg @@ -1,8 +1,20 @@ #-*- Mode: Makefile -*- -SRCS = $(shell cd UNICOR; ls AliD*.cxx) +SRCS = \ +AliDAnal.cxx \ +AliDAnalCorrel.cxx \ +AliDAnalGlobal.cxx \ +AliDAnalPtfluc.cxx \ +AliDAnalSingle.cxx \ +AliDAnalysisTask.cxx \ +AliDEvent.cxx \ +AliDEventAliceESD.cxx \ +AliDHN.cxx \ +AliDLoop.cxx \ +AliDPair.cxx HDRS = $(SRCS:.cxx=.h) -CINTAUTOLINK = 1 +DHDR:=UNICORLinkDef.h + diff --git a/build/module.dep b/build/module.dep index 719e4ed29e9..97dfc9ca236 100644 --- a/build/module.dep +++ b/build/module.dep @@ -55,6 +55,7 @@ ISAJET/module.mk: ISAJET/libisajet.pkg TIsajet/module.mk: TIsajet/libTIsajet.pkg TTherminator/module.mk: TTherminator/libTTherminator.pkg CORRFW/module.mk: CORRFW/libCORRFW.pkg +UNICOR/module.mk: UNICOR/libUNICOR.pkg ifeq (win32gcc,$(ALICE_TARGET)) $(LIBPATH)/libAOD.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT)