Import Geant4 9.5.0 source tree

source/persistency/ascii/include/G4tgbDetectorBuilder.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbDetectorBuilder.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbDetectorBuilder.hh,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbDetectorBuilder

source/persistency/ascii/include/G4tgbDetectorConstruction.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbDetectorConstruction.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbDetectorConstruction.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbDetectorConstruction

source/persistency/ascii/include/G4tgbElement.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbElement.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbElement.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbElement

source/persistency/ascii/include/G4tgbIsotope.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbIsotope.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbIsotope.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbIsotope

source/persistency/ascii/include/G4tgbMaterial.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterial.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterial.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterial

source/persistency/ascii/include/G4tgbMaterialMgr.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialMgr.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialMgr.hh,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialMgr

source/persistency/ascii/include/G4tgbMaterialMixture.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialMixture.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialMixture.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialMixture

source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialMixtureByNoAtoms.hh,v 1.4 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialMixtureByNoAtoms.hh,v 1.4 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialMixtureByNoAtoms

source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialMixtureByVolume.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialMixtureByVolume.hh,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialMixtureByVolume

source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialMixtureByWeight.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialMixtureByWeight.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialMixtureByWeight

source/persistency/ascii/include/G4tgbMaterialSimple.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbMaterialSimple.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbMaterialSimple.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbMaterialSimple

source/persistency/ascii/include/G4tgbPlaceParamCircle.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbPlaceParamCircle.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4tgbPlaceParamCircle.hh,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbPlaceParamCircle

source/persistency/ascii/include/G4tgbPlaceParamLinear.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbPlaceParamLinear.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4tgbPlaceParamLinear.hh,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbPlaceParamLinear

source/persistency/ascii/include/G4tgbPlaceParamSquare.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbPlaceParamSquare.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4tgbPlaceParamSquare.hh,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbPlaceParamSquare

source/persistency/ascii/include/G4tgbPlaceParameterisation.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbPlaceParameterisation.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbPlaceParameterisation.hh,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbPlaceParamSquare

source/persistency/ascii/include/G4tgbRotationMatrix.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbRotationMatrix.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbRotationMatrix.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbRotationMatrix

source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbRotationMatrixMgr.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbRotationMatrixMgr.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbRotationMatrixMgr

source/persistency/ascii/include/G4tgbVolume.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbVolume.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbVolume.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbVolume

source/persistency/ascii/include/G4tgbVolumeMgr.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgbVolumeMgr.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgbVolumeMgr.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgbVolume

source/persistency/ascii/include/G4tgrElement.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrElement.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrElement.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrElement

source/persistency/ascii/include/G4tgrElementFromIsotopes.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrElementFromIsotopes.hh,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrElementFromIsotopes.hh,v 1.7 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrElementFromIsotopes

source/persistency/ascii/include/G4tgrElementSimple.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrElementSimple.hh,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrElementSimple.hh,v 1.7 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrElementSimple

source/persistency/ascii/include/G4tgrEvaluator.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrEvaluator.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4tgrEvaluator.hh,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrEvaluator
@@ -42,9 +42,9 @@
 #define G4tgrEvaluator_HH
 
 #include "G4ThreeVector.hh"
-#include <CLHEP/Evaluator/Evaluator.h>
+#include "G4Evaluator.hh"
 
-class G4tgrEvaluator : public HepTool::Evaluator
+class G4tgrEvaluator : public G4Evaluator
 {
   public:  // with description
 

source/persistency/ascii/include/G4tgrFileIn.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrFileIn.hh,v 1.5 2010/10/13 15:20:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrFileIn.hh,v 1.5 2010-10-13 15:20:01 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrFileIn

source/persistency/ascii/include/G4tgrFileReader.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrFileReader.hh,v 1.4 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrFileReader.hh,v 1.4 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrFileReader

source/persistency/ascii/include/G4tgrIsotope.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrIsotope.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrIsotope.hh,v 1.5 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrIsotope

source/persistency/ascii/include/G4tgrLineProcessor.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrLineProcessor.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrLineProcessor.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrIsotope

source/persistency/ascii/include/G4tgrMaterial.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrMaterial.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrMaterial.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrMaterial
@@ -41,6 +41,7 @@
 #define G4tgrMaterial_h
 
 #include "globals.hh"
+#include "G4Material.hh"
 
 class G4tgrMaterial
 {
@@ -70,6 +71,15 @@ class G4tgrMaterial
     void SetIonisationMeanExcitationEnergy( G4double mee )
       { theIonisationMeanExcitationEnergy = mee; }
 
+    G4State GetState() const { return theState; }
+    void SetState( G4String val );
+
+    G4double GetTemperature() const { return theTemperature; }
+    void SetTemperature( G4double val ) { theTemperature = val; }
+
+    G4double GetPressure() const { return thePressure; }
+    void SetPressure( G4double val ) { thePressure = val; }
+
   protected:
 
     G4String  theName;
@@ -77,6 +87,9 @@ class G4tgrMaterial
     G4int theNoComponents;
     G4String  theMateType;
     G4double theIonisationMeanExcitationEnergy;
+    G4State theState;
+    G4double theTemperature;
+    G4double thePressure;
 };
 
 #endif

source/persistency/ascii/include/G4tgrMaterialFactory.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrMaterialFactory.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrMaterialFactory.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrMaterialFactory

source/persistency/ascii/include/G4tgrMaterialMixture.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrMaterialMixture.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrMaterialMixture.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrMaterialMixture

source/persistency/ascii/include/G4tgrMaterialSimple.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrMaterialSimple.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrMaterialSimple.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrMaterialSimple

source/persistency/ascii/include/G4tgrMessenger.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrMessenger.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4tgrMessenger.hh,v 1.1 2008-10-23 14:43:43 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrMessenger

source/persistency/ascii/include/G4tgrParameterMgr.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrParameterMgr.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrParameterMgr.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrParameterMgr

source/persistency/ascii/include/G4tgrPlace.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrPlace.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrPlace.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrPlace

source/persistency/ascii/include/G4tgrPlaceDivRep.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrPlaceDivRep.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrPlaceDivRep.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrPlaceDivRep

source/persistency/ascii/include/G4tgrPlaceParameterisation.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrPlaceParameterisation.hh,v 1.8 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrPlaceParameterisation.hh,v 1.8 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrPlaceParameterisation

source/persistency/ascii/include/G4tgrPlaceSimple.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrPlaceSimple.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrPlaceSimple.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrPlaceSimple

source/persistency/ascii/include/G4tgrRotationMatrix.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrRotationMatrix.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrRotationMatrix.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrRotationMatrix

source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrRotationMatrixFactory.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrRotationMatrixFactory.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrRotationMatrixFactory

source/persistency/ascii/include/G4tgrSolid.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrSolid.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrSolid.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrSolid

source/persistency/ascii/include/G4tgrSolidBoolean.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrSolidBoolean.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrSolidBoolean.hh,v 1.3 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrSolidBoolean

source/persistency/ascii/include/G4tgrUtils.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrUtils.hh,v 1.8 2010/12/15 11:29:54 arce Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrUtils.hh,v 1.8 2010-12-15 11:29:54 arce Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrUtils
@@ -66,6 +66,7 @@ class G4tgrUtils
     static G4bool IsFunction( const G4String& word ); 
       // Checks that every character in a G4String is a number
       // (also '.' or exponencial notation: 'E')
+    static G4bool WordIsUnit( const G4String& word );
 
     static void Dump3v( const G4ThreeVector& vec, const char* msg);
       // Dumps a three-vector with a message

source/persistency/ascii/include/G4tgrVolume.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrVolume.hh,v 1.11 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrVolume.hh,v 1.11 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrVolume
@@ -88,8 +88,9 @@ class G4tgrVolume
     // Accessors
 
     const G4String& GetName() const {return theName;}
+    void SetName(const G4String& name) {theName = name;}
     const G4String& GetType() const {return theType;}
-    const G4tgrSolid* GetSolid() const {return theSolid;}
+    G4tgrSolid* GetSolid() const {return theSolid;}
     const G4String& GetMaterialName() const {return theMaterialName;}
 
     const std::vector<G4tgrPlace*> GetPlacements() const {return thePlacements;}

source/persistency/ascii/include/G4tgrVolumeAssembly.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrVolumeAssembly.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrVolumeAssembly.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrVolumeAssembly

source/persistency/ascii/include/G4tgrVolumeDivision.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrVolumeDivision.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrVolumeDivision.hh,v 1.6 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrVolumeDivision

source/persistency/ascii/include/G4tgrVolumeMgr.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4tgrVolumeMgr.hh,v 1.8 2010/10/13 07:56:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4tgrVolumeMgr.hh,v 1.8 2010-10-13 07:56:55 gcosmo Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 // class G4tgrVolumeMgr