class/type TG3* renamed to TG4G3*

diff --git a/TGeant4/TG3Units.cxx b/TGeant4/TG3Units.cxx
deleted file mode 100644 (file)
index 46c03f2..0000000
--- a/TGeant4/TG3Units.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-// Category: global
-//
-// See the class description in the header file.
-
-#include "TG3Units.h"
-
-// static const data members
-
-const G4double TG3Units::fgkLength  = cm;
-const G4double TG3Units::fgkAngle   = deg;
-const G4double TG3Units::fgkTime    = s;
-const G4double TG3Units::fgkCharge  = eplus;
-const G4double TG3Units::fgkEnergy  = GeV;
-const G4double TG3Units::fgkMass    = GeV;
-const G4double TG3Units::fgkMassDensity  = g/cm3;
-const G4double TG3Units::fgkAtomicWeight = g/mole;
-const G4double TG3Units::fgkField   = tesla;
-
-TG3Units::TG3Units() {
-//
-}
-  
-TG3Units::~TG3Units() {
-//
-}
-

diff --git a/TGeant4/TG3Attribute.h b/TGeant4/TG4G3Attribute.h
similarity index 91%
rename from TGeant4/TG3Attribute.h
rename to TGeant4/TG4G3Attribute.h
index d663167b59e88d5809c5c70e7f0567586334bae2..a4d7a97e6c52383bceb5abbbee56fb0622dc13d4 100644 (file)
--- a/TGeant4/TG3Attribute.h
+++ b/TGeant4/TG4G3Attribute.h
@@ -1,10 +1,10 @@
 // $Id$
 // Category: visualization
 
-#ifndef TG3_ATTRIBUTE_H
-#define TG3_ATTRIBUTE_H
+#ifndef TG4_G3_VIS_ATTRIBUTE_H
+#define TG4_G3_VIS_ATTRIBUTE_H
 
-enum TG3Attribute
+enum TG4G3Attribute
 {
   kWORK,       // Set the volume active/inactive for tracking (not used!)
   kSEEN,       // Set visibility : 0-invisible , 1-visible,
@@ -33,4 +33,4 @@ enum TG3Attribute
   kUNKNOWN
 };
 
-#endif //TG3_ATTRIBUTE_H
+#endif //TG4_G3_VIS_ATTRIBUTE_H

diff --git a/TGeant4/TG3Cut.h b/TGeant4/TG4G3Cut.h
similarity index 94%
rename from TGeant4/TG3Cut.h
rename to TGeant4/TG4G3Cut.h
index a9219bf16be72f5a9d4737c3d042ad37ec40fd5b..457171684232a2ea1c6016fb3ed3f0aa6b179037 100644 (file)
--- a/TGeant4/TG3Cut.h
+++ b/TGeant4/TG4G3Cut.h
@@ -1,10 +1,10 @@
 // $Id$
-// Category: physics
+// Category: global
 
-#ifndef TG3_CUT_H
-#define TG3_CUT_H
+#ifndef TG4_G3_CUT_H
+#define TG4_G3_CUT_H
 
-enum TG3Cut
+enum TG4G3Cut
 {
   kCUTGAM, // gammas 
                // G4 particles: "gamma"         
@@ -43,4 +43,4 @@ enum TG3Cut
   kNoG3Cuts    
 };
 
-#endif //TG3_CUT_H
+#endif //TG4_G3_CUT_H

diff --git a/TGeant4/TG3ParticleWSP.h b/TGeant4/TG4G3ParticleWSP.h
similarity index 78%
rename from TGeant4/TG3ParticleWSP.h
rename to TGeant4/TG4G3ParticleWSP.h
index 65f832b21b9767cfff0b863b29b3f9671ec197ab..909ac2362074d7f871be05f5bf905f69aaacb212 100644 (file)
--- a/TGeant4/TG3ParticleWSP.h
+++ b/TGeant4/TG4G3ParticleWSP.h
@@ -1,10 +1,10 @@
 // $Id$
 // Category: physics
 
-#ifndef TG3_PARTICLE_WSP_H
-#define TG3_PARTICLE_WSP_H
+#ifndef TG4_G3_PARTICLE_WSP_H
+#define TG4_G3_PARTICLE_WSP_H
 
-enum TG3ParticleWSP
+enum TG4G3ParticleWSP
 // particle with special process
 {
   kGamma,           // kPAIR, kCOMP, kPHOT, kPHIS
@@ -17,5 +17,5 @@ enum TG3ParticleWSP
   kNofParticlesWSP
 };
    
-#endif //TG3_PARTICLE_WSP_H
+#endif //TG4_G3_PARTICLE_WSP_H
 

diff --git a/TGeant4/TG4G3Units.cxx b/TGeant4/TG4G3Units.cxx
new file mode 100644 (file)
index 0000000..042e952
--- /dev/null
+++ b/TGeant4/TG4G3Units.cxx
@@ -0,0 +1,27 @@
+// $Id$
+// Category: global
+//
+// See the class description in the header file.
+
+#include "TG4G3Units.h"
+
+// static const data members
+
+const G4double TG4G3Units::fgkLength  = cm;
+const G4double TG4G3Units::fgkAngle   = deg;
+const G4double TG4G3Units::fgkTime    = s;
+const G4double TG4G3Units::fgkCharge  = eplus;
+const G4double TG4G3Units::fgkEnergy  = GeV;
+const G4double TG4G3Units::fgkMass    = GeV;
+const G4double TG4G3Units::fgkMassDensity  = g/cm3;
+const G4double TG4G3Units::fgkAtomicWeight = g/mole;
+const G4double TG4G3Units::fgkField   = tesla;
+
+TG4G3Units::TG4G3Units() {
+//
+}
+  
+TG4G3Units::~TG4G3Units() {
+//
+}
+

diff --git a/TGeant4/TG3Units.h b/TGeant4/TG4G3Units.h
similarity index 63%
rename from TGeant4/TG3Units.h
rename to TGeant4/TG4G3Units.h
index c14e09eb34d35edf685bbfeb467866bb762cb8dd..773fe3c27eefa559591af8a444a695bd61785d28 100644 (file)
--- a/TGeant4/TG3Units.h
+++ b/TGeant4/TG4G3Units.h
@@ -4,17 +4,17 @@
 // Class defines the G3 default units of physical quantities; 
 // all physical quantities returned by MC are expressed in these units.
 
-#ifndef TG3_UNITS_H
-#define TG3_UNITS_H
+#ifndef TG4_G3_UNITS_H
+#define TG4_G3_UNITS_H
 
 #include <globals.hh>
 
-class TG3Units
+class TG4G3Units
 {
   public:
     // --> protected
-    // TG3Units();  
-    virtual ~TG3Units();
+    // TG4G3Units();  
+    virtual ~TG4G3Units();
 
     // static get methods
     static G4double Length(); 
@@ -28,7 +28,7 @@ class TG3Units
     static G4double Field(); 
       
   protected:
-    TG3Units();      
+    TG4G3Units();      
         // only static data members and methods
 
   private:
@@ -46,14 +46,14 @@ class TG3Units
 
 // inline methods
 
-inline G4double TG3Units::Length() { return fgkLength; }
-inline G4double TG3Units::Angle()  { return fgkAngle; }
-inline G4double TG3Units::Time()   { return fgkTime; }
-inline G4double TG3Units::Charge() { return fgkCharge; }
-inline G4double TG3Units::Energy() { return fgkEnergy; }
-inline G4double TG3Units::Mass()   { return fgkMass; }
-inline G4double TG3Units::MassDensity()  { return fgkMassDensity; }
-inline G4double TG3Units::AtomicWeight() { return fgkAtomicWeight; }
-inline G4double TG3Units::Field()  { return fgkField; }
-
-#endif //TG3_UNITS_H
+inline G4double TG4G3Units::Length() { return fgkLength; }
+inline G4double TG4G3Units::Angle()  { return fgkAngle; }
+inline G4double TG4G3Units::Time()   { return fgkTime; }
+inline G4double TG4G3Units::Charge() { return fgkCharge; }
+inline G4double TG4G3Units::Energy() { return fgkEnergy; }
+inline G4double TG4G3Units::Mass()   { return fgkMass; }
+inline G4double TG4G3Units::MassDensity()  { return fgkMassDensity; }
+inline G4double TG4G3Units::AtomicWeight() { return fgkAtomicWeight; }
+inline G4double TG4G3Units::Field()  { return fgkField; }
+
+#endif //TG4_G3_UNITS_H