Changeset 1196 for trunk/source/track

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/track

Files:

• History (modified) (2 diffs)
• include/G4ParticleChangeForLoss.hh (modified) (6 diffs)
• include/G4VUserTrackInformation.hh (modified) (2 diffs)
• src/G4ParticleChange.cc (modified) (2 diffs)
• src/G4ParticleChangeForLoss.cc (modified) (2 diffs)
• src/G4ParticleChangeForMSC.cc (modified) (2 diffs)
• src/G4Track.cc (modified) (3 diffs)
• src/G4VParticleChange.cc (modified) (2 diffs)
• src/G4VUserTrackInformation.cc (modified) (2 diffs)

trunk/source/track/History

@@ -1 @@
-$Id: History,v 1.102 2008/10/24 08:22:20 kurasige Exp $
+$Id: History,v 1.107 2009/10/19 09:37:00 kurasige Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Oct. 19, 2009 Hisaya Kurashige (track-V09-02-04)
+added a string prooperty to indicate type of UserTrackInformation
+
+
+June 18, 2009 Hisaya Kurashige (track-V09-02-03)
+added SetLowEnergyLimit method (Vladimir)
+
+
+May.  27, 2009 Hisaya Kurashige (track-V09-02-02)
+- Add lowEnergyLimit = 1 eV in lowEnergyLimit = 1 eV (Vladimir)
+
+Apr.  2, 2009 Hisaya Kurashige (track-V09-02-01)
+- Add protection for the case mass==0 and T==0 in GetVelocity
+
+Apr.  2, 2009 Hisaya Kurashige (track-V09-02-00)
+- Modify GetVelocity to improve performance 
+
 Oct. 24, 2008 Hisaya Kurashige (track-V09-01-02)
 - change fpCreatorProcess and fpLCAtVertex in G4Track to  'const' pointer   

trunk/source/track/include/G4ParticleChangeForLoss.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleChangeForLoss.hh,v 1.20 2008/01/11 19:57:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParticleChangeForLoss.hh,v 1.22 2009/06/17 17:25:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -42 +42 @@
 //                         and ProposeWeight for PostStep
 //   07.06.06 V.Ivanchenko RemoveProposedMomentumDirection from AlongStep
-//   28.08.06 V.Ivanchenko Add access to current track and polarizaion
+//   28.08.06 V.Ivanchenko Added access to current track and polarizaion
+//   17.06.09 V.Ivanchenko Added SetLowEnergyLimit method 
 //
 // ------------------------------------------------------------
@@ -108 +109 @@
   const G4Track* GetCurrentTrack() const;
 
+  void SetLowEnergyLimit(G4double elimit);
+
   virtual void DumpInfo() const;
 
@@ -125 +128 @@
   G4double proposedKinEnergy;
   //  The final kinetic energy of the current particle.
+
+  G4double lowEnergyLimit;
+  //  The limit kinetic energy below which particle is stopped
 
   G4double currentCharge;
@@ -263 +269 @@
 
   // update kinetic energy and charge
-  if (kinEnergy < DBL_MIN) {
+  if (kinEnergy < lowEnergyLimit) {
     theLocalEnergyDeposit += kinEnergy;
     kinEnergy = 0.0;
@@ -311 +317 @@
 }
 
+inline void G4ParticleChangeForLoss::SetLowEnergyLimit(G4double elimit)
+{
+  lowEnergyLimit = elimit;
+}
+
 #endif
 

trunk/source/track/include/G4VUserTrackInformation.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VUserTrackInformation.hh,v 1.6 2006/06/29 21:14:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VUserTrackInformation.hh,v 1.8 2009/10/19 17:11:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -57 +57 @@
 #define G4VUserTrackInformation_H 1
 
+#include "globals.hh"
+
 class G4VUserTrackInformation
-{
-  public:
+{ 
+  public: // With Description
     G4VUserTrackInformation();
+    G4VUserTrackInformation(const G4String& infoType);
+    // String is provided to indicate Type of UserTrackInfo class  
+    // User is recommended to set the type of his/her class  
+
     virtual ~G4VUserTrackInformation();
 
-  public:
     virtual void Print() const = 0;
+    
+    const G4String& GetType() const;
+    // get Type of this UserTrackInfo     
+ 
+  protected:
+    G4String fType;    
 };
 
+inline 
+ const G4String& G4VUserTrackInformation::GetType() const
+{
+  return fType;
+}
+    
 #endif
 

trunk/source/track/src/G4ParticleChange.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleChange.cc,v 1.30 2007/03/30 01:03:53 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParticleChange.cc,v 1.31 2009/04/02 02:22:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -454 +454 @@
   G4bool itsOKforMomentum = true;  
   if ( theEnergyChange >0.) {
-    accuracy = std::abs(theMomentumDirectionChange.mag2()-1.0);
+    accuracy = std::fabs(theMomentumDirectionChange.mag2()-1.0);
     if (accuracy > accuracyForWarning) {
 #ifdef G4VERBOSE

trunk/source/track/src/G4ParticleChangeForLoss.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleChangeForLoss.cc,v 1.16 2006/08/28 16:10:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParticleChangeForLoss.cc,v 1.17 2009/05/26 13:19:41 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -49 +49 @@
 #include "G4ExceptionSeverity.hh"
 
-G4ParticleChangeForLoss::G4ParticleChangeForLoss():G4VParticleChange()
+G4ParticleChangeForLoss::G4ParticleChangeForLoss()
+  :G4VParticleChange(), lowEnergyLimit(1.0*eV)
 {
   theSteppingControlFlag = NormalCondition;

trunk/source/track/src/G4ParticleChangeForMSC.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleChangeForMSC.cc,v 1.13 2006/06/29 21:15:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParticleChangeForMSC.cc,v 1.14 2009/04/02 02:22:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -165 +165 @@
 
   // MomentumDirection should be unit vector
-  accuracy = std::abs(theMomentumDirection.mag2()-1.0);
+  accuracy = std::fabs(theMomentumDirection.mag2()-1.0);
   if (accuracy > accuracyForWarning) {
 #ifdef G4VERBOSE

trunk/source/track/src/G4Track.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Track.cc,v 1.30 2007/10/02 00:46:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Track.cc,v 1.32 2009/04/08 08:07:24 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -38 +38 @@
 //   Modification for G4TouchableHandle             22 Oct. 2001  R.Chytracek//
 //   Fix GetVelocity (bug report #741)   Horton-Smith Apr 14 2005
+//   Remove massless check in  GetVelocity   02 Apr. 09 H.Kurashige
 
 #include "G4Track.hh"
@@ -170 +171 @@
   G4double mass = fpDynamicParticle->GetMass();
 
-  // mass less particle  
-  if( mass == 0. ){
-    velocity = c_light ; 
-
-    // special case for photons
-    if ( (fOpticalPhoton !=0)  &&
-         (fpDynamicParticle->GetDefinition()==fOpticalPhoton) ){
-
-       G4Material* mat=0; 
-       G4bool update_groupvel = false;
-       if ( this->GetStep() ){
-          mat= this->GetMaterial();         //   Fix for repeated volumes
-       }else{
-          if (fpTouchable!=0){ 
-            mat=fpTouchable->GetVolume()->GetLogicalVolume()->GetMaterial();
-          }
-        }
-       // check if previous step is in the same volume
-       //  and get new GROUPVELOVITY table if necessary 
-       if ((mat != prev_mat)||(groupvel==0)) {
-         groupvel = 0;
-         if(mat->GetMaterialPropertiesTable() != 0)
-           groupvel = mat->GetMaterialPropertiesTable()->GetProperty("GROUPVEL");
-         update_groupvel = true;
-       }
-       prev_mat = mat;
-       
-       if  (groupvel != 0 ) {
-         // light velocity = c/(rindex+d(rindex)/d(log(E_phot)))
-         // values stored in GROUPVEL material properties vector
-         velocity =  prev_velocity;
+  velocity = c_light ; 
+
+  // special case for photons
+  if (  (fOpticalPhoton !=0)  &&
+        (fpDynamicParticle->GetDefinition()==fOpticalPhoton) ){
+
+    G4Material* mat=0; 
+    G4bool update_groupvel = false;
+    if ( this->GetStep() ){
+      mat= this->GetMaterial();         //   Fix for repeated volumes
+    }else{
+      if (fpTouchable!=0){ 
+        mat=fpTouchable->GetVolume()->GetLogicalVolume()->GetMaterial();
+      }
+    }
+    // check if previous step is in the same volume
+    //  and get new GROUPVELOVITY table if necessary 
+    if ((mat != prev_mat)||(groupvel==0)) {
+        groupvel = 0;
+        if(mat->GetMaterialPropertiesTable() != 0)
+          groupvel = mat->GetMaterialPropertiesTable()->GetProperty("GROUPVEL");
+        update_groupvel = true;
+    }
+    prev_mat = mat;
+      
+    if  (groupvel != 0 ) {
+        // light velocity = c/(rindex+d(rindex)/d(log(E_phot)))
+        // values stored in GROUPVEL material properties vector
+        velocity =  prev_velocity;
          
-         // check if momentum is same as in the previous step
-         //  and calculate group velocity if necessary 
-         if( update_groupvel || (fpDynamicParticle->GetTotalMomentum() != prev_momentum) ) {
-           velocity =
-             groupvel->GetProperty(fpDynamicParticle->GetTotalMomentum());
+        // check if momentum is same as in the previous step
+        //  and calculate group velocity if necessary 
+        if( update_groupvel || (fpDynamicParticle->GetTotalMomentum() != prev_momentum) ) {
+          velocity =
+            groupvel->GetProperty(fpDynamicParticle->GetTotalMomentum());
            prev_velocity = velocity;
-           prev_momentum = fpDynamicParticle->GetTotalMomentum();
-         }
-       }
-     }
+          prev_momentum = fpDynamicParticle->GetTotalMomentum();
+        }
+    }
 
   } else {
-    G4double T = fpDynamicParticle->GetKineticEnergy();
-    velocity = c_light*std::sqrt(T*(T+2.*mass))/(T+mass);
+    if (mass<DBL_MIN) {
+      velocity = c_light;
+    } else {
+      G4double T = fpDynamicParticle->GetKineticEnergy();
+      velocity = c_light*std::sqrt(T*(T+2.*mass))/(T+mass);
+    }
   }
                                                                                 

trunk/source/track/src/G4VParticleChange.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VParticleChange.cc,v 1.20 2007/03/25 22:54:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VParticleChange.cc,v 1.21 2009/04/02 02:22:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -288 +288 @@
   // MomentumDirection should be unit vector
   G4bool itsOKforMomentum = true;  
-  accuracy = std::abs((aTrack.GetMomentumDirection()).mag2()-1.0);
+  accuracy = std::fabs((aTrack.GetMomentumDirection()).mag2()-1.0);
   if (accuracy > accuracyForWarning) {
 #ifdef G4VERBOSE

trunk/source/track/src/G4VUserTrackInformation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VUserTrackInformation.cc,v 1.2 2006/06/29 21:15:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VUserTrackInformation.cc,v 1.3 2009/10/19 09:37:00 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -34 +34 @@
 
 G4VUserTrackInformation::G4VUserTrackInformation()
+  : fType("NONE")
 {;}
+
+G4VUserTrackInformation::G4VUserTrackInformation(const G4String& infoType)
+  : fType(infoType)
+{;}
+
 G4VUserTrackInformation::~G4VUserTrackInformation()
 {;}