Changes needed on alpha (Compaq C++ V6.2-024)

diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx
index abf41da5dd461f8103fc2b61f99e088411fb3470..69a3a7b9cce913e604a5180c121ae6fa15319ee1 100644 (file)
--- a/FMD/AliFMD.cxx
+++ b/FMD/AliFMD.cxx
@@ -163,6 +163,7 @@
 #ifndef ALIALTROBUFFER_H
 # include "AliAltroBuffer.h"
 #endif
+#include <Riostream.h>
 
 //____________________________________________________________________
 ClassImp(AliFMD);
@@ -547,15 +548,15 @@ AliFMD::Init()
   Int_t i;
   //
   if (fDebug) {
-    std::cout << "\n" << ClassName() << ": " << std::flush;
-    for (i = 0; i < 35; i++) std::cout << "*";
-    std::cout << " FMD_INIT ";
-    for (i = 0; i < 35; i++) std::cout << "*";
-    std::cout << "\n" << ClassName() << ": " << std::flush;
+    cout << "\n" << ClassName() << ": " << flush;
+    for (i = 0; i < 35; i++) cout << "*";
+    cout << " FMD_INIT ";
+    for (i = 0; i < 35; i++) cout << "*";
+    cout << "\n" << ClassName() << ": " << flush;
     //
     // Here the FMD initialisation code (if any!)
-    for (i = 0; i < 80; i++) std::cout << "*";
-    std::cout << std::endl;
+    for (i = 0; i < 80; i++) cout << "*";
+    cout << endl;
   }
   //
   //

diff --git a/FMD/AliFMD3.cxx b/FMD/AliFMD3.cxx
index 3fc331a74fb0deffd63a669086263f8d5d8e73de..a8912d265e5c264a652f7ebf3f4472601da7aca3 100644 (file)
--- a/FMD/AliFMD3.cxx
+++ b/FMD/AliFMD3.cxx
@@ -42,7 +42,7 @@
 #ifndef ALIFMDRING_H
 # include "AliFMDRing.h"
 #endif 
-#include <iostream>
+#include <Riostream.h>
 
 //____________________________________________________________________
 ClassImp(AliFMD3);
@@ -165,7 +165,7 @@ AliFMD3::SimpleGeometry(TList* nodes,
                   / (fOuterZ - fInnerZ));
   Double_t bo   = 0;
   if (ao2 > ao1) {
-    std::cout << "Wafer determinds the size" << std::endl;
+    cout << "Wafer determinds the size" << endl;
     ao  = ao2;
     bo  = fInner->GetHighR() - ao * fInnerZ;
   }

diff --git a/FMD/AliFMDDigit.cxx b/FMD/AliFMDDigit.cxx
index f7c1e4d44da77d2397d7a423e76fee39a5b69213..2fb5a7153d82a0af7c0d47033d80f4bf7fdd33d6 100644 (file)
--- a/FMD/AliFMDDigit.cxx
+++ b/FMD/AliFMDDigit.cxx
@@ -62,12 +62,7 @@
 #ifndef ALIFMDDIGIT_H
 # include "AliFMDDigit.h"
 #endif
-#ifndef __IOSTREAM__
-# include <iostream>
-#endif
-#ifndef __IOMANIP__
-# include <iomanip>
-#endif
+# include <Riostream.h>
 
 //====================================================================
 ClassImp(AliFMDBaseDigit);
@@ -106,10 +101,10 @@ void
 AliFMDBaseDigit::Print(Option_t* /* option*/) const 
 {
   // Print digit to standard out 
-  std::cout << ClassName() << ": FMD" << fDetector << fRing << "[" 
-           << std::setw(3) << fSector << ","
-           << std::setw(3) << fStrip << "]" 
-           << std::endl;
+  cout << ClassName() << ": FMD" << fDetector << fRing << "[" 
+           << setw(3) << fSector << ","
+           << setw(3) << fStrip << "]" 
+           << endl;
 }
 
 //====================================================================
@@ -155,9 +150,9 @@ AliFMDDigit::Print(Option_t* /* option*/) const
 {
   // Print digit to standard out 
   AliFMDBaseDigit::Print();
-  std::cout << "\t" 
-           << fCount1 << " (+ " << fCount2 << " + " << fCount2 << ") = " 
-           << Counts() << std::endl;
+  cout << "\t" 
+       << fCount1 << " (+ " << fCount2 << " + " << fCount2 << ") = " 
+       << Counts() << endl;
 }
 
 //====================================================================
@@ -207,9 +202,9 @@ AliFMDSDigit::Print(Option_t* /* option*/) const
 {
   // Print digit to standard out 
   AliFMDBaseDigit::Print();
-  std::cout << "\t" << fEdep << " -> "
-           << fCount1 << " (+ " << fCount2 << " + " << fCount2 << ") = " 
-           << Counts() << std::endl;
+  cout << "\t" << fEdep << " -> "
+       << fCount1 << " (+ " << fCount2 << " + " << fCount2 << ") = " 
+       << Counts() << endl;
 }
 
 //____________________________________________________________________

diff --git a/FMD/AliFMDHit.cxx b/FMD/AliFMDHit.cxx
index 4b7826a79c9fa1e108d5889028d5d1db716e8da5..61afbd95503549e7a7f424d8248025128637b516 100644 (file)
--- a/FMD/AliFMDHit.cxx
+++ b/FMD/AliFMDHit.cxx
@@ -28,12 +28,7 @@
 #ifndef ALILOG_H
 # include "AliLog.h"
 #endif
-#ifndef __IOSTREAM__
-# include <iostream>
-#endif
-#ifndef __IOMANIP__
-# include <iomanip>
-#endif
+# include <Riostream.h>
 
 //____________________________________________________________________
 ClassImp(AliFMDHit);
@@ -114,11 +109,11 @@ void
 AliFMDHit::Print(Option_t* /* option */) const 
 {
   // Print Hit to standard out 
-  std::cout << "AliFMDHit: FMD" 
-           << fDetector << fRing << "[" 
-           << std::setw(3) << fSector << ","
-           << std::setw(3) << fStrip << "] = " 
-           << fEdep << std::endl;
+  cout << "AliFMDHit: FMD" 
+       << fDetector << fRing << "[" 
+       << setw(3) << fSector << ","
+       << setw(3) << fStrip << "] = " 
+       << fEdep << endl;
 }
 
 //____________________________________________________________________

diff --git a/FMD/AliFMDParticles.cxx b/FMD/AliFMDParticles.cxx
index d82df4e55fd17d7a1ea572ea9aabe42682bce9a1..9cffbc33f348d8e2ca8f0297ad44a9625aadaf40 100644 (file)
--- a/FMD/AliFMDParticles.cxx
+++ b/FMD/AliFMDParticles.cxx
@@ -9,12 +9,7 @@
 #ifndef ALIFMDPARTICLES_H
 # include "AliFMDParticles.h"
 #endif
-#ifndef __IOSTREAM__
-# include <iostream>
-#endif
-#ifndef __IOMANIP__
-# include <iomanip>
-#endif
+# include <Riostream.h>
 
 //____________________________________________________________________
 ClassImp(AliFMDParticles)
@@ -71,18 +66,18 @@ AliFMDParticles::AliFMDParticles(UShort_t detector,  Char_t ring,
 void
 AliFMDParticles::Print(Option_t* /* opt*/) const
 {
-  std::cout << "FMD Reconstructed particles: " << fParticles << "\n" 
-           << "  Detector:      FMD" << fDetector << fRing << "\n"
-           << "  Sector range:  [" << fMinSector << "," << fMaxSector << "\n"
-           << "  Strip range:   [" << fMinStrip << "," << fMaxStrip << "\n"
-           << "  Eta range:     [" << fMinEta << "," << fMaxEta << "\n"
-           << "  Phi range:     [" << fMinPhi << "," << fMaxPhi << "\n"
-           << "  Method:        " << std::flush;
+  cout << "FMD Reconstructed particles: " << fParticles << "\n" 
+       << "  Detector:      FMD" << fDetector << fRing << "\n"
+       << "  Sector range:  [" << fMinSector << "," << fMaxSector << "\n"
+       << "  Strip range:   [" << fMinStrip << "," << fMaxStrip << "\n"
+       << "  Eta range:     [" << fMinEta << "," << fMaxEta << "\n"
+       << "  Phi range:     [" << fMinPhi << "," << fMaxPhi << "\n"
+       << "  Method:        " << flush;
   switch (fMethod) {
-  case kPoission:  std::cout << "Poission"  << std::endl; break;
-  case kIterative: std::cout << "Iterative" << std::endl; break;
-  case kNaive:     std::cout << "Naive"     << std::endl; break; 
-  default:         std::cout << "Unknown"   << std::endl; break;
+  case kPoission:  cout << "Poission"  << endl; break;
+  case kIterative: cout << "Iterative" << endl; break;
+  case kNaive:     cout << "Naive"     << endl; break; 
+  default:         cout << "Unknown"   << endl; break;
   }
 }
 

diff --git a/FMD/AliFMDRing.cxx b/FMD/AliFMDRing.cxx
index d60e8619d0b2b531eaacdf68e1ff315aaa2f2ad8..9f94ba71793a0c67b14dc3a4fa7f479fbb38c909 100644 (file)
--- a/FMD/AliFMDRing.cxx
+++ b/FMD/AliFMDRing.cxx
@@ -71,6 +71,7 @@
 #ifndef __IOSTREAM__
 # include <iostream>
 #endif
+#include <math.h>
 
 const Char_t* AliFMDRing::fgkRingFormat         = "FRG%c";
 const Char_t* AliFMDRing::fgkVirtualFormat      = "FV%c%c";