Corrections needed on HP

diff --git a/HBTAN/volya_complex.h b/HBTAN/volya_complex.h
index 04508482ebd990c119e24ff73c5610fd7d4b4920..71859843b3db9ae8bfdb5ee45788081fd15ae295 100644 (file)
--- a/HBTAN/volya_complex.h
+++ b/HBTAN/volya_complex.h
@@ -167,7 +167,6 @@ public:
 
 ////////////////////////////////////////////////
 
-inline double sqr(double a)  { return a*a; }
 
 inline Complex Complex::operator + () const
 {
@@ -504,8 +503,8 @@ double abs (const Complex &a)
        if (a.Re == 0) return TMath::Abs(a.Im);
     double R = TMath::Abs(a.Re), I = TMath::Abs(a.Im);
        return (R >= I) ?
-           (R * sqrt (1 + sqr(a.Im/a.Re))) :
-           (I * sqrt (1 + sqr(a.Re/a.Im))) ;
+           (R * sqrt (1 + a.Im*a.Im/a.Re/a.Re)) :
+           (I * sqrt (1 + a.Re*a.Re/a.Im/a.Im)) ;
 }
 
 double  Arg (const Complex &a)
@@ -533,8 +532,8 @@ Complex sqrt (const Complex &a, int flag)
        return flag ? -sqrt(a.Re) : sqrt(a.Re);
     double R = TMath::Abs(a.Re), I = TMath::Abs(a.Im);
        double w = (R >= I) ?
-           sqrt (R/2 * (  1 + sqrt (1 + sqr(a.Im/a.Re)))):
-           sqrt (I/2 * (R/I + sqrt (1 + sqr(a.Re/a.Im))));
+           sqrt (R/2 * (  1 + sqrt (1 + a.Im*a.Im/a.Re/a.Re))):
+           sqrt (I/2 * (R/I + sqrt (1 + a.Re*a.Re/a.Im/a.Im)));
     Complex c;
     if (a.Re >= 0)
     {

diff --git a/MUON/mapping/AliMpMotifType.cxx b/MUON/mapping/AliMpMotifType.cxx
index 4215f2005d541483a607951657ce154ab0aea15f..689fb7a49c507723933bf5802768ce48e31bfdf2 100755 (executable)
--- a/MUON/mapping/AliMpMotifType.cxx
+++ b/MUON/mapping/AliMpMotifType.cxx
@@ -7,6 +7,7 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <stdlib.h>
 #include <Riostream.h>
 
 #include "AliMpMotifType.h"

diff --git a/MUON/mapping/AliMpReader.cxx b/MUON/mapping/AliMpReader.cxx
index ee6137d444f595a544627ceef150650ee8cc546e..daa5411313be8e393902716424804a76ff674d75 100755 (executable)
--- a/MUON/mapping/AliMpReader.cxx
+++ b/MUON/mapping/AliMpReader.cxx
@@ -7,7 +7,6 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <string>
 #if !defined(__HP_aCC) && !defined(__alpha)
   #include <sstream>
 #endif
@@ -87,7 +86,7 @@ AliMpReader::~AliMpReader() {
 
 #ifdef WITH_ROOT
 //_____________________________________________________________________________
-Int_t  AliMpReader::GetIndex(const std::string& s) const 
+Int_t  AliMpReader::GetIndex(const string& s) const 
 {
 // Converts the TString to integer.
 // ---
@@ -116,7 +115,7 @@ Int_t  AliMpReader::GetIndex(const AliMpIntPair& pair) const
 }  
 
 //_____________________________________________________________________________
-std::string  AliMpReader::GetString(Int_t index) const
+string  AliMpReader::GetString(Int_t index) const
 {
 // Converts the integer index to the string.
 // ---

diff --git a/MUON/mapping/AliMpReader.h b/MUON/mapping/AliMpReader.h
index c079d5973cd939a2facc4598e95f5c188477cc12..b299766eb865ebf4e6046b2a9f0844b9c358ec25 100755 (executable)
--- a/MUON/mapping/AliMpReader.h
+++ b/MUON/mapping/AliMpReader.h
@@ -10,6 +10,7 @@
 #ifndef ALI_MP_READER_H
 #define ALI_MP_READER_H
 
+#include <string>
 #include <fstream>
 
 #include <TObject.h>
@@ -52,9 +53,9 @@ class AliMpReader : public TObject
                                         // of string to Int_t
     
     // methods
-    Int_t  GetIndex(const std::string& s) const;
+    Int_t  GetIndex(const string& s) const;
     Int_t  GetIndex(const AliMpIntPair& pair) const;
-    std::string  GetString(Int_t index) const;
+    string  GetString(Int_t index) const;
     AliMpIntPair  GetPair(Int_t index) const;
 #endif