lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/global/HEPGeometry/include/G4LorentzRotation.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LorentzRotation.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4LorentzRotation_hh
#define G4LorentzRotation_hh
source/global/HEPGeometry/include/G4LorentzVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LorentzVector.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4LorentzVector_hh
#define G4LorentzVector_hh
source/global/HEPGeometry/include/G4Normal3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Normal3D.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4NORMAL3D_HH
#define G4NORMAL3D_HH
source/global/HEPGeometry/include/G4Plane3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Plane3D.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4PLANE3D_HH
#define G4PLANE3D_HH
source/global/HEPGeometry/include/G4Point3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Point3D.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4POINT3D_HH
#define G4POINT3D_HH
source/global/HEPGeometry/include/G4Transform3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Transform3D.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4TRANSFORM3D_HH
#define G4TRANSFORM3D_HH
source/global/HEPGeometry/include/G4Vector3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Vector3D.hh,v 1.3 2001/07/11 10:00:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4VECTOR3D_HH
#define G4VECTOR3D_HH
source/global/HEPGeometry/include/geomdefs.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: geomdefs.hh,v 1.5 2002/05/15 09:32:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ----------------------------------------------------------------------
source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ChebyshevApproximation.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4DataInterpolation.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4DataInterpolation.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussChebyshevQ.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussHermiteQ.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussHermiteQ.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussJacobiQ.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussJacobiQ.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussLaguerreQ.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussLegendreQ.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussLegendreQ.hh,v 1.4 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4Integrator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Integrator.hh,v 1.5 2001/07/11 10:00:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4Integrator.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Integrator.icc,v 1.9 2002/12/05 15:39:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Implementation of G4Integrator methods.
//
source/global/HEPNumerics/include/G4PolynomialSolver.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PolynomialSolver.hh,v 1.3 2001/07/11 10:00:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// class G4PolynomialSolver
//
source/global/HEPNumerics/include/G4PolynomialSolver.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PolynomialSolver.icc,v 1.6 2001/07/11 10:00:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// class G4PolynomialSolver
//
source/global/HEPNumerics/include/G4SimpleIntegration.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SimpleIntegration.hh,v 1.3 2001/07/11 10:00:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VGaussianQuadrature.hh,v 1.4 2001/07/11 10:00:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class description:
//
source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ChebyshevApproximation.cc,v 1.3 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4ChebyshevApproximation.hh"
source/global/HEPNumerics/src/G4DataInterpolation.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4DataInterpolation.cc,v 1.4 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4DataInterpolation.hh"
source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussChebyshevQ.cc,v 1.3 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4GaussChebyshevQ.hh"
source/global/HEPNumerics/src/G4GaussHermiteQ.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussHermiteQ.cc,v 1.4 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4GaussHermiteQ.hh"
source/global/HEPNumerics/src/G4GaussJacobiQ.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussJacobiQ.cc,v 1.4 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4GaussJacobiQ.hh"
source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussLaguerreQ.cc,v 1.4 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4GaussLaguerreQ.hh"
source/global/HEPNumerics/src/G4GaussLegendreQ.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GaussLegendreQ.cc,v 1.3 2001/07/11 10:00:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4GaussLegendreQ.hh"
source/global/HEPNumerics/src/G4SimpleIntegration.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SimpleIntegration.cc,v 1.3 2001/07/11 10:00:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Implementation file for simple integration methods
//
source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VGaussianQuadrature.cc,v 1.3 2001/07/11 10:00:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Implementation file for G4VGaussianQuadrature virtual base class
//
source/global/HEPRandom/include/G4Poisson.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Poisson.hh,v 1.6 2001/07/11 10:00:43 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/HEPRandom/include/Randomize.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: Randomize.hh,v 1.5 2001/07/11 10:00:43 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef randomize_h
#define randomize_h 1
source/global/History
+15 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.113 2003/04/07 13:26:00 gcosmo Exp $
$Id: History,v 1.115 2003/06/06 16:17:47 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,20 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
June 6, 2003 G.Cosmo (global-V05-01-01)
- Made g4std wrappers obsolete:
o modified wrappers to include standard std headers
o replaced all occurences of G4std:: with std::
o replaced all occurences of
#include "g4std/XXX"
with
#include <XXX>
o removed usage of G4USE_STD_NAMESPACE macro.
May 21, 2003 G.Cosmo (global-V05-01-00)
- G4PhysicsVector.hh: moved copy costructor and assignment operator to
public. Fixes problem report #486.
April 7, 2003 G.Cosmo (global-V05-00-05)
- G4Allocator.hh: revert back latest change. Performance loss is not really
relevant in a real simulation but not negligible in a specific unit test.
source/global/management/include/G4Allocator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Allocator.hh,v 1.12 2003/03/25 14:56:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4AllocatorPage.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AllocatorPage.hh,v 1.4 2002/05/21 10:31:25 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4AllocatorUnit.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AllocatorUnit.hh,v 1.4 2002/05/21 10:31:25 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4ApplicationState.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ApplicationState.hh,v 1.3 2002/12/04 17:39:50 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4APPLICATIONSTATE_H
source/global/management/include/G4DataVector.hh
+9 -9
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DataVector.hh,v 1.11 2002/04/19 07:10:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4DataVector.hh,v 1.12 2003/06/06 16:17:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -40,12 +40,12 @@
#define G4DataVector_h 1
#include "globals.hh"
#include "g4std/vector"
#include <vector>
#include "G4ios.hh"
#include "g4std/iostream"
#include "g4std/fstream"
#include <iostream>
#include <fstream>
class G4DataVector : public G4std::vector<G4double>
class G4DataVector : public std::vector<G4double>
{
public: // with description
@@ -80,11 +80,11 @@ class G4DataVector : public G4std::vector<G4double>
enum {T_G4DataVector = 100};
G4bool Store(G4std::ofstream& fOut, G4bool ascii=false);
G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii=false);
G4bool Store(std::ofstream& fOut, G4bool ascii=false);
G4bool Retrieve(std::ifstream& fIn, G4bool ascii=false);
// To store/retrieve persistent data to/from file streams.
friend G4std::ostream& operator<<(G4std::ostream&, const G4DataVector&);
friend std::ostream& operator<<(std::ostream&, const G4DataVector&);
};
inline
source/global/management/include/G4ExceptionSeverity.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ExceptionSeverity.hh,v 1.2 2002/08/26 14:56:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Class Description:
//
source/global/management/include/G4FastVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FastVector.hh,v 1.4 2001/07/11 10:00:49 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4LPhysicsFreeVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LPhysicsFreeVector.hh,v 1.7 2001/07/11 10:00:49 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------------
source/global/management/include/G4LPhysicsFreeVector.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LPhysicsFreeVector.icc,v 1.5 2001/07/11 10:00:49 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------------
source/global/management/include/G4OrderedTable.hh
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OrderedTable.hh,v 1.10 2002/04/19 07:10:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OrderedTable.hh,v 1.11 2003/06/06 16:17:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -31,7 +31,7 @@
// Sep. 1996 : M.Maire
// Jan. 2001 : H.Kurashige
// - G4ValVector is replaced with G4DataVector
// - Migrated to G4std::vector<G4DataVector*>.
// - Migrated to std::vector<G4DataVector*>.
// Sep. 2001 : H.Kurashige
// - Add
// G4bool Store(const G4String&, G4bool)
@@ -49,10 +49,10 @@
#define G4OrderedTable_h 1
#include "globals.hh"
#include "g4std/vector"
#include <vector>
class G4DataVector;
class G4OrderedTable : public G4std::vector<G4DataVector*>
class G4OrderedTable : public std::vector<G4DataVector*>
{
public: // with description
@@ -76,7 +76,7 @@ class G4OrderedTable : public G4std::vector<G4DataVector*>
G4bool Retrieve(const G4String& filename, G4bool ascii=false);
// Retrieves OrderedTable from a file (returns false in case of failure).
friend G4std::ostream& operator<<(G4std::ostream& out, G4OrderedTable& table);
friend std::ostream& operator<<(std::ostream& out, G4OrderedTable& table);
};
source/global/management/include/G4PhysicsFreeVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsFreeVector.hh,v 1.8 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
source/global/management/include/G4PhysicsLinearVector.hh
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLinearVector.hh,v 1.7 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLinearVector.hh,v 1.8 2003/06/06 16:17:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
@@ -69,7 +69,7 @@ class G4PhysicsLinearVector : public G4PhysicsVector
~G4PhysicsLinearVector();
// Destructor
G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
protected:
source/global/management/include/G4PhysicsLnVector.hh
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLnVector.hh,v 1.8 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLnVector.hh,v 1.9 2003/06/06 16:17:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
@@ -66,7 +66,7 @@ class G4PhysicsLnVector : public G4PhysicsVector
~G4PhysicsLnVector();
// Destructor.
G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
// To retrieve persistent data from file stream.
protected:
source/global/management/include/G4PhysicsLogVector.hh
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLogVector.hh,v 1.7 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLogVector.hh,v 1.8 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
@@ -71,7 +71,7 @@ class G4PhysicsLogVector : public G4PhysicsVector
~G4PhysicsLogVector();
// Destructor
G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
// To retrieve persistent data from file stream.
protected:
source/global/management/include/G4PhysicsOrderedFreeVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsOrderedFreeVector.hh,v 1.8 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
////////////////////////////////////////////////////////////////////////
// PhysicsOrderedFreeVector Class Definition
source/global/management/include/G4PhysicsOrderedFreeVector.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsOrderedFreeVector.icc,v 1.6 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
////////////////////////////////////////////////////////////////////////
// PhysicsOrderedFreeVector Class Inline Functions Definitions
source/global/management/include/G4PhysicsTable.hh
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsTable.hh,v 1.11 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsTable.hh,v 1.12 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -52,16 +52,16 @@
#ifndef G4PhysicsTable_h
#define G4PhysicsTable_h 1
#include "g4std/vector"
#include <vector>
#include "globals.hh"
#include "G4ios.hh"
class G4PhysicsVector;
class G4PhysicsTable : public G4std::vector<G4PhysicsVector*>
class G4PhysicsTable : public std::vector<G4PhysicsVector*>
{
typedef G4std::vector<G4PhysicsVector*> G4PhysCollection;
typedef std::vector<G4PhysicsVector*> G4PhysCollection;
public: // with description
@@ -102,7 +102,7 @@ class G4PhysicsTable : public G4std::vector<G4PhysicsVector*>
G4bool RetrievePhysicsTable(const G4String& filename, G4bool ascii=false);
// Retrieves Physics from a file (returns false in case of failure).
friend G4std::ostream& operator<<(G4std::ostream& out, G4PhysicsTable& table);
friend std::ostream& operator<<(std::ostream& out, G4PhysicsTable& table);
protected:
source/global/management/include/G4PhysicsTable.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsTable.icc,v 1.4 2001/07/11 10:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4PhysicsVector.hh
+17 -19
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsVector.hh,v 1.10 2001/07/11 10:00:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsVector.hh,v 1.12 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//---------------------------------------------------------------
@@ -53,11 +53,11 @@
#ifndef G4PhysicsVector_h
#define G4PhysicsVector_h 1
#include "g4std/vector"
#include <vector>
#include "globals.hh"
#include "G4ios.hh"
#include "g4std/iostream"
#include "g4std/fstream"
#include <iostream>
#include <fstream>
#include "G4PhysicsVectorType.hh"
@@ -66,10 +66,14 @@ class G4PhysicsVector
public:
G4PhysicsVector();
// constructor
// This class is an abstract class with pure virtual method of
// virtual size_t FindBinLocation(G4double theEnergy) const
// So, default constructor is not supposed to be invoked explicitly
// constructor
// This class is an abstract class with pure virtual method of
// virtual size_t FindBinLocation(G4double theEnergy) const
// So, default constructor is not supposed to be invoked explicitly
G4PhysicsVector(const G4PhysicsVector&);
G4PhysicsVector& operator=(const G4PhysicsVector&);
// Copy constructor and assignment operator.
public: // with description
@@ -122,15 +126,15 @@ class G4PhysicsVector
inline G4PhysicsVectorType GetType() const;
// Get physics vector type
virtual G4bool Store(G4std::ofstream& fOut, G4bool ascii=false);
virtual G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii=false);
virtual G4bool Store(std::ofstream& fOut, G4bool ascii=false);
virtual G4bool Retrieve(std::ifstream& fIn, G4bool ascii=false);
// To store/retrieve persistent data to/from file streams.
friend G4std::ostream& operator<<(G4std::ostream&, const G4PhysicsVector&);
friend std::ostream& operator<<(std::ostream&, const G4PhysicsVector&);
protected:
typedef G4std::vector<G4double> G4PVDataVector;
typedef std::vector<G4double> G4PVDataVector;
G4PhysicsVectorType type; // The type of PhysicsVector (enumerator)
@@ -151,12 +155,6 @@ class G4PhysicsVector
virtual size_t FindBinLocation(G4double theEnergy) const=0;
// Find the bin# in which theEnergy belongs - pure virtual function
protected:
G4PhysicsVector(const G4PhysicsVector&);
G4PhysicsVector& operator=(const G4PhysicsVector&);
// Protected copy constructor and assignment operator.
private:
G4String comment;
source/global/management/include/G4PhysicsVector.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsVector.icc,v 1.7 2001/07/11 10:00:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//---------------------------------------------------------------
source/global/management/include/G4PhysicsVectorType.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsVectorType.hh,v 1.3 2001/07/11 10:00:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------
//
source/global/management/include/G4ReferenceCountedHandle.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ReferenceCountedHandle.hh,v 1.14 2001/11/07 09:35:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Class G4ReferenceCountedHandle
source/global/management/include/G4RotationMatrix.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4RotationMatrix.hh,v 1.3 2001/07/11 10:00:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4SIunits.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SIunits.hh,v 1.3 2003/02/05 15:25:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
//
source/global/management/include/G4StateManager.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StateManager.hh,v 1.7 2002/08/19 18:20:11 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4StateManager.hh,v 1.8 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -49,7 +49,7 @@
#ifndef G4StateManager_h
#define G4StateManager_h 1
#include "g4std/vector"
#include <vector>
#include "globals.hh"
#include "G4ApplicationState.hh"
#include "G4VStateDependent.hh"
@@ -124,7 +124,7 @@ private:
static G4StateManager* theStateManager;
G4ApplicationState theCurrentState;
G4ApplicationState thePreviousState;
G4std::vector<G4VStateDependent*> theDependentsList;
std::vector<G4VStateDependent*> theDependentsList;
G4VStateDependent* theBottomDependent;
G4int suppressAbortion;
const char* msgptr;
source/global/management/include/G4String.hh
+11 -15
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4String.hh,v 1.3 2002/03/25 15:32:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4String.hh,v 1.4 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//---------------------------------------------------------------
@@ -44,17 +44,13 @@
#include <stdio.h>
#include <string>
#include "G4Types.hh"
#include "g4std/iostream"
#include <iostream>
#ifdef WIN32
#define strcasecmp _stricmp
#endif
#ifdef G4USE_STD_NAMESPACE
typedef G4std::string::size_type str_size;
#else
typedef size_t str_size;
#endif
typedef std::string::size_type str_size;
class G4String;
@@ -101,10 +97,10 @@ private:
};
class G4String : public G4std::string
class G4String : public std::string
{
typedef G4std::string std_string;
typedef std::string std_string;
public:
@@ -116,11 +112,11 @@ public:
inline G4String ( const char * );
inline G4String ( const G4String& );
inline G4String ( const G4SubString& );
inline G4String ( const G4std::string & );
inline G4String ( const std::string & );
virtual ~G4String () {}
inline G4String& operator=(const G4String&);
inline G4String& operator=(const G4std::string &);
inline G4String& operator=(const std::string &);
inline G4String& operator=(const char*);
inline char operator () (str_size) const;
@@ -128,7 +124,7 @@ public:
inline G4String& operator+=(const G4SubString&);
inline G4String& operator+=(const char*);
inline G4String& operator+=(const G4std::string &);
inline G4String& operator+=(const std::string &);
inline G4String& operator+=(const char&);
inline G4bool operator==(const G4String&) const;
inline G4bool operator==(const char*) const;
@@ -145,7 +141,7 @@ public:
inline G4String& prepend (const char*);
inline G4String& append (const G4String&);
inline G4std::istream& readLine (G4std::istream&, G4bool skipWhite=true);
inline std::istream& readLine (std::istream&, G4bool skipWhite=true);
inline G4String& replace (unsigned int, unsigned int,
const char*, unsigned int );
@@ -157,7 +153,7 @@ public:
inline G4int first(char) const;
inline G4int last(char) const;
inline G4bool contains(G4std::string) const;
inline G4bool contains(std::string) const;
inline G4bool contains(char) const;
// stripType = 0 beginning
source/global/management/include/G4String.icc
+12 -16
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4String.icc,v 1.4 2003/03/25 14:56:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4String.icc,v 1.5 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//---------------------------------------------------------------
@@ -99,17 +99,17 @@ G4bool G4SubString::operator==(G4String s) const
G4bool G4SubString::operator==(const char* s) const
{
return mystring->substr(mystart,extent) == G4std::string(s) ? true:false;
return mystring->substr(mystart,extent) == std::string(s) ? true:false;
}
G4bool G4SubString::operator!=(G4String s) const
{
return mystring->substr(mystart,extent) != G4std::string(s) ? true:false;
return mystring->substr(mystart,extent) != std::string(s) ? true:false;
}
G4bool G4SubString::operator!=(const char* s) const
{
return mystring->substr(mystart,extent) != G4std::string(s) ? true:false;
return mystring->substr(mystart,extent) != std::string(s) ? true:false;
}
str_size G4SubString::length() const
@@ -150,7 +150,7 @@ G4String::G4String ( const G4String& s )
G4String::G4String ( const G4SubString& s )
: std_string(*(s.mystring),s.mystart,s.extent) {}
G4String::G4String ( const G4std::string &s )
G4String::G4String ( const std::string &s )
: std_string(s) {}
G4String& G4String::operator=(const G4String& s)
@@ -159,7 +159,7 @@ G4String& G4String::operator=(const G4String& s)
return *this;
}
G4String& G4String::operator=(const G4std::string &s)
G4String& G4String::operator=(const std::string &s)
{
std_string::operator=(s);
return *this;
@@ -199,7 +199,7 @@ G4String& G4String::operator+=(const char*s)
return *this;
}
G4String& G4String::operator+=(const G4std::string &s)
G4String& G4String::operator+=(const std::string &s)
{
std_string::operator+=(s);
return *this;
@@ -246,9 +246,6 @@ G4String::operator const char*() const
G4int G4String::strcasecompare(const char* s1, const char* s2) const
{
#ifndef G4USE_STD_NAMESPACE
return strcasecmp(s1,s2);
#else
char* buf1 = new char[strlen(s1)+1];
char* buf2 = new char[strlen(s2)+1];
@@ -261,7 +258,6 @@ G4int G4String::strcasecompare(const char* s1, const char* s2) const
delete [] buf1;
delete [] buf2;
return res;
#endif
}
G4int G4String::compareTo(const char* s, caseCompare mode)
@@ -292,12 +288,12 @@ G4String& G4String::append(const G4String& s)
return *this;
}
G4std::istream&
G4String::readLine (G4std::istream& s, G4bool skipWhite)
std::istream&
G4String::readLine (std::istream& s, G4bool skipWhite)
{
char tmp[1024];
if ( skipWhite ) {
s >> G4std::ws;
s >> std::ws;
s.getline(tmp,1024);
*this=tmp;
}
@@ -344,7 +340,7 @@ G4int G4String::last(char c) const
return rfind(c);
}
G4bool G4String::contains(G4std::string s) const
G4bool G4String::contains(std::string s) const
{
G4int i=std_string::find(s);
if(i != G4int(std_string::npos))
source/global/management/include/G4ThreeVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ThreeVector.hh,v 1.3 2001/07/11 10:00:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4Timer.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Timer.hh,v 1.11 2001/07/11 10:00:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Timer.hh,v 1.12 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ----------------------------------------------------------------------
@@ -55,7 +55,7 @@
//
// Operators:
//
// G4std::ostream& operator << (G4std::ostream& os, const G4Timer& t);
// std::ostream& operator << (std::ostream& os, const G4Timer& t);
// Print the elapsed real,system and usertimes on os. Prints **s for times
// if !IsValid
//
@@ -122,7 +122,7 @@ private:
tms fStartTimes,fEndTimes;
};
G4std::ostream& operator << (G4std::ostream& os, const G4Timer& t);
std::ostream& operator << (std::ostream& os, const G4Timer& t);
// Inline functions:
source/global/management/include/G4Tokenizer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Tokenizer.hh,v 1.1 2001/10/11 14:04:05 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//---------------------------------------------------------------
source/global/management/include/G4Types.hh
+20 -18
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Types.hh,v 1.5 2001/07/11 10:00:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Types.hh,v 1.6 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// GEANT4 native types
@@ -32,34 +32,36 @@
#ifndef G4TYPES_HH
#define G4TYPES_HH
// Disable warning C4786 on WIN32 architectures: identifier was truncated
// to '255' characters in the debug information
//
#ifdef WIN32
// Disable warning C4786: identifier was truncated to '255' characters in the debug information
#pragma warning ( disable : 4786 )
#endif
// Disable deprecated warnings for usage of strstream on Linux
// architectures with gcc >= 3.0 release
//
#if (__GNUC__==3) && (__GNUC_MINOR__>0)
#undef __DEPRECATED
#endif
#include <CLHEP/config/CLHEP.h>
#include <complex>
// Define G4std namespace for standard std.
// Needed to allow both ISO/not-ISO ANSI compliant code installations
// Now obsolete. Will be removed from release 6.0.
//
#ifndef G4USE_STD_NAMESPACE
#define G4std
#else
#define G4std std
#endif
#define G4std std
// Typedefs to decouple from library classes
// Typedefs for numeric types
//
typedef HepDouble G4double;
typedef HepFloat G4float;
typedef HepInt G4int;
#ifdef G4_HAVE_BOOL
typedef bool G4bool;
#else
typedef HepBoolean G4bool;
#endif
typedef double G4double;
typedef float G4float;
typedef int G4int;
typedef bool G4bool;
typedef long G4long;
typedef std::complex<G4double> G4complex;
#endif /* G4TYPES_HH */
source/global/management/include/G4UnitsTable.hh
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4UnitsTable.hh,v 1.12 2002/11/20 11:25:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4UnitsTable.hh,v 1.13 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// -----------------------------------------------------------------
@@ -51,11 +51,11 @@
#define G4UnitsTable_HH
#include "globals.hh"
#include "g4std/vector"
#include <vector>
#include "G4ThreeVector.hh"
class G4UnitsCategory;
typedef G4std::vector<G4UnitsCategory*> G4UnitsTable;
typedef std::vector<G4UnitsCategory*> G4UnitsTable;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -109,7 +109,7 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
typedef G4std::vector<G4UnitDefinition*> G4UnitsContainer;
typedef std::vector<G4UnitDefinition*> G4UnitsContainer;
class G4UnitsCategory
{
@@ -166,7 +166,7 @@ public: // without description
public: // with description
friend
G4std::ostream& operator<<(G4std::ostream&,G4BestUnit VU);
std::ostream& operator<<(std::ostream&,G4BestUnit VU);
// Default format to print the objet VU above.
private:
source/global/management/include/G4UserLimits.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserLimits.hh,v 1.7 2001/07/11 10:00:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// class G4UserLimits
source/global/management/include/G4UserLimits.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserLimits.icc,v 1.6 2001/07/11 10:00:53 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//
source/global/management/include/G4VExceptionHandler.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VExceptionHandler.hh,v 1.1 2002/08/19 18:20:11 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4VStateDependent.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VStateDependent.hh,v 1.3 2001/07/11 10:00:53 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4coutDestination.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4coutDestination.hh,v 1.4 2001/07/11 10:00:53 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ---------------------------------------------------------------
source/global/management/include/G4ios.hh
+7 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ios.hh,v 1.6 2001/07/11 10:00:55 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4ios.hh,v 1.7 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ---------------------------------------------------------------
@@ -46,12 +46,12 @@
#include <stdlib.h>
#endif
#include "g4std/iostream"
#include <iostream>
extern G4std::ostream G4cout;
extern G4std::ostream G4cerr;
extern std::ostream G4cout;
extern std::ostream G4cerr;
#define G4cin G4std::cin
#define G4endl G4std::endl
#define G4cin std::cin
#define G4endl std::endl
#endif
source/global/management/include/G4strstreambuf.hh
+6 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4strstreambuf.hh,v 1.9 2003/03/27 16:41:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4strstreambuf.hh,v 1.10 2003/06/06 16:17:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ---------------------------------------------------------------
@@ -34,7 +34,8 @@
#ifndef G4STRSTREAM_HH
#define G4STRSTREAM_HH
#include "g4std/strstream"
#include "G4Types.hh"
#include <strstream>
#include "globals.hh"
#include "G4coutDestination.hh"
@@ -42,10 +43,10 @@ class G4strstreambuf;
extern G4strstreambuf G4coutbuf;
extern G4strstreambuf G4cerrbuf;
class G4strstreambuf : public G4std::streambuf
class G4strstreambuf : public std::streambuf
{
typedef G4std::streambuf std_streambuf;
typedef std::streambuf std_streambuf;
public:
source/global/management/include/G4strstreambuf.icc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4strstreambuf.icc,v 1.8 2003/03/27 16:41:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4strstreambuf.icc,v 1.9 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ---------------------------------------------------------------
@@ -121,10 +121,10 @@ G4int G4strstreambuf::ReceiveString ()
} else if(this == & G4cerrbuf && destination != 0) {
result = destination->ReceiveG4cerr(stringToSend);
} else if(this == & G4coutbuf && destination == 0) {
G4std::cout << stringToSend << G4std::flush;
std::cout << stringToSend << std::flush;
result =0;
} else if(this == & G4cerrbuf && destination == 0) {
G4std::cerr << stringToSend << G4std::flush;
std::cerr << stringToSend << std::flush;
result =0;
}
return result;
source/global/management/include/g4std/algorithm
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: algorithm,v 1.3 1999/11/16 17:42:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: algorithm,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- algorithm ----------------
//
#ifndef G4_ALGORITHM_H
#define G4_ALGORITHM_H
#ifdef G4USE_OLDSTL
#include <algo.h>
#else
#include <algorithm>
#endif /* G4USE_OLDSTL */
#include <algorithm>
#endif /* G4_ALGORITHM_H */
source/global/management/include/g4std/complex
+3 -14
View File
@@ -6,25 +6,14 @@
// and all its terms.
//
//
// $Id: complex,v 1.3 2000/06/15 17:32:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: complex,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- complex ----------------
//
#ifndef G4_COMPLEX_H
#define G4_COMPLEX_H
#ifndef G4USE_STD_NAMESPACE
#if defined(__hpux) || defined(__linux)
#include <complex>
typedef complex<double> G4complex;
#else
#include <complex.h>
typedef complex G4complex;
#endif
#else
#include <complex>
typedef std::complex<double> G4complex;
#endif
#include <complex>
#endif /* G4_COMPLEX_H */
source/global/management/include/g4std/deque
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: deque,v 1.2 2001/10/22 14:33:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: deque,v 1.3 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- deque ----------------
//
#ifndef G4_DEQUE_H
#define G4_DEQUE_H
#ifdef G4USE_OLDSTL
#include <deque.h>
#else
#include <deque>
#endif /* G4USE_OLDSTL */
#include <deque>
#endif /* G4_DEQUE_H */
source/global/management/include/g4std/fstream
+3 -7
View File
@@ -5,18 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: fstream,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: fstream,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- fstream ----------------
//
#ifndef G4_FSTREAM_H
#define G4_FSTREAM_H
#ifndef G4USE_STD_NAMESPACE
#include <fstream.h>
#else
#include <fstream>
#endif
#include <fstream>
#endif /* G4_FSTREAM_H */
source/global/management/include/g4std/functional
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: functional,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: functional,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- functional ----------------
//
#ifndef G4_FUNCTIONAL_H
#define G4_FUNCTIONAL_H
#ifdef G4USE_OLDSTL
#include <function.h>
#else
#include <functional>
#endif /* G4USE_OLDSTL */
#include <functional>
#endif /* G4_FUNCTIONAL_H */
source/global/management/include/g4std/iomanip
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: iomanip,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: iomanip,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- iomanip ----------------
//
#ifndef G4_IOMANIP_H
#define G4_IOMANIP_H
#ifndef G4USE_STD_NAMESPACE
#include <iomanip.h>
#else
#include <iomanip>
#endif
#include <iomanip>
#endif /* G4_IOMANIP_H */
source/global/management/include/g4std/iostream
+3 -7
View File
@@ -5,18 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: iostream,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: iostream,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- iostream ----------------
//
#ifndef G4_IOSTREAM_H
#define G4_IOSTREAM_H
#ifndef G4USE_STD_NAMESPACE
#include <iostream.h>
#else
#include <iostream>
#endif
#include <iostream>
#endif /* G4_IOSTREAM_H */
source/global/management/include/g4std/list
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: list,v 1.1 2000/08/22 07:54:26 hpw Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: list,v 1.2 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- list ----------------
//
#ifndef G4_LIST_H
#define G4_LIST_H
#ifdef G4USE_OLDSTL
#include <list.h>
#else
#include <list>
#endif
#include <list>
#endif
source/global/management/include/g4std/map
+3 -7
View File
@@ -5,18 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: map,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: map,v 1.4 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- map ----------------
//
#ifndef G4_MAP_H
#define G4_MAP_H
#ifdef G4USE_OLDSTL
#include <map.h>
#else
#include <map>
#endif /* G4USE_OLDSTL */
#include <map>
#endif /* G4_MAP_H */
source/global/management/include/g4std/queue
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: queue,v 1.1 2000/08/02 09:49:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: queue,v 1.2 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- queue ----------------
//
#ifndef G4_QUEUE_H
#define G4_QUEUE_H
#ifdef G4USE_OLDSTL
#include <queue.h>
#else
#include <queue>
#endif /* G4USE_OLDSTL */
#include <queue>
#endif /* G4_QUEUE_H */
source/global/management/include/g4std/set
+3 -7
View File
@@ -5,19 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: set,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: set,v 1.4 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- set ----------------
//
#ifndef G4_SET_H
#define G4_SET_H
#ifdef G4USE_OLDSTL
#include <set.h>
#else
#include <set>
#endif /* G4USE_OLDSTL */
#include <set>
#endif /* G4_SET_H */
source/global/management/include/g4std/streambuf
+3 -11
View File
@@ -5,22 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: streambuf,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: streambuf,v 1.4 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- streambuf ----------------
//
#ifndef G4_STREAMBUF_H
#define G4_STREAMBUF_H
#ifndef G4USE_STD_NAMESPACE
#ifdef WIN32
#include <strstrea.h>
#else
#include <g4std/strstream>
#endif /* WIN32 */
#else
#include <streambuf>
#endif /* G4USE_STD_NAMESPACE */
#include <streambuf>
#endif /* G4_STREAMBUF_H */
source/global/management/include/g4std/strstream
+3 -14
View File
@@ -5,25 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: strstream,v 1.4 2002/05/24 15:01:05 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: strstream,v 1.5 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- strstream ----------------
//
#ifndef G4_STRSTREAM_H
#define G4_STRSTREAM_H
#ifndef G4USE_STD_NAMESPACE
#ifdef WIN32
#include <strstrea.h>
#else
#include <strstream.h>
#endif /* WIN32 */
#else
#if (__GNUC__==3) && (__GNUC_MINOR__>0)
#undef __DEPRECATED
#endif
#include <strstream>
#endif /* G4USE_STD_NAMESPACE */
#include <strstream>
#endif /* G4_STRSTREAM_H */
source/global/management/include/g4std/vector
+3 -8
View File
@@ -5,20 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: vector,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: vector,v 1.4 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ---------------- vector ----------------
//
#ifndef G4_VECTOR_H
#define G4_VECTOR_H
#ifdef G4USE_OLDSTL
#include <vector.h>
#else
#include <algorithm>
#include <vector>
#endif /* G4USE_OLDSTL */
#include <vector>
#endif /* G4_VECTOR_H */
source/global/management/include/globals.hh
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: globals.hh,v 1.22 2003/02/05 15:26:07 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: globals.hh,v 1.23 2003/06/06 16:17:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Global Constants and typedefs
@@ -61,12 +61,12 @@
#undef abs
#endif
#include "g4std/algorithm"
#include <algorithm>
#ifndef CLHEP_MAX_MIN_DEFINED
#define CLHEP_MAX_MIN_DEFINED
#endif
#if defined(WIN32) && defined(G4USE_STD_NAMESPACE) && !defined(XPNET)
#if defined(WIN32) && !defined(XPNET)
// For NT with Native STL (used in ISO standard mode)
// templated functions min and max should be _MIN _MAX
#define min _MIN
@@ -101,7 +101,7 @@
#include "G4ExceptionSeverity.hh"
void G4Exception(const char* issure,const char* errorCode,G4ExceptionSeverity severity,const char* comments);
void G4Exception(const char* s=0);
void G4Exception(G4std::string s);
void G4Exception(std::string s);
void G4Exception(G4String s);
#endif /* GLOBALS_HH */
source/global/management/include/templates.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: templates.hh,v 1.6 2001/07/11 10:00:55 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// -*- C++ -*-
source/global/management/src/G4DataVector.cc
+10 -10
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DataVector.cc,v 1.5 2002/05/30 11:56:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4DataVector.cc,v 1.6 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------
@@ -35,20 +35,20 @@
// --------------------------------------------------------------
#include "G4DataVector.hh"
#include "g4std/iomanip"
#include <iomanip>
G4DataVector::G4DataVector()
: G4std::vector<G4double>()
: std::vector<G4double>()
{
}
G4DataVector::G4DataVector(size_t capacity)
: G4std::vector<G4double>(capacity, 0.0)
: std::vector<G4double>(capacity, 0.0)
{
}
G4DataVector::G4DataVector(size_t capacity, G4double value)
: G4std::vector<G4double>(capacity, value)
: std::vector<G4double>(capacity, value)
{
}
@@ -56,7 +56,7 @@ G4DataVector::~G4DataVector()
{
}
G4bool G4DataVector::Store(G4std::ofstream& fOut, G4bool ascii)
G4bool G4DataVector::Store(std::ofstream& fOut, G4bool ascii)
{
// Ascii mode
if (ascii) {
@@ -79,7 +79,7 @@ G4bool G4DataVector::Store(G4std::ofstream& fOut, G4bool ascii)
return true;
}
G4bool G4DataVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
G4bool G4DataVector::Retrieve(std::ifstream& fIn, G4bool ascii)
{
clear();
size_t sizeV;
@@ -118,12 +118,12 @@ G4bool G4DataVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
return true;
}
G4std::ostream& operator<<(G4std::ostream& out, const G4DataVector& pv)
std::ostream& operator<<(std::ostream& out, const G4DataVector& pv)
{
size_t i;
out << pv.size() << G4endl;
for(i = 0; i < pv.size(); i++) {
out << G4std::setprecision(12) << pv[i] << G4endl;
out << std::setprecision(12) << pv[i] << G4endl;
}
return out;
source/global/management/src/G4Exception.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Exception.cc,v 1.15 2002/12/05 02:32:21 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Exception.cc,v 1.16 2003/06/06 16:17:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ----------------------------------------------------------------------
@@ -74,7 +74,7 @@ void G4Exception(const char* originOfException,
}
}
void G4Exception(G4std::string s)
void G4Exception(std::string s)
{
G4Exception(s.c_str());
}
source/global/management/src/G4LPhysicsFreeVector.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4LPhysicsFreeVector.cc,v 1.8 2001/07/11 10:00:56 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------------
source/global/management/src/G4OrderedTable.cc
+16 -20
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OrderedTable.cc,v 1.2 2002/04/19 07:10:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OrderedTable.cc,v 1.3 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -34,18 +34,18 @@
#include "G4DataVector.hh"
#include "G4OrderedTable.hh"
#include "g4std/iostream"
#include "g4std/fstream"
#include "g4std/iomanip"
#include <iostream>
#include <fstream>
#include <iomanip>
G4OrderedTable::G4OrderedTable()
: G4std::vector<G4DataVector*>()
: std::vector<G4DataVector*>()
{
}
G4OrderedTable::G4OrderedTable(size_t capacity)
: G4std::vector<G4DataVector*>(capacity, (G4DataVector*)(0) )
: std::vector<G4DataVector*>(capacity, (G4DataVector*)(0) )
{
}
@@ -56,15 +56,13 @@ G4OrderedTable::~G4OrderedTable()
G4bool G4OrderedTable::Store(const G4String& fileName,
G4bool ascii)
{
G4std::ofstream fOut;
std::ofstream fOut;
// open output file //
#ifdef G4USE_STD_NAMESPACE
if (!ascii)
fOut.open(fileName, G4std::ios::out|G4std::ios::binary);
fOut.open(fileName, std::ios::out|std::ios::binary);
else
#endif
fOut.open(fileName, G4std::ios::out);
fOut.open(fileName, std::ios::out);
// check if the file has been opened successfully
if (!fOut) {
@@ -104,14 +102,12 @@ G4bool G4OrderedTable::Store(const G4String& fileName,
G4bool G4OrderedTable::Retrieve(const G4String& fileName,
G4bool ascii)
{
G4std::ifstream fIn;
std::ifstream fIn;
// open input file //
#ifdef G4USE_STD_NAMESPACE
if (ascii)
fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
fIn.open(fileName,std::ios::in|std::ios::binary);
else
#endif
fIn.open(fileName,G4std::ios::in);
fIn.open(fileName,std::ios::in);
// check if the file has been opened successfully
if (!fIn) {
@@ -172,14 +168,14 @@ G4bool G4OrderedTable::Retrieve(const G4String& fileName,
return true;
}
G4std::ostream& operator<<(G4std::ostream& out,
G4OrderedTable& right)
std::ostream& operator<<(std::ostream& out,
G4OrderedTable& right)
{
// Printout Data Vector
G4OrderedTableIterator itr;
size_t i=0;
for (itr=right.begin(); itr!=right.end(); ++itr) {
out << G4std::setw(8) << i << "-th Vector ";
out << std::setw(8) << i << "-th Vector ";
out << ": Type " << G4DataVector::T_G4DataVector << G4endl;
out << *(*itr);
i +=1;
source/global/management/src/G4PhysicsFreeVector.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsFreeVector.cc,v 1.8 2001/07/11 10:00:57 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
source/global/management/src/G4PhysicsLinearVector.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLinearVector.cc,v 1.9 2001/07/11 10:00:57 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLinearVector.cc,v 1.10 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//--------------------------------------------------------------------
@@ -107,7 +107,7 @@ G4PhysicsLinearVector::G4PhysicsLinearVector(G4double theEmin,
G4PhysicsLinearVector::~G4PhysicsLinearVector(){}
G4bool G4PhysicsLinearVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
G4bool G4PhysicsLinearVector::Retrieve(std::ifstream& fIn, G4bool ascii)
{
G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
if (success){
source/global/management/src/G4PhysicsLnVector.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLnVector.cc,v 1.11 2001/07/11 10:00:57 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLnVector.cc,v 1.12 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------
@@ -103,7 +103,7 @@ G4PhysicsLnVector::G4PhysicsLnVector(G4double theEmin,
G4PhysicsLnVector::~G4PhysicsLnVector(){}
G4bool G4PhysicsLnVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
G4bool G4PhysicsLnVector::Retrieve(std::ifstream& fIn, G4bool ascii)
{
G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
if (success){
source/global/management/src/G4PhysicsLogVector.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsLogVector.cc,v 1.9 2001/07/11 10:00:57 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsLogVector.cc,v 1.10 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------
@@ -107,7 +107,7 @@ G4PhysicsLogVector::G4PhysicsLogVector(G4double theEmin,
G4PhysicsLogVector::~G4PhysicsLogVector(){}
G4bool G4PhysicsLogVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
G4bool G4PhysicsLogVector::Retrieve(std::ifstream& fIn, G4bool ascii)
{
G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
if (success){
source/global/management/src/G4PhysicsOrderedFreeVector.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PhysicsOrderedFreeVector.cc,v 1.8 2001/07/11 10:00:57 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
////////////////////////////////////////////////////////////////////////
// PhysicsOrderedFreeVector Class Implementation
source/global/management/src/G4PhysicsTable.cc
+14 -18
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsTable.cc,v 1.7 2003/03/25 14:56:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsTable.cc,v 1.8 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// ------------------------------------------------------------
@@ -34,9 +34,9 @@
#include "G4PhysicsVector.hh"
#include "G4PhysicsTable.hh"
#include "g4std/iostream"
#include "g4std/fstream"
#include "g4std/iomanip"
#include <iostream>
#include <fstream>
#include <iomanip>
G4PhysicsTable::G4PhysicsTable()
: G4PhysCollection()
@@ -77,15 +77,13 @@ G4PhysicsTable::~G4PhysicsTable()
G4bool G4PhysicsTable::StorePhysicsTable(const G4String& fileName,
G4bool ascii)
{
G4std::ofstream fOut;
std::ofstream fOut;
// open output file //
#ifdef G4USE_STD_NAMESPACE
if (!ascii)
fOut.open(fileName, G4std::ios::out|G4std::ios::binary);
fOut.open(fileName, std::ios::out|std::ios::binary);
else
#endif
fOut.open(fileName, G4std::ios::out);
fOut.open(fileName, std::ios::out);
// check if the file has been opened successfully
if (!fOut) {
@@ -125,14 +123,12 @@ G4bool G4PhysicsTable::StorePhysicsTable(const G4String& fileName,
G4bool G4PhysicsTable::RetrievePhysicsTable(const G4String& fileName,
G4bool ascii)
{
G4std::ifstream fIn;
std::ifstream fIn;
// open input file //
#ifdef G4USE_STD_NAMESPACE
if (ascii)
fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
fIn.open(fileName,std::ios::in|std::ios::binary);
else
#endif
fIn.open(fileName,G4std::ios::in);
fIn.open(fileName,std::ios::in);
// check if the file has been opened successfully
if (!fIn) {
@@ -192,14 +188,14 @@ G4bool G4PhysicsTable::RetrievePhysicsTable(const G4String& fileName,
return true;
}
G4std::ostream& operator<<(G4std::ostream& out,
G4PhysicsTable& right)
std::ostream& operator<<(std::ostream& out,
G4PhysicsTable& right)
{
// Printout Physics Vector
G4PhysicsTableIterator itr;
size_t i=0;
for (itr=right.begin(); itr!=right.end(); ++itr) {
out << G4std::setw(8) << i << "-th Vector ";
out << std::setw(8) << i << "-th Vector ";
out << ": Type " << G4int((*itr)->GetType()) << G4endl;
out << *(*itr);
i +=1;
source/global/management/src/G4PhysicsVector.cc
+9 -8
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsVector.cc,v 1.14 2001/11/29 18:59:35 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PhysicsVector.cc,v 1.15 2003/06/06 16:17:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------
@@ -41,7 +41,7 @@
// --------------------------------------------------------------
#include "G4PhysicsVector.hh"
#include "g4std/iomanip"
#include <iomanip>
G4PhysicsVector::G4PhysicsVector()
: edgeMin(0.), edgeMax(0.), numberOfBin(0),
@@ -96,7 +96,7 @@ G4double G4PhysicsVector::GetLowEdgeEnergy(size_t binNumber) const
return binVector[binNumber];
}
G4bool G4PhysicsVector::Store(G4std::ofstream& fOut, G4bool ascii)
G4bool G4PhysicsVector::Store(std::ofstream& fOut, G4bool ascii)
{
// Ascii mode
if (ascii) {
@@ -125,7 +125,7 @@ G4bool G4PhysicsVector::Store(G4std::ofstream& fOut, G4bool ascii)
return true;
}
G4bool G4PhysicsVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
G4bool G4PhysicsVector::Retrieve(std::ifstream& fIn, G4bool ascii)
{
// clear properties;
lastEnergy=0.;
@@ -184,17 +184,18 @@ G4bool G4PhysicsVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
return true;
}
G4std::ostream& operator<<(G4std::ostream& out, const G4PhysicsVector& pv)
std::ostream& operator<<(std::ostream& out, const G4PhysicsVector& pv)
{
// binning
out << G4std::setprecision(12) << pv.edgeMin;
out << std::setprecision(12) << pv.edgeMin;
out <<" " << pv.edgeMax <<" " << pv.numberOfBin << G4endl;
// contents
size_t i;
out << pv.dataVector.size() << G4endl;
for(i = 0; i < pv.dataVector.size(); i++) {
out << G4std::setprecision(12) << pv.binVector[i] <<" " << pv.dataVector[i] << G4endl;
out << std::setprecision(12) << pv.binVector[i] << " "
<< pv.dataVector[i] << G4endl;
}
return out;

Some files were not shown because too many files have changed in this diff Show More