Import Geant4 11.1.0.beta source tree

source/externals/g4tools/include/tools/lina/MATCOM

@@ -941,7 +941,7 @@ public: /*operators*/\
     return m_vec[a_r + a_c * dimension()];\
   }\
 \
-  T& operator[](size_t a_index) { /*for inlib/sg/sf_vec*/\
+  T& operator[](size_t a_index) { /*for tools/sg/sf_vec*/\
     /*WARNING : no check on a_index.*/\
     return m_vec[a_index];\
   }\
@@ -982,7 +982,7 @@ protected:\
     T* tp = (T*)m_vec;T* ap = (T*)a_m;\
     for(unsigned int i=0;i<dim2();i++,tp++,ap++) *tp = *ap;\
    /*{for(unsigned int i=0;i<dim2();i++) m_vec[i] = a_m[i];}*/\
-   /* memcpy does not work with std::complex<> and mat<symbol,4> see inlib/tests/symbolic.cpp */\
+   /* memcpy does not work with std::complex<> and mat<symbol,4> see tools/tests/symbolic.cpp */\
     /*vec_copy(m_vec,a_m,dim2());*/\
   }\
 \

source/externals/g4tools/include/tools/lina/geom3

@@ -50,10 +50,10 @@ public:
   void get_point(unsigned int a_index,unsigned int a_num,vec3<T>& a_p){
     //a_index = 0        is a_p0
     //a_index = a_num-1  is a_p1
-    T s = T(a_index)/T(a_num-1);
-    T s2 = s*s;
-    T s3 = s2*s;
-    a_p = m_a*s3 + m_b*s2 + m_c*s + m_d;
+    T _s = T(a_index)/T(a_num-1);
+    T s2 = _s*_s;
+    T s3 = s2*_s;
+    a_p = m_a*s3 + m_b*s2 + m_c*_s + m_d;
   }
   void get_point(unsigned int a_index,unsigned int a_num,T& a_x,T& a_y,T& a_z){
     //a_index = 0        is a_p0

source/externals/g4tools/include/tools/lina/vec2

@@ -175,7 +175,7 @@ public: //operators
   bool operator==(const vec2& a_v) const {return equal(a_v);}
   bool operator!=(const vec2& a_v) const {return !operator==(a_v);}
 
-public: //for inlib/sg/sf_vec
+public: //for tools/sg/sf_vec
   typedef unsigned int size_type;
   size_type size() const {return 2;}
   const T* data() const {return m_data;}

source/externals/g4tools/include/tools/lina/vec3

@@ -260,7 +260,7 @@ public: //operators
   bool operator==(const vec3& a_v) const {return equal(a_v);}
   bool operator!=(const vec3& a_v) const {return !operator==(a_v);}
 
-public: //for inlib/sg/sf_vec
+public: //for tools/sg/sf_vec
   typedef unsigned int size_type;
   size_type size() const {return 3;}
   const T* data() const {return m_data;}

source/externals/g4tools/include/tools/lina/vec4

@@ -254,7 +254,7 @@ public: //operators
   bool operator==(const vec4& a_v) const {return equal(a_v);}
   bool operator!=(const vec4& a_v) const {return !operator==(a_v);}
 
-public: //for inlib/sg/sf_vec
+public: //for tools/sg/sf_vec
   typedef unsigned int size_type;
   size_type size() const {return 4;}
   const T* data() const {return m_data;}