Changeset 1315 for trunk/source/track

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/track

Files:

• History (modified) (2 diffs)
• include/G4VUserTrackInformation.hh (modified) (3 diffs)
• src/G4VUserTrackInformation.cc (modified) (2 diffs)

trunk/source/track/History

@@ -1 @@
-$Id: History,v 1.107 2009/10/19 09:37:00 kurasige Exp $
+$Id: History,v 1.108 2010/03/09 02:49:44 kurasige Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Mar. 9, 2010 Hisaya Kurashige (track-V09-03-00)
+- Change G4String to a pointer of G4String 
+  for prooperty to indicate type of UserTrackInformation 
+- Change G4VUserTrackInformation::Print() to a simple virtual method
+  form pure-virtual 
+
 Oct. 19, 2009 Hisaya Kurashige (track-V09-02-04)
-added a string prooperty to indicate type of UserTrackInformation
+-added a string prooperty to indicate type of UserTrackInformation
 
 
 June 18, 2009 Hisaya Kurashige (track-V09-02-03)
-added SetLowEnergyLimit method (Vladimir)
+-added SetLowEnergyLimit method (Vladimir)
 
 

trunk/source/track/include/G4VUserTrackInformation.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VUserTrackInformation.hh,v 1.8 2009/10/19 17:11:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4VUserTrackInformation.hh,v 1.9 2010/03/09 02:49:44 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -69 +69 @@
     virtual ~G4VUserTrackInformation();
 
-    virtual void Print() const = 0;
+    virtual void Print() const {};
     
     const G4String& GetType() const;
@@ -75 +75 @@
  
   protected:
-    G4String fType;    
+    G4String* pType;    
 };
 
-inline 
- const G4String& G4VUserTrackInformation::GetType() const
-{
-  return fType;
-}
-    
 #endif
 

trunk/source/track/src/G4VUserTrackInformation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VUserTrackInformation.cc,v 1.3 2009/10/19 09:37:00 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4VUserTrackInformation.cc,v 1.4 2010/03/09 02:49:44 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -34 +34 @@
 
 G4VUserTrackInformation::G4VUserTrackInformation()
-  : fType("NONE")
+  : pType(0)
 {;}
 
 G4VUserTrackInformation::G4VUserTrackInformation(const G4String& infoType)
-  : fType(infoType)
-{;}
+{ 
+  pType = new G4String(infoType) ;
+}
 
 G4VUserTrackInformation::~G4VUserTrackInformation()
-{;}
+{
+  if (pType!=0) delete pType;
+}
+
+const G4String& G4VUserTrackInformation::GetType() const
+{
+  static const G4String NOTYPE="NONE";
+  if(pType!=0) return *pType;
+  else return NOTYPE;
+}
+