Comment useless common in data block

[u/mrichter/AliRoot.git] / HBTAN / volya_complex.h

diff --git a/HBTAN/volya_complex.h b/HBTAN/volya_complex.h
index 04508482ebd990c119e24ff73c5610fd7d4b4920..b96e69cebdda6b45f75128395b92f7a167c98b6a 100644 (file)
--- a/HBTAN/volya_complex.h
+++ b/HBTAN/volya_complex.h
@@ -30,13 +30,13 @@ Version 1.0.1
 
 /////////////////////////// Helper Error Function
 
-void ComplexError (char *msg)
+void ComplexError (const char *msg)
 {
        cout << endl <<  msg << endl;
        exit (1);
 }
 
-void ComplexWarning (char *msg)
+void ComplexWarning (const char *msg)
 {
        cout << endl <<  msg << endl;
 }
@@ -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)
     {