Import Geant4 1.1.0 source tree

2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LorentzRotation.hh,v 1.2 1999/11/16 17:29:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4LorentzRotation_hh
 #define G4LorentzRotation_hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LorentzVector.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4LorentzVector_hh
 #define G4LorentzVector_hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Normal3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4NORMAL3D_HH
 #define G4NORMAL3D_HH
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Plane3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4PLANE3D_HH
 #define G4PLANE3D_HH
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Point3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4POINT3D_HH
 #define G4POINT3D_HH
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Transform3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4TRANSFORM3D_HH
 #define G4TRANSFORM3D_HH
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Vector3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4VECTOR3D_HH
 #define G4VECTOR3D_HH
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: geomdefs.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChebyshevApproximation.hh,v 1.2 1999/11/16 17:30:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataInterpolation.hh,v 1.2 1999/11/16 17:30:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussChebyshevQ.hh,v 1.2 1999/11/16 17:30:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussHermiteQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussJacobiQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLaguerreQ.hh,v 1.2 1999/11/16 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLegendreQ.hh,v 1.2 1999/11/16 17:30:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Integrator.hh,v 1.3 1999/11/16 17:30:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Integrator.icc,v 1.4 1999/11/23 14:59:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation of G4Integrator methods. 
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleIntegration.hh,v 1.2 1999/11/16 17:30:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGaussianQuadrature.hh,v 1.2 1999/11/16 17:30:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Class description:
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChebyshevApproximation.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //

 #include "G4ChebyshevApproximation.hh"
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataInterpolation.cc,v 1.3 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4DataInterpolation.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussChebyshevQ.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussChebyshevQ.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussHermiteQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussHermiteQ.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussJacobiQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussJacobiQ.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLaguerreQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussLaguerreQ.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GaussLegendreQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #include "G4GaussLegendreQ.hh"

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleIntegration.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation file for simple integration methods
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGaussianQuadrature.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // Implementation file for G4VGaussianQuadrature virtual base class
 //
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Poisson.hh,v 1.4 1999/11/16 17:31:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Poisson.hh,v 1.5 2000/01/06 14:13:08 maire Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -50,7 +50,7 @@ inline G4long G4Poisson(G4double mean)
  t = sqrt(-2*log(RandFlat::shoot()));
  y = twopi*RandFlat::shoot();
  t *= cos(y);
-  value = mean + t*sqrt(mean);
+  value = mean + t*sqrt(mean) + 0.5;
  if(value <= 0) {return 0;}
  if(value >= limit) { return G4long(limit);}
  return G4long(value);
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Randomize.hh,v 1.2 1999/11/16 17:31:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef randomize_h
 #define randomize_h 1
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RandDistributionTest.cc,v 1.3 1999/11/23 15:00:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RandGlobalTest.cc,v 1.3 1999/11/23 15:00:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ShootBitTest.cc,v 1.3 1999/11/23 15:00:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ShootBitTest.cc,v 1.4 1999/12/15 14:50:29 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 

@@ -14,7 +14,7 @@
 // Peter Urban, 5th Sep 1996

 #include "G4ios.hh"
-#include "g4std/iomanip.h"
+#include "g4std/iomanip"
 #include "Randomize.hh"
 #include "G4Timer.hh"

@@ -1,4 +1,4 @@
-$Id: History,v 1.35 1999/11/29 10:17:34 gcosmo Exp $
+$Id: History,v 1.41 2000/02/11 14:07:19 gcosmo Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -17,6 +17,39 @@ committal in the CVS repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+February 08, 2000 G.Cosmo (global-V01-00-03)
+- STLInterface/cstring.icc: fixed yet another bug in G4String::toUpper()
+  and G4String::toLower(). Loop over the string characters was causing
+  bounds overflow.
+- tpvector[.h.icc]: added resize(size_t) method which was missing!
+
+January 31, 2000 G.Cosmo (global-V01-00-02)
+- STLInterface: several fixes.
+  o Fixed bug in G4String::toUpper().
+    (bug was introduced inadvertently on 20-Oct-1999).
+  o Added checks for bound-overflows in G4RWTPtrSortedVector::find().
+  o Fixed bound-check for operators () and [] in most collections:
+    () access operators DO NOT perform bound-checking (except if G4DEBUG set);
+    [] access operators DO perform bound-checking.
+  o tpvector[.h.icc]: changed 'unsigned int' to 'size_t' in constructors.
+    Added 'rwsize' and bound-checking for operator[].
+  o tvvector.icc: added call to std_vector() in default constructor.
+  o tpordvec.icc: added std_pvector:: scope for calls to [] operator,
+    where missing.
+  o tvordvec.icc: added std_vector:: scope for calls to [] operator,
+    where missing.
+
+January 19, 2000 G.Cosmo (global-V01-00-01)
+- G4UnitsTable[.hh.cc]: added constructor to G4BestUnit for 3vectors (M.Maire).
+- globals.hh: added check on definition of CLHEP_MAX_MIN_DEFINED.
+
+January 3, 2000 G.Cosmo (global-V01-00-00)
+- Syncronized changes with HEAD (mainly CVS headers).
+- Fixed truncation problem in G4Poisson.hh.
+- Removed tphdict_test.cc and tvhdict_test.cc in STLInterface/test.
+- Added wrapper for HP-aCC for missing <fstream> standard header.
+- Removed G4USE_STL from globals.hh and G4Timer[.hh.cc].
+
 November 29, 99 G.Cosmo (global-V00-01-14)
 - Removed g4std/string wrapper since not anymore needed.
  It was previously made available only for Win/NT-VC++.
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 1999/11/29 10:17:36 gcosmo Exp $
+$Id: History,v 1.19 2000/02/11 14:08:38 gcosmo Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -20,6 +20,26 @@ committal in the CVS repository !

                         STL Interface
                         -------------
+February 8, 00 G.Cosmo
+- cstring.icc: fixed yet another bug in G4String::toUpper() and
+  G4String::toLower(). Loop over the string characters was causing
+  bounds overflow.
+- tpvector[.h.icc]: added resize(size_t) method which was missing!
+
+January 28, 00 G.Cosmo (STLInterface-V01-00-00)
+- Fixed bug in G4String::toUpper().
+  (bug was introduced inadvertently on 20-Oct-1999).
+- Added checks for bound-overflows in G4RWTPtrSortedVector::find().
+- Fixed bound-check for operators () and [] in most collections:
+  () access operators DO NOT perform bound-checking (except if G4DEBUG set);
+  [] access operators DO perform bound-checking.
+- tpvector[.h.icc]: changed 'unsigned int' to 'size_t' in constructors.
+  Added 'rwsize' and bound-checking for operator[].
+- tvvector.icc: added call to std_vector() in default constructor.
+- tpordvec.icc: added std_pvector:: scope for calls to [] operator,
+  where missing.
+- tvordvec.icc: added std_vector:: scope for calls to [] operator,
+  where missing.

 November 29, 99 G.Cosmo
 - Removed references to g4std/string, now removed since not anymore
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: cstring.h,v 1.6 1999/11/29 10:17:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: cstring.h,v 1.7 1999/12/15 18:12:53 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -29,10 +29,7 @@
 #include <string>
 #include "G4Types.hh"
 #include "g4rw/defs.h"
-
-#ifdef __KCC
-  #include <istream>
-#endif
+#include "g4std/iostream"

 #ifdef WIN32
  #define strcasecmp _stricmp
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: cstring.icc,v 1.2 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: cstring.icc,v 1.4 2000/02/08 14:15:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -363,7 +363,7 @@ G4String G4String::strip (int stripType, char c)

 void G4String::toLower ( void )
 {
-  for (int i=0; i<=size();i++)
+  for (int i=0; i<size();i++)
  {
    //GB:HP-UX-aCC,Linux-KCC 
    std_string::operator[](i) = tolower(std_string::operator[](i));
@@ -373,10 +373,10 @@ void G4String::toLower ( void )

 void G4String::toUpper ( void )
 {
-  for (int i=0; i<=size();i++)
+  for (int i=0; i<size();i++)
  {
    //GB:HP-UX-aCC,Linux-KCC 
-    std_string::operator[](i) = tolower(std_string::operator[](i));
+    std_string::operator[](i) = toupper(std_string::operator[](i));
    //at(i) = toupper(at(i)); 
  }
 }
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ctoken.h,v 1.5 1999/11/29 10:17:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: defs.h,v 1.7 1999/11/29 16:52:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: rstream.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: rw2stl_algo.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpordvec.h,v 1.7 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpordvec.icc,v 1.1 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpordvec.icc,v 1.2 2000/02/01 16:55:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -38,17 +38,23 @@ G4RWTPtrOrderedVector<T>::operator=(const G4RWTPtrOrderedVector<T>& v)
 template<class T >
 T*& G4RWTPtrOrderedVector<T>::operator()(size_t i) 
 {
-  //if(i>=rwsize)
-  //	G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector ()",rwsize,i));
-  if(i<std_pvector::size() && rwsize<=i) rwsize=i+1;
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_pvector::size())
+    rwsize=i+1;
  return std_pvector::operator[](i); 
 }

 template<class T >
 T* const& G4RWTPtrOrderedVector<T>::operator()(size_t i) const
 { 
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const ()",rwsize,i));
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
+  #endif
  return std_pvector::operator[](i); 
 }

@@ -57,7 +63,6 @@ T*& G4RWTPtrOrderedVector<T>::operator[](size_t i)
 {
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector []",rwsize,i));
-  //if(i<std_pvector::size() && rwsize<=i) rwsize=i+1;
  return std_pvector::operator[](i); 
 }

@@ -66,7 +71,7 @@ T* const& G4RWTPtrOrderedVector<T>::operator[](size_t i) const
 {      
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const []",rwsize,i));
-   return std_pvector::operator[](i); 
+  return std_pvector::operator[](i); 
 }

 template<class T >
@@ -199,7 +204,7 @@ T* G4RWTPtrOrderedVector<T>::removeAt( size_t i )
  for(j=0;j<rwsize && j<i;j++) it++;
  if(it!=std_pvector::end())
    {
-      T* tmp = operator[](i);
+      T* tmp = std_pvector::operator[](i);
      std_pvector::erase(it);
      rwsize--;
      return tmp;
@@ -313,7 +318,7 @@ T*& G4RWTPtrOrderedVector<T>::at ( size_t i )
 { 
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector at",rwsize,i));
-  return operator()(i); 
+  return std_pvector::operator[](i); 
 }

 template<class T>
@@ -321,7 +326,7 @@ T*const& G4RWTPtrOrderedVector<T>::at ( size_t i ) const
 {       
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTPtrOrderedVector const at",rwsize,i));
-  return operator()(i); 
+  return std_pvector::operator[](i); 
 }

 template<class T>
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpsrtvec.h,v 1.8 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpsrtvec.icc,v 1.2 1999/11/25 13:41:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpsrtvec.icc,v 1.3 2000/02/01 16:55:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -50,6 +50,10 @@ T* const& G4RWTPtrSortedVector<T>::operator [] (size_t n) const
 template<class T>
 T* const& G4RWTPtrSortedVector<T>::operator () (size_t n) const
 {
+  #ifdef G4DEBUG
+    if(n>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrSortedVector",rwsize,n));
+  #endif
  return std_pvector::operator[](n);
 }

@@ -58,8 +62,6 @@ T*& G4RWTPtrSortedVector<T>::at(size_t n )
 {
  if(n>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTPtrSortedVector",rwsize,n));
-  if(n<std_pvector::size() && rwsize<=n)
-    rwsize=n+1;
  return std_pvector::operator[](n);
 }

@@ -91,7 +93,7 @@ void G4RWTPtrSortedVector<T>::clearAndDestroy ()
 template<class T>
 T* G4RWTPtrSortedVector<T>::find (const T* a) const
 {
-  if(!a || std_pvector::empty()) return 0;
+  if(!a || std_pvector::empty() || (rwsize==0)) return 0;
  //We are sorted, so try a n log n search
  int t,d;
  int u=rwsize,l=0;
@@ -107,7 +109,7 @@ T* G4RWTPtrSortedVector<T>::find (const T* a) const
    }
  while(d>0);
    
-  if(*(*this)[u]==*a)
+  if ((u<rwsize) && (*(*this)[u]==*a))
    return (*this)[u];
  else
    return 0;
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpvector.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpvector.h,v 1.9 2000/02/11 14:09:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -39,8 +39,8 @@ class G4RWTPtrVector : public G4std::vector<T*>
 public:

  G4RWTPtrVector ();
-  G4RWTPtrVector (unsigned int);
-  G4RWTPtrVector (unsigned int, T* const &);
+  G4RWTPtrVector (size_t);
+  G4RWTPtrVector (size_t, T* const &);
  G4RWTPtrVector (const G4RWTPtrVector<T>&);
  virtual ~G4RWTPtrVector();

@@ -54,6 +54,11 @@ public:
  inline T* const * data() const;
  inline size_t length();
  inline void reshape(size_t);
+  void resize(size_t);
+
+private:
+
+  size_t rwsize;

 };

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tpvector.icc,v 1.4 1999/11/25 10:14:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tpvector.icc,v 1.6 2000/02/11 14:09:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -17,19 +17,19 @@

 template<class T>
 G4RWTPtrVector<T>::G4RWTPtrVector ()
-  : std_pvector(){}
+  : std_pvector(), rwsize(0){}

 template<class T>
-G4RWTPtrVector<T>::G4RWTPtrVector (unsigned int n)
-  : std_pvector(n){}
+G4RWTPtrVector<T>::G4RWTPtrVector (size_t n)
+  : std_pvector(n), rwsize(n){}

 template<class T>
-G4RWTPtrVector<T>::G4RWTPtrVector (unsigned int n, T* const & iPtr)
-  : std_pvector(n, iPtr){}
+G4RWTPtrVector<T>::G4RWTPtrVector (size_t n, T* const & iPtr)
+  : std_pvector(n, iPtr), rwsize(n){}

 template<class T>
 G4RWTPtrVector<T>::G4RWTPtrVector (const G4RWTPtrVector<T>& iPtr)
-  : std_pvector(iPtr){}
+  : std_pvector(iPtr), rwsize(iPtr.rwsize){}

 template<class T>
 G4RWTPtrVector<T>::~G4RWTPtrVector(){}
@@ -37,9 +37,10 @@ G4RWTPtrVector<T>::~G4RWTPtrVector(){}
 template<class T>
 G4RWTPtrVector<T>& G4RWTPtrVector<T>::operator = (T* p)
 {
+  rwsize=0;
  for(iterator i = std_pvector::begin(); i != std_pvector::end(); ++i)
    {
-      *i = p;
+      *i = p; rwsize++;
    }
  return *this;
 }
@@ -47,12 +48,23 @@ G4RWTPtrVector<T>& G4RWTPtrVector<T>::operator = (T* p)
 template<class T>
 T* G4RWTPtrVector<T>::operator () ( size_t n ) const
 {
+  #ifdef G4DEBUG
+    if(n>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector operator()",rwsize,n));
+  #endif
  return std_pvector::operator[](n);
 }

 template<class T>
 T*& G4RWTPtrVector<T>::operator () ( size_t n )
 {
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(n>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector operator()",rwsize,n));
+  // #endif
+  if(rwsize<=n && n<std_pvector::size())
+    rwsize=n+1;
  return std_pvector::operator[](n);
 }

@@ -61,12 +73,16 @@ T*& G4RWTPtrVector<T>::operator () ( size_t n )
 template<class T>
 T* G4RWTPtrVector<T>::operator [] ( size_t n ) const
 {
+  if(n>=rwsize)
+    G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector",rwsize,n));
  return std_pvector::operator[](n);
 }

 template<class T>
 T*& G4RWTPtrVector<T>::operator [] ( size_t n )
 {
+  if(n>=rwsize)
+    G4RWTHROW(G4RWBoundsErr("G4RWTPtrVector",rwsize,n));
  return std_pvector::operator[](n);
 }

@@ -82,8 +98,25 @@ size_t G4RWTPtrVector<T>::length()
  return std_pvector::size();
 }

+template<class T>
+void G4RWTPtrVector<T>::resize ( size_t n )
+{
+  if(n>std_pvector::size())
+    {
+      int e=n-std_pvector::size();
+      for(int i=0;i<e;i++)
+        std_pvector::push_back(0);
+    }
+  else
+    {
+      std_pvector::resize(n);
+    }
+  rwsize=n;
+}
+
 template<class T>
 void G4RWTPtrVector<T>::reshape( size_t n )
 {
  std_pvector::resize(n);
+  rwsize=n;
 }
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvordvec.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tvordvec.icc,v 1.1 1999/11/25 10:14:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tvordvec.icc,v 1.2 2000/02/01 16:55:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -38,9 +38,12 @@ G4RWTValOrderedVector<T>::operator=(const G4RWTValOrderedVector<T>& v)
 template<class T>
 T& G4RWTValOrderedVector<T>::operator()(size_t i)
 {
-  //if(i>=rwsize)
-  //  G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector ()",rwsize,i));
-  if(i<std_vector::size() && rwsize<=i)
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector ()",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_vector::size())
    rwsize=i+1;
  return std_vector::operator[](i); 
 }
@@ -48,8 +51,10 @@ T& G4RWTValOrderedVector<T>::operator()(size_t i)
 template<class T>
 const T& G4RWTValOrderedVector<T>::operator()(size_t i) const
 { 
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const()",rwsize,i));
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const()",rwsize,i));
+  #endif
  return std_vector::operator[](i);
 }

@@ -58,8 +63,6 @@ T& G4RWTValOrderedVector<T>::operator[](size_t i)
 {
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector []",rwsize,i));
-  //if(i<std_vector::size() && rwsize<=i)
-  //  rwsize=i+1;
  return std_vector::operator[](i); 
 }

@@ -76,7 +79,7 @@ T& G4RWTValOrderedVector<T>::at(size_t n)
 {
  if(n>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector at",rwsize,n));
-  return operator()(n);
+  return std_vector::operator[](n);
 }

 template<class T>
@@ -84,7 +87,7 @@ T  G4RWTValOrderedVector<T>::at(size_t n ) const
 {
  if(n>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector const at",rwsize,n));
-  return operator()(n);
+  return std_vector::operator[](n);
 }

 template<class T>
@@ -199,7 +202,7 @@ T G4RWTValOrderedVector<T>::removeAt( size_t i )
 {
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTValOrderedVector removeAt",rwsize,i));
-  T tmp = operator[](i);
+  T tmp = std_vector::operator[](i);
  iterator it=std_vector::begin();
  int j;
  for(j=0;j<rwsize && j<i;j++) it++;
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvvector.h,v 1.7 1999/11/26 17:17:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: tvvector.icc,v 1.1 1999/11/25 10:14:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: tvvector.icc,v 1.2 2000/02/01 16:55:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -17,7 +17,7 @@

 template<class T>
 G4RWTValVector<T>::G4RWTValVector ()
-  : rwsize(0){}
+  : std_vector(), rwsize(0){}

 template<class T>
 G4RWTValVector<T>::G4RWTValVector (size_t n)
@@ -52,9 +52,12 @@ size_t G4RWTValVector<T>::length() const
 template<class T>
 T& G4RWTValVector<T>::operator()(size_t i) 
 {
-  if(i>=rwsize)
-    G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
-  if(i<std_vector::size() && rwsize<i)
+  // temporarly commented; to allow use as left-value rwsize is increased
+  // #ifdef G4DEBUG
+  //   if(i>=rwsize)
+  //     G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
+  // #endif
+  if(rwsize<=i && i<std_vector::size())
    rwsize=i+1;
  return std_vector::operator[](i); 
 }
@@ -62,6 +65,10 @@ T& G4RWTValVector<T>::operator()(size_t i)
 template<class T>
 const T& G4RWTValVector<T>::operator()(size_t i) const
 {
+  #ifdef G4DEBUG
+    if(i>=rwsize)
+      G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator()",rwsize,i));
+  #endif
  return std_vector::operator[](i);
 }

@@ -70,8 +77,6 @@ T& G4RWTValVector<T>::operator[](size_t i)
 {
  if(i>=rwsize)
    G4RWTHROW(G4RWBoundsErr("G4RWTValVector operator[]",rwsize,i));
-  if(i<std_vector::size() && rwsize<i)
-    rwsize=i+1;
  return std_vector::operator[](i); 
 }

@@ -0,0 +1 @@
+#include <fstream.h>
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Allocator.hh,v 1.3 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AllocatorPage.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AllocatorUnit.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DataVector.hh,v 1.4 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastVector.hh,v 1.3 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.hh,v 1.2 1999/11/16 17:40:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.icc,v 1.2 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OrderedTable.hh,v 1.4 1999/11/16 17:40:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsFreeVector.hh,v 1.2 1999/11/16 17:40:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLinearVector.hh,v 1.2 1999/11/16 17:40:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLogVector.hh,v 1.2 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.hh,v 1.3 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Definition
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.icc,v 1.2 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Inline Functions Definitions
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsTable.hh,v 1.3 1999/11/16 17:40:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.hh,v 1.3 1999/11/16 17:40:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.icc,v 1.1 1999/11/16 17:40:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RotationMatrix.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ThreeVector.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Timer.hh,v 1.8 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Timer.hh,v 1.10 2000/01/06 14:27:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -17,6 +17,8 @@
 // Class for timer objects, able to measure elasped user/system process time.
 //
 // Note: Uses <sys/times.h> & <unistd.h> - POSIX.1 defined
+//       If used, this header must be included in the source (.cc) file and it
+//       must be the first header file to be included!
 //
 // Member functions:
 //
@@ -37,7 +39,7 @@
 //
 // Operators:
 //
-// ostream& operator << (ostream& os, const G4Timer& t);
+// G4std::ostream& operator << (G4std::ostream& os, const G4Timer& t);
 //   Print the elapsed real,system and usertimes on os. Prints **s for times
 //   if !IsValid
 //
@@ -125,9 +127,7 @@ inline G4bool G4Timer::IsValid() const
    return fValidTimes;
 }

-#ifdef G4USE_STL
-  #define times ostimes
-#endif
+#define times ostimes

 #endif

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Types.hh,v 1.3 1999/11/16 17:40:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Types.hh,v 1.4 1999/12/15 18:05:19 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // GEANT4 native types
@@ -16,6 +16,12 @@
 #ifndef G4TYPES_HH
 #define G4TYPES_HH

+
+#ifdef WIN32
+// Disable warning C4786: identifier was truncated to '255' characters in the debug information
+  #pragma warning ( disable : 4786 )
+#endif
+
 #include <CLHEP/config/CLHEP.h>

 // Define G4std namespace for standard std.
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTable.hh,v 1.7 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UnitsTable.hh,v 1.9 2000/01/19 11:16:46 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -----------------------------------------------------------------
@@ -16,6 +16,7 @@
 //
 // 17-05-98: first version, M.Maire
 // 13-10-98: Units and symbols printed in fixed length
+// 18-01-00: BestUnit for three vector

 // Class description:
 //
@@ -35,6 +36,7 @@

 #include "globals.hh"
 #include "g4rw/tpordvec.h"
+#include "G4ThreeVector.hh"

 class G4UnitsCategory;
 typedef G4RWTPtrOrderedVector<G4UnitsCategory> G4UnitsTable;
@@ -132,8 +134,9 @@ class G4BestUnit
 {
 public:  // with description

-    G4BestUnit(G4double internalValue, G4String category);
-    // This constructor converts a physical quantity from its internalValue
+    G4BestUnit(G4double      internalValue, G4String category);
+    G4BestUnit(const G4ThreeVector& internalValue, G4String category);    
+    // These constructors convert a physical quantity from its internalValue
    // into the most appropriate unit of the same category.
    // In practice it builds an object VU = (newValue, newUnit)
    
@@ -141,9 +144,9 @@ public:  // with description
   
 public:  // without description

-    G4double  GetValue()           {return Value;};
-    G4String  GetCategory()        {return Category;};
-    size_t    GetIndexOfCategory() {return IndexOfCategory;};
+    G4double*  GetValue()           {return Value;};
+    G4String   GetCategory()        {return Category;};
+    size_t     GetIndexOfCategory() {return IndexOfCategory;};
    
 public:  // with description 
   
@@ -153,9 +156,10 @@ public:  // with description

 private:

-    G4double   Value;        // value in the internal system of units
-    G4String   Category;     // dimensional family: Length,Volume,Energy ...
-    size_t IndexOfCategory;  // position of Category in UnitsTable
+    G4double   Value[3];        // value in the internal system of units
+    G4int      nbOfVals;        // G4double=1; G4ThreeVector=3
+    G4String   Category;        // dimensional family: Length,Volume,Energy ...
+    size_t IndexOfCategory;     // position of Category in UnitsTable
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UnitsTest.hh,v 1.4 1999/11/19 09:19:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserLimits.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 //
 // class G4UserLimits
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserLimits.icc,v 1.3 1999/11/22 15:12:45 maire Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4coutDestination.hh,v 1.2 1999/11/16 17:40:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ios.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4ios.hh,v 1.5 1999/12/15 18:05:18 gracia Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -18,6 +18,8 @@
 #ifndef included_G4ios
 #define included_G4ios

+#include "G4Types.hh"
+
 #if defined(OO_DDL_TRANSLATION)
 /*
 * stdlib needs to be included before iostream.h
@@ -29,7 +31,6 @@
 #endif

 #include "g4std/iostream"
-#include "G4Types.hh"

 extern G4std::ostream G4cout;
 extern G4std::ostream G4cerr;
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4strstreambuf.hh,v 1.4 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4strstreambuf.hh,v 1.6 1999/12/16 08:15:57 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PhysicalConstants.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: SystemOfUnits.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: algorithm,v 1.3 1999/11/16 17:42:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- algorithm ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: fstream,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- fstream ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: functional,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- functional ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iomanip,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- iomanip ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iostream,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- iostream ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: map,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- map ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: set,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- set ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: streambuf,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- streambuf ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: strstream,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- strstream ----------------
 //
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: vector,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //      ---------------- vector ----------------
 //
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: globals.hh,v 1.11 1999/11/23 15:00:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: globals.hh,v 1.15 2000/01/19 11:12:44 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //
 // Global Constants and typedefs
@@ -19,10 +19,10 @@
 // 29.11.96 G.Cosmo - Added typedef of HepBoolean to G4bool
 // 22.10.97 M.Maire - Moved PhysicalConstants at the end of the file
 // 04.12.97 G.Cosmo,E.Tcherniaev - Migrated to CLHEP
-// 05.06.98 M.Maire - temporary (for alpha07) restore G4 system of units 
-// 26.08.98 J.Allison,E.Tcherniaev - introduced min/max/sqr/abs functions
-// 22.09.98 G.Cosmo - removed min/max/sqr/abs functions and replaced with
+// 26.08.98 J.Allison,E.Tcherniaev - Introduced min/max/sqr/abs functions
+// 22.09.98 G.Cosmo - Removed min/max/sqr/abs functions and replaced with
 //                    inclusion of CLHEP/config/TemplateFunctions.h for CLHEP-1.3
+// 15.12.99 G.Gracia - Included min, max definitions for NT with ISO standard

 #ifndef GLOBALS_HH
 #define GLOBALS_HH
@@ -32,22 +32,30 @@
 // Undefine possible existing min/max/sqr/abs macros first
 // (temporary solution)
 #ifdef min
-#undef min
+  #undef min
 #endif
 #ifdef max
-#undef max
+  #undef max
 #endif
 #ifdef sqr
-#undef sqr
+  #undef sqr
 #endif
 #ifdef abs
-#undef abs
+  #undef abs
 #endif

-#ifdef G4USE_STL
-  #include "g4std/algorithm"
+#include "g4std/algorithm"
+#ifndef CLHEP_MAX_MIN_DEFINED
  #define CLHEP_MAX_MIN_DEFINED
 #endif
+
+#if defined(WIN32) && defined(G4USE_STD_NAMESPACE)
+// For NT with Native STL (used in ISO standard mode)
+// templated functions min and max should be _MIN _MAX
+  #define min _MIN
+  #define max _MAX
+#endif
+
 // min, max, abs and sqr are in TemplateFunctions.h.
 // Includes also CLHEP.h with typedef for numeric types and
 // implicit inclusions of <stdlib.h>, <limits.h>, <math.h>.
@@ -73,10 +81,8 @@

 // Global error function
 void G4Exception(const char* s=0);
-#ifdef G4USE_STL
-  void G4Exception(G4std::string s);
-  void G4Exception(G4String s);
-#endif
+void G4Exception(G4std::string s);
+void G4Exception(G4String s);

 #endif /* GLOBALS_HH */

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: templates.hh,v 1.3 1999/11/16 17:40:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: templates.hh,v 1.5 2000/01/03 11:39:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // -*- C++ -*-
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Exception.cc,v 1.8 1999/11/29 10:17:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LPhysicsFreeVector.cc,v 1.2 1999/11/16 17:46:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsFreeVector.cc,v 1.2 1999/11/16 17:46:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLinearVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsLogVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsOrderedFreeVector.cc,v 1.2 1999/11/16 17:46:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Implementation
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicsVector.cc,v 1.4 1999/11/23 15:00:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // 
 // --------------------------------------------------------------
--- a/Show More
+++ b/Show More