From de9ec31b399388ee561c458eaae1c4e22d829ff7 Mon Sep 17 00:00:00 2001 From: schutz Date: Wed, 15 Mar 2000 08:00:19 +0000 Subject: [PATCH] Changes imposed by HP-UX which ignores the new C++ standart --- PHOS/AliPHOSAnalyze.cxx | 9 +++++---- PHOS/AliPHOSClusterizerv1.cxx | 2 +- PHOS/AliPHOSDigit.cxx | 2 +- PHOS/AliPHOSEmcRecPoint.cxx | 4 +--- PHOS/AliPHOSFastRecParticle.cxx | 2 +- PHOS/AliPHOSGeometry.cxx | 2 +- PHOS/AliPHOSHit.cxx | 8 ++++---- PHOS/AliPHOSHit.h | 2 +- PHOS/AliPHOSPIDv1.cxx | 2 +- PHOS/AliPHOSPpsdRecPoint.cxx | 2 +- PHOS/AliPHOSRecPoint.cxx | 4 ++-- PHOS/AliPHOSRecPoint.h | 2 -- PHOS/AliPHOSTrackSegment.cxx | 2 +- PHOS/AliPHOSTrackSegmentMaker.cxx | 2 -- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 3 +-- PHOS/AliPHOSv0.cxx | 9 ++++----- PHOS/AliPHOSv1.cxx | 8 ++++---- PHOS/AliPHOSvFast.cxx | 2 +- PHOS/Makefile | 4 +--- 19 files changed, 31 insertions(+), 40 deletions(-) diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx index 44ae189b2d3..c220e3dd5d7 100644 --- a/PHOS/AliPHOSAnalyze.cxx +++ b/PHOS/AliPHOSAnalyze.cxx @@ -37,8 +37,8 @@ // --- Standard library --- -#include -#include +#include +#include // --- AliRoot header files --- @@ -189,8 +189,9 @@ void AliPHOSAnalyze::AnalyzeOneEvent(Int_t evt) fPID->Print() ; //========== Creates the Reconstructioner fRec = new AliPHOSReconstructioner(fClu, fTrs, fPID) ; - //========== Event Number - if ( ( log10(ievent+1) - (Int_t)(log10(ievent+1)) ) == 0. ) cout << "AnalyzeManyEvents > " << "Event is " << ievent << endl ; + //========== Event Number> + if ( ( log10((Float_t)(ievent+1)) - (Int_t)(log10((Float_t)(ievent+1))) ) == 0. ) + cout << "AnalyzeManyEvents > " << "Event is " << ievent << endl ; //=========== Connects the various Tree's for evt gAlice->GetEvent(ievent); //=========== Gets the Digit TTree diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index f516a8a344c..c2293c855de 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -27,7 +27,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index 745dc98c368..1b3aeac89e5 100644 --- a/PHOS/AliPHOSDigit.cxx +++ b/PHOS/AliPHOSDigit.cxx @@ -30,7 +30,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index 5d75c51412a..0daf2d5401c 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -30,8 +30,7 @@ // --- Standard library --- -#include -#include +#include // --- AliRoot header files --- @@ -545,7 +544,6 @@ void AliPHOSEmcRecPoint::Streamer(TBuffer &R__b) // Stream an object of class AliPHOSEmcRecPoint. // Needed because of the array fEnergyList - assert(0==1) ; if (R__b.IsReading()) { Version_t R__v = R__b.ReadVersion(); if (R__v) { } AliPHOSRecPoint::Streamer(R__b); diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx index 4e548dd1c5e..9a7a5c2840d 100644 --- a/PHOS/AliPHOSFastRecParticle.cxx +++ b/PHOS/AliPHOSFastRecParticle.cxx @@ -25,7 +25,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx index fe087f90a3d..01602968932 100644 --- a/PHOS/AliPHOSGeometry.cxx +++ b/PHOS/AliPHOSGeometry.cxx @@ -29,7 +29,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSHit.cxx b/PHOS/AliPHOSHit.cxx index 63f6458103b..8b885f43d3c 100644 --- a/PHOS/AliPHOSHit.cxx +++ b/PHOS/AliPHOSHit.cxx @@ -24,10 +24,10 @@ // --- ROOT system --- // --- Standard library --- -#include -#include -#include -#include +#include +#include +#include +#include // --- AliRoot header files --- #include "AliPHOSHit.h" diff --git a/PHOS/AliPHOSHit.h b/PHOS/AliPHOSHit.h index 5c00c0a6831..299c120dd37 100644 --- a/PHOS/AliPHOSHit.h +++ b/PHOS/AliPHOSHit.h @@ -18,7 +18,7 @@ // --- Standard library --- -#include +#include class AliPHOSHit : public AliHit { diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx index df6fdfc1642..732a12a67b6 100644 --- a/PHOS/AliPHOSPIDv1.cxx +++ b/PHOS/AliPHOSPIDv1.cxx @@ -26,7 +26,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSPpsdRecPoint.cxx b/PHOS/AliPHOSPpsdRecPoint.cxx index 97afc032c28..31f6e377cd4 100644 --- a/PHOS/AliPHOSPpsdRecPoint.cxx +++ b/PHOS/AliPHOSPpsdRecPoint.cxx @@ -27,7 +27,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx index b6e96bbe2f9..7b0ee9e9f48 100644 --- a/PHOS/AliPHOSRecPoint.cxx +++ b/PHOS/AliPHOSRecPoint.cxx @@ -24,8 +24,8 @@ #include "TPad.h" // --- Standard library --- -#include -#include +#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h index 0ec32112a10..2c061e748ea 100644 --- a/PHOS/AliPHOSRecPoint.h +++ b/PHOS/AliPHOSRecPoint.h @@ -16,8 +16,6 @@ // --- Standard library --- -#include - // --- AliRoot header files --- #include "AliRecPoint.h" diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx index 860fdc47d7e..58045d235b0 100644 --- a/PHOS/AliPHOSTrackSegment.cxx +++ b/PHOS/AliPHOSTrackSegment.cxx @@ -30,7 +30,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx index 7715aad11b4..7f91a6a84c4 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.cxx +++ b/PHOS/AliPHOSTrackSegmentMaker.cxx @@ -30,8 +30,6 @@ // --- Standard library --- -#include - // --- AliRoot header files --- #include "AliPHOSTrackSegmentMaker.h" diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 07303afa218..dc15d450174 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -31,8 +31,7 @@ // --- Standard library --- -#include -#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index 50c92109981..6ca5c7eec39 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -30,11 +30,10 @@ // --- Standard library --- -#include -#include -#include -#include -#include +#include +#include +#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index e58fea5d828..6b1c6f291ca 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -32,10 +32,10 @@ // --- Standard library --- -#include -#include -#include -#include +#include +#include +#include +#include // --- AliRoot header files --- diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx index e62ff687f25..107315ca1ab 100644 --- a/PHOS/AliPHOSvFast.cxx +++ b/PHOS/AliPHOSvFast.cxx @@ -32,7 +32,7 @@ // --- Standard library --- -#include +#include // --- AliRoot header files --- diff --git a/PHOS/Makefile b/PHOS/Makefile index d7e248ddc11..24a07a96bcf 100644 --- a/PHOS/Makefile +++ b/PHOS/Makefile @@ -17,9 +17,7 @@ SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSHit.cxx \ AliPHOSReconstructioner.cxx AliPHOSTrackSegment.cxx \ AliPHOSTrackSegmentMaker.cxx AliPHOSTrackSegmentMakerv1.cxx \ AliPHOSRecParticle.cxx AliPHOSPID.cxx AliPHOSPIDv1.cxx \ - AliPHOSAnalyze.cxx AliPHOSvFast.cxx AliPHOSFastRecParticle.cxx \ - AliPHOSArray.cxx - + AliPHOSAnalyze.cxx AliPHOSvFast.cxx AliPHOSFastRecParticle.cxx # C++ Headers -- 2.39.3