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

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/track/History
+17 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.70 2004/06/15 08:19:02 vnivanch Exp $
$Id: History,v 1.75 2004/12/02 06:40:04 kurasige Exp $
-------------------------------------------------------------------
=========================================================
@@ -16,6 +16,22 @@ committal in the CVS repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Dec. 02, 04 H.Kurashige (track-V06-02-04)
- migration to cmath
Nov. 25, 04 M.Asai (track-V06-02-03)
- Fix destructor of G4VUserTrackInformation.
Oct. 19, 04 H.Kurashige (track-V06-02-02)
- Remove obsolete methods from G4ParticleChange
Sep. 17, 04 P.Gumplinger (track-V06-02-01)
- Modified G4ParticleChangeForDecay (add thePolarizationChange and methods)
Aug. 27, 04 M.Asai (track-V06-02-00)
- A pointer to sensitive detector is added in G4StepPoint and
G4ParticleChangeForTransport.
- G4Step is taking care of setting the above pointer.
Jun. 15, 04 V.Ivanchenko (track-V06-01-05)
- G4ParticleChangeForLoss: fix initialization of ParentWeight
source/track/include/G4ForceCondition.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ForceCondition.hh,v 1.4 2002/10/31 23:41:52 tsasaki Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/include/G4GPILSelection.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GPILSelection.hh,v 1.3 2001/07/11 10:08:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/include/G4ParticleChange.hh
+2 -32
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChange.hh,v 1.10 2004/05/08 15:28:11 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChange.hh,v 1.11 2004/10/19 00:51:29 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
@@ -201,36 +201,6 @@ class G4ParticleChange: public G4VParticleChange
// position and are same as thePositionChange
// ----------------------------------------------------
public:
// Following methods will be removed in release 7.0
// Using ProposeXXXX methods is recommended to setting
// properties in G4ParticleChange
const G4ThreeVector* GetMomentumDirectionChange() const;
void SetMomentumDirectionChange(G4double Px, G4double Py, G4double Pz);
void SetMomentumDirectionChange(const G4ThreeVector& Pfinal);
const G4ThreeVector* GetMomentum() const;
void SetMomentumChange(G4double Px, G4double Py, G4double Pz);
void SetMomentumChange(const G4ThreeVector& Pfinal);
const G4ThreeVector* GetMomentumChange() const;
const G4ThreeVector* GetPolarizationChange() const;
void SetPolarizationChange(G4double Px, G4double Py, G4double Pz);
void SetPolarizationChange(const G4ThreeVector& finalPoralization);
G4double GetEnergyChange() const;
void SetEnergyChange(G4double theEnergyChange);
G4double GetProperTimeChange() const;
void SetProperTimeChange(G4double t);
const G4ThreeVector* GetPositionChange() const;
void SetPositionChange(G4double x, G4double y, G4double z);
void SetPositionChange(const G4ThreeVector& finalPosition);
G4double GetTimeChange() const;
void SetTimeChange(G4double t);
G4double GetMassChange() const;
void SetMassChange(G4double mass);
G4double GetChargeChange() const;
void SetChargeChange(G4double mass);
G4double GetWeightChange() const;
void SetWeightChange(G4double w);
public:
virtual void DumpInfo() const;
source/track/include/G4ParticleChange.icc
+3 -161
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChange.icc,v 1.10 2004/05/08 15:28:11 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChange.icc,v 1.12 2004/12/02 06:38:00 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
inline
@@ -191,165 +191,7 @@ inline
G4double mass
) const
{
G4double tMomentum = sqrt(energy*energy + 2*energy*mass);
G4double tMomentum = std::sqrt(energy*energy + 2*energy*mass);
return direction*tMomentum;
}
// Following methods will be removed in release 7.0
inline
G4double G4ParticleChange::GetEnergyChange() const
{
return GetEnergy();
}
inline
void G4ParticleChange::SetEnergyChange(G4double energy)
{
ProposeEnergy(energy);
}
inline
const G4ThreeVector* G4ParticleChange::GetMomentumChange() const
{
return GetMomentumDirection();
}
inline
void G4ParticleChange::SetMomentumChange(
G4double Px,
G4double Py,
G4double Pz )
{
ProposeMomentumDirection(Px, Py, Pz);
}
inline
void G4ParticleChange::SetMomentumChange(const G4ThreeVector& P)
{
ProposeMomentumDirection(P);
}
inline
const G4ThreeVector* G4ParticleChange::GetMomentumDirectionChange() const
{
return GetMomentumDirection();
}
inline
void G4ParticleChange::SetMomentumDirectionChange(
G4double Px,
G4double Py,
G4double Pz )
{
ProposeMomentumDirection(Px, Py, Pz);
}
inline
void G4ParticleChange::SetMomentumDirectionChange(const G4ThreeVector& P)
{
ProposeMomentumDirection(P);
}
inline
const G4ThreeVector* G4ParticleChange::GetPolarizationChange() const
{
return GetPolarization();
}
inline
void G4ParticleChange::SetPolarizationChange( const G4ThreeVector& finalPoralization)
{
ProposePolarization(finalPoralization);
}
inline
void G4ParticleChange::SetPolarizationChange(
G4double Px,
G4double Py,
G4double Pz )
{
ProposePolarization(Px, Py, Pz);
}
inline
const G4ThreeVector* G4ParticleChange::GetPositionChange() const
{
return GetPosition();
}
inline
void G4ParticleChange::SetPositionChange(const G4ThreeVector& finalPosition)
{
ProposePosition(finalPosition);
}
inline
void G4ParticleChange::SetPositionChange(G4double x,G4double y, G4double z)
{
ProposePosition(x, y, z);
}
inline
G4double G4ParticleChange::GetProperTimeChange() const
{
return GetProperTime();
}
inline
void G4ParticleChange::SetProperTimeChange(G4double tau)
{
ProposeProperTime(tau);
}
inline
G4double G4ParticleChange::GetTimeChange() const
{
return GetGlobalTime();
}
inline
void G4ParticleChange::SetTimeChange(G4double t)
{
ProposeGlobalTime(t);
}
inline
G4double G4ParticleChange::GetMassChange() const
{
return GetMass();
}
inline
void G4ParticleChange::SetMassChange(G4double t)
{
ProposeMass(t);
}
inline
G4double G4ParticleChange::GetChargeChange() const
{
return GetCharge();
}
inline
void G4ParticleChange::SetChargeChange(G4double t)
{
ProposeCharge(t);
}
inline
G4double G4ParticleChange::GetWeightChange() const
{
return GetWeight();
}
inline
void G4ParticleChange::SetWeightChange(G4double w)
{
ProposeWeight(w);
}
source/track/include/G4ParticleChangeForDecay.hh
+26 -15
View File
@@ -21,8 +21,9 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForDecay.hh,v 1.6 2004/05/08 15:28:11 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChangeForDecay.hh,v 1.8 2004/10/19 00:51:29 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
@@ -90,12 +91,10 @@ class G4ParticleChangeForDecay: public G4VParticleChange
G4double GetGlobalTime(G4double timeDelay) const;
// Convert the time delay to the global time.
public:
// Following methods will be removed in release 7.0
// Using ProposeXXXX methods is recommended to setting
// properties in G4ParticleChangeForDecay
G4double GetTimeChange() const;
void SetTimeChange(G4double t);
const G4ThreeVector* GetPolarization() const;
void ProposePolarization(G4double Px, G4double Py, G4double Pz);
void ProposePolarization(const G4ThreeVector& finalPoralization);
// Get/Propose the final Polarization vector.
public:
virtual void DumpInfo() const;
@@ -103,6 +102,9 @@ class G4ParticleChangeForDecay: public G4VParticleChange
protected:
G4double theTimeChange;
// The change of global time of a given particle.
G4ThreeVector thePolarizationChange;
// The changed (final) polarization of a given track
public:
// for Debug
@@ -128,19 +130,28 @@ inline
return theTimeChange + timeDelay;
}
// Following methods will be removed in release 7.0
inline
G4double G4ParticleChangeForDecay::GetTimeChange() const
inline
const G4ThreeVector* G4ParticleChangeForDecay::GetPolarization() const
{
return theTimeChange;
return &thePolarizationChange;
}
inline
void G4ParticleChangeForDecay::SetTimeChange(G4double t)
inline
void G4ParticleChangeForDecay::ProposePolarization(const G4ThreeVector& finalPoralization)
{
theTimeChange = t;
thePolarizationChange = finalPoralization;
}
inline
void G4ParticleChangeForDecay::ProposePolarization(
G4double Px,
G4double Py,
G4double Pz )
{
thePolarizationChange.setX(Px);
thePolarizationChange.setY(Py);
thePolarizationChange.setZ(Pz);
}
#endif
source/track/include/G4ParticleChangeForLoss.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForLoss.hh,v 1.12 2004/06/15 08:17:38 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
source/track/include/G4ParticleChangeForMSC.hh
+1 -10
View File
@@ -21,7 +21,7 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForMSC.hh,v 1.7 2004/05/08 15:28:11 kurasige Exp $
// $Id: G4ParticleChangeForMSC.hh,v 1.8 2004/10/19 00:51:29 kurasige Exp $
// GEANT4 tag $ $
//
//
@@ -96,15 +96,6 @@ class G4ParticleChangeForMSC: public G4VParticleChange
void SetProposedPosition(const G4ThreeVector& finalPosition);
// Get/Set the final position of the current particle.
public:
// Following methods will be removed in release 7.0
// Using ProposeXXXX methods is recommended to setting
// properties in G4ParticleChangeForMSC
void SetMomentumChange(const G4ThreeVector& Pfinal);
void SetMomentumChange(G4double Px, G4double Py, G4double Pz);
const G4ThreeVector* GetPositionChange() const;
void SetPositionChange(const G4ThreeVector& finalPosition);
public:
virtual void DumpInfo() const;
// for Debug
source/track/include/G4ParticleChangeForMSC.icc
+2 -27
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForMSC.icc,v 1.5 2004/05/08 15:28:12 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChangeForMSC.icc,v 1.6 2004/10/19 00:51:29 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
@@ -91,28 +91,3 @@ inline void G4ParticleChangeForMSC::Initialize(const G4Track& track)
thePosition = track.GetPosition();
}
// Following methods will be removed in release 7.0
inline
void G4ParticleChangeForMSC::SetMomentumChange(const G4ThreeVector& P)
{
ProposeMomentumDirection(P);
}
inline
void G4ParticleChangeForMSC::SetMomentumChange(G4double Px, G4double Py, G4double Pz)
{
ProposeMomentumDirection(Px, Py, Pz);
}
inline
void G4ParticleChangeForMSC::SetPositionChange(const G4ThreeVector& P)
{
ProposePosition(P);
}
inline
const G4ThreeVector* G4ParticleChangeForMSC::GetPositionChange() const
{
return GetPosition();
}
source/track/include/G4ParticleChangeForRadDecay.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForRadDecay.hh,v 1.5 2003/06/03 08:56:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
source/track/include/G4ParticleChangeForTransport.hh
+8 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.hh,v 1.13 2004/05/08 15:28:13 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChangeForTransport.hh,v 1.15 2004/10/19 00:51:29 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
@@ -48,7 +48,7 @@
#include "G4ParticleChange.hh"
class G4MaterialCutsCouple;
class G4VSensitiveDetector;
class G4ParticleChangeForTransport: public G4ParticleChange
{
@@ -98,18 +98,13 @@ class G4ParticleChangeForTransport: public G4ParticleChange
void SetMaterialCutsCoupleInTouchable(const G4MaterialCutsCouple* fMaterialCutsCouple);
// Get/Set the materialCutsCouple in the touchable of the current particle.
G4VSensitiveDetector* GetSensitiveDetectorInTouchable() const;
void SetSensitiveDetectorInTouchable(G4VSensitiveDetector* fSensitiveDetector);
// Get/Set the sensitive detector in the touchable of the current particle.
G4bool GetMomentumChanged() const;
void SetMomentumChanged(G4bool b);
public:
// Following methods will be removed in release 7.0
// Using ProposeXXXX methods is recommended to setting
// properties in G4ParticleChangeForDecay
G4Material* GetMaterialChange() const;
void SetMaterialChange(G4Material* fMaterial);
const G4MaterialCutsCouple* GetMaterialCutsCoupleChange() const;
void SetMaterialCutsCoupleChange(const G4MaterialCutsCouple* fMaterialCutsCouple);
public:
virtual void DumpInfo() const;
@@ -130,6 +125,7 @@ class G4ParticleChangeForTransport: public G4ParticleChange
// The flag which is set if mometum is changed in this stepi
G4Material* theMaterialChange;
const G4MaterialCutsCouple* theMaterialCutsCoupleChange;
G4VSensitiveDetector* theSensitiveDetectorChange;
// The material (and MaterialCutsCouple) where given track
// currently locates
source/track/include/G4ParticleChangeForTransport.icc
+14 -31
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.icc,v 1.10 2004/05/08 15:28:13 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChangeForTransport.icc,v 1.12 2004/10/19 00:51:30 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
inline
@@ -63,6 +63,18 @@ inline
return theMaterialCutsCoupleChange;
}
inline
void G4ParticleChangeForTransport::SetSensitiveDetectorInTouchable(G4VSensitiveDetector* fSensitiveDetector)
{
theSensitiveDetectorChange = fSensitiveDetector;
}
inline
G4VSensitiveDetector* G4ParticleChangeForTransport::GetSensitiveDetectorInTouchable() const
{
return theSensitiveDetectorChange;
}
inline
G4bool G4ParticleChangeForTransport::GetMomentumChanged() const
{
@@ -128,35 +140,6 @@ G4ParticleChangeForTransport::GetPointerToVectorOfAuxiliaryPoints() const
}
// Following methods will be removed in release 7.0
inline
void G4ParticleChangeForTransport::SetMaterialChange(G4Material* fMaterial)
{
theMaterialChange = fMaterial;
}
inline
G4Material* G4ParticleChangeForTransport::GetMaterialChange() const
{
return theMaterialChange;
}
inline
void G4ParticleChangeForTransport::SetMaterialCutsCoupleChange(const G4MaterialCutsCouple* fMaterialCutsCouple)
{
theMaterialCutsCoupleChange = fMaterialCutsCouple;
}
inline
const G4MaterialCutsCouple* G4ParticleChangeForTransport::GetMaterialCutsCoupleChange() const
{
return theMaterialCutsCoupleChange;
}
source/track/include/G4Step.hh
+5 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Step.hh,v 1.10 2003/06/16 17:12:58 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Step.hh,v 1.11 2004/12/02 06:38:00 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
//---------------------------------------------------------------
@@ -56,8 +56,9 @@
#define G4Step_h 1
#include <stdlib.h> // Include from 'system'
#include "G4ios.hh" // Include from 'system'
#include <iomanip> // Include from 'system'
#include <cmath> // Include from 'system'
#include "G4ios.hh" // Include from 'system'
#include <iomanip> // Include from 'system'
#include "globals.hh" // Include from 'global'
#include "G4ThreeVector.hh" // Include from 'global'
#include "G4VPhysicalVolume.hh" // Include from 'geometry'
source/track/include/G4Step.icc
+3 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Step.icc,v 1.10 2003/03/05 04:42:53 kurasige Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Step.icc,v 1.11 2004/08/12 00:50:09 asaim Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
@@ -183,6 +183,7 @@ inline
fpPreStepPoint->SetTouchableHandle(fpTrack->GetTouchableHandle());
fpPreStepPoint->SetMaterial( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetMaterial());
fpPreStepPoint->SetMaterialCutsCouple( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetMaterialCutsCouple());
fpPreStepPoint->SetSensitiveDetector( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetSensitiveDetector());
fpPreStepPoint->SetPolarization(fpTrack->GetPolarization());
fpPreStepPoint->SetSafety(0.);
fpPreStepPoint->SetStepStatus(fUndefined);
source/track/include/G4StepPoint.hh
+8 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.hh,v 1.13 2003/09/19 19:08:14 kurasige Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// $Id: G4StepPoint.hh,v 1.15 2004/12/02 06:38:01 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
//---------------------------------------------------------------
@@ -47,6 +47,7 @@
#define G4StepPoint_h 1
#include "globals.hh" // Include from 'global'
#include <cmath> // Include from 'system'
#include "G4Allocator.hh" // Include from 'global'
#include "G4ThreeVector.hh" // Include from 'geometry'
#include "G4VPhysicalVolume.hh" // Include from 'geometry'
@@ -58,6 +59,7 @@ class G4VProcess;
#include "G4LogicalVolume.hh"
class G4MaterialCutsCouple;
class G4VSensitiveDetector;
/////////////////
class G4StepPoint
/////////////////
@@ -135,6 +137,9 @@ class G4StepPoint
const G4MaterialCutsCouple* GetMaterialCutsCouple() const;
void SetMaterialCutsCouple(const G4MaterialCutsCouple*);
G4VSensitiveDetector* GetSensitiveDetector() const;
void SetSensitiveDetector(G4VSensitiveDetector*);
G4double GetSafety() const;
void SetSafety(const G4double aValue);
@@ -189,6 +194,7 @@ class G4StepPoint
// Material of the volmue
const G4MaterialCutsCouple* fpMaterialCutsCouple;
// MaterialCutsCouple of the volmue
G4VSensitiveDetector* fpSensitiveDetector;
G4double fSafety;
G4ThreeVector fPolarization;
G4StepStatus fStepStatus;
source/track/include/G4StepPoint.icc
+8 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.icc,v 1.8 2003/05/07 20:08:37 asaim Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4StepPoint.icc,v 1.10 2004/12/02 06:38:01 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
inline const G4ThreeVector& G4StepPoint::GetPosition() const
@@ -69,7 +69,7 @@
inline G4ThreeVector G4StepPoint::GetMomentum() const
{
G4double tMomentum = sqrt(fKineticEnergy*fKineticEnergy +
G4double tMomentum = std::sqrt(fKineticEnergy*fKineticEnergy +
2*fKineticEnergy*fMass);
return G4ThreeVector(fMomentumDirection.x()*tMomentum,
fMomentumDirection.y()*tMomentum,
@@ -168,6 +168,11 @@
void G4StepPoint::SetMaterialCutsCouple(const G4MaterialCutsCouple* materialCutsCouple)
{fpMaterialCutsCouple = materialCutsCouple; }
inline G4VSensitiveDetector* G4StepPoint::GetSensitiveDetector() const
{ return fpSensitiveDetector; }
inline void G4StepPoint::SetSensitiveDetector(G4VSensitiveDetector* aValue)
{ fpSensitiveDetector = aValue; }
inline void G4StepPoint::SetWeight(G4double aValue)
{ fWeight = aValue; }
inline G4double G4StepPoint::GetWeight() const
source/track/include/G4StepStatus.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StepStatus.hh,v 1.3 2001/07/11 10:08:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/include/G4SteppingControl.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SteppingControl.hh,v 1.3 2001/07/11 10:08:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/include/G4Track.hh
+3 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Track.hh,v 1.16 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Track.hh,v 1.17 2004/12/02 06:38:01 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
//---------------------------------------------------------------
@@ -45,6 +45,7 @@
#define G4Track_h 1
#include "globals.hh" // Include from 'global'
#include <cmath> // Include from 'system'
#include "G4ThreeVector.hh" // Include from 'geometry'
#include "G4LogicalVolume.hh" // Include from 'geometry'
#include "G4VPhysicalVolume.hh" // Include from 'geometry'
source/track/include/G4Track.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Track.icc,v 1.13 2004/06/11 14:28:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//-----------------------------------------------------------------
// Definitions of inline functions
source/track/include/G4TrackFastVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackFastVector.hh,v 1.4 2001/07/11 10:08:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// ------------------------------------------------------------
source/track/include/G4TrackStatus.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackStatus.hh,v 1.3 2001/07/11 10:08:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/include/G4VParticleChange.hh
+6 -15
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VParticleChange.hh,v 1.11 2004/05/08 15:28:13 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4VParticleChange.hh,v 1.13 2004/12/02 06:38:01 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
// ------------------------------------------------------------
@@ -67,11 +67,14 @@
// add accuracy leveles 5 May, 99 H.Kurashige
// add check secondaries 11 June, 03 H.Kurashige
// add new methods of ProposeXXX 08 May, 04 H.Kurashige
// remove obsolete methods of SetXXX 19 Sep, 04 H.Kurashige
#ifndef G4VParticleChange_h
#define G4VParticleChange_h 1
#include "globals.hh"
#include "G4ios.hh"
#include <cmath>
class G4Track;
class G4Step;
@@ -186,7 +189,7 @@ class G4VParticleChange
G4bool IsParentWeightSetByProcess() const;
// If fParentWeightByProcess flag is false (true in default),
// G4VParticleChange can change the weight of the parent track,
// in any DoIt by using SetParentWeight(G4double)
// in any DoIt by using ProposeParentWeight(G4double)
void SetSecondaryWeightByProcess(G4bool);
@@ -201,18 +204,6 @@ class G4VParticleChange
void SetVerboseLevel(G4int vLevel);
G4int GetVerboseLevel() const;
public:
// Following methods will be removed in release 7.0
// Using ProposeXXXX methods is recommended to setting
// properties in G4VParticleChange
void SetTrueStepLength(G4double truePathLength);
void SetLocalEnergyDeposit(G4double anEnergyPart);
G4TrackStatus GetStatusChange() const;
void SetStatusChange(G4TrackStatus status);
void SetSteppingControl(G4SteppingControl StepControlFlag);
void SetParentWeight(G4double);
protected:
G4TrackFastVector* theListOfSecondaries;
source/track/include/G4VParticleChange.icc
+3 -40
View File
@@ -21,9 +21,10 @@
// ********************************************************************
//
//
// $Id: G4VParticleChange.icc,v 1.11 2004/05/08 15:28:13 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4VParticleChange.icc,v 1.12 2004/10/19 00:51:30 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// remove obsolete methods of SetXXX 19 Sep, 04 H.Kurashige
//----------------------------------------------------------------
// Virtual methods for updating G4Step
//
@@ -305,41 +306,3 @@ inline
return fSetParentWeightByProcess;
}
// Following methods will be removed in release 7.0
inline
void G4VParticleChange::SetStatusChange(G4TrackStatus aStatus)
{
ProposeTrackStatus(aStatus);
}
inline
G4TrackStatus G4VParticleChange::GetStatusChange() const
{
return GetTrackStatus();
}
inline
void G4VParticleChange::SetSteppingControl(G4SteppingControl StepControlFlag)
{
ProposeSteppingControl(StepControlFlag);
}
inline
void G4VParticleChange::SetLocalEnergyDeposit(G4double anEnergyPart)
{
ProposeLocalEnergyDeposit(anEnergyPart);
}
inline
void G4VParticleChange::SetTrueStepLength(G4double aLength)
{
ProposeTrueStepLength(aLength);
}
inline
void G4VParticleChange::SetParentWeight(G4double w)
{
ProposeParentWeight(w);
}
source/track/include/G4VUserTrackInformation.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VUserTrackInformation.hh,v 1.4 2003/05/09 20:42:27 asaim Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4VUserTrackInformation.hh,v 1.5 2004/11/26 06:47:00 asaim Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
@@ -56,8 +56,8 @@
class G4VUserTrackInformation
{
public:
G4VUserTrackInformation() {;}
virtual ~G4VUserTrackInformation() {;}
G4VUserTrackInformation();
virtual ~G4VUserTrackInformation();
public:
virtual void Print() const = 0;
source/track/src/G4ParticleChange.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChange.cc,v 1.26 2004/05/08 15:28:13 kurasige Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParticleChange.cc,v 1.27 2004/12/02 06:38:02 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
// --------------------------------------------------------------
@@ -428,7 +428,7 @@ G4bool G4ParticleChange::CheckIt(const G4Track& aTrack)
// MomentumDirection should be unit vector
G4bool itsOKforMomentum = true;
if ( theEnergyChange >0.) {
accuracy = abs(theMomentumDirectionChange.mag2()-1.0);
accuracy = std::abs(theMomentumDirectionChange.mag2()-1.0);
if (accuracy > accuracyForWarning) {
#ifdef G4VERBOSE
G4cout << " G4ParticleChange::CheckIt : ";
source/track/src/G4ParticleChangeForDecay.cc
+13 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForDecay.cc,v 1.9 2003/06/19 14:45:07 gunter Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// $Id: G4ParticleChangeForDecay.cc,v 1.10 2004/09/21 21:32:32 gum Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// --------------------------------------------------------------
@@ -64,6 +64,7 @@ G4ParticleChangeForDecay::~G4ParticleChangeForDecay()
G4ParticleChangeForDecay::G4ParticleChangeForDecay(const G4ParticleChangeForDecay &right): G4VParticleChange(right)
{
theTimeChange = right.theTimeChange;
thePolarizationChange = right.thePolarizationChange;
}
@@ -78,7 +79,8 @@ G4ParticleChangeForDecay & G4ParticleChangeForDecay::operator=(const G4ParticleC
theLocalEnergyDeposit = right.theLocalEnergyDeposit;
theSteppingControlFlag = right.theSteppingControlFlag;
theTimeChange = right.theTimeChange;
theTimeChange = right.theTimeChange;
thePolarizationChange = right.thePolarizationChange;
}
return *this;
}
@@ -101,8 +103,13 @@ void G4ParticleChangeForDecay::Initialize(const G4Track& track)
// use base class's method at first
G4VParticleChange::Initialize(track);
const G4DynamicParticle* pParticle = track.GetDynamicParticle();
// set Time e equal to those of the parent track
theTimeChange = track.GetGlobalTime();
// set the Polarization equal to those of the parent track
thePolarizationChange = pParticle->GetPolarization();
}
//----------------------------------------------------------------
@@ -122,6 +129,9 @@ G4Step* G4ParticleChangeForDecay::UpdateStepForAtRest(G4Step* pStep)
G4StepPoint* pPreStepPoint = pStep->GetPreStepPoint();
G4StepPoint* pPostStepPoint = pStep->GetPostStepPoint();
// update polarization
pPostStepPoint->SetPolarization( thePolarizationChange );
// update time
pPostStepPoint->SetGlobalTime( theTimeChange );
source/track/src/G4ParticleChangeForLoss.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForLoss.cc,v 1.13 2004/06/15 08:17:38 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// --------------------------------------------------------------
source/track/src/G4ParticleChangeForMSC.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForMSC.cc,v 1.11 2004/01/20 15:29:41 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4ParticleChangeForMSC.cc,v 1.12 2004/12/02 06:38:05 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
// --------------------------------------------------------------
@@ -161,7 +161,7 @@ G4bool G4ParticleChangeForMSC::CheckIt(const G4Track& aTrack)
// check
// MomentumDirection should be unit vector
accuracy = abs(theMomentumDirection.mag2()-1.0);
accuracy = std::abs(theMomentumDirection.mag2()-1.0);
if (accuracy > accuracyForWarning) {
#ifdef G4VERBOSE
G4cout << " G4ParticleChangeForMSC::CheckIt : ";
source/track/src/G4ParticleChangeForTransport.cc
+4 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.cc,v 1.16 2004/01/20 15:29:41 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4ParticleChangeForTransport.cc,v 1.17 2004/08/12 00:50:11 asaim Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// --------------------------------------------------------------
@@ -81,6 +81,7 @@ G4ParticleChangeForTransport & G4ParticleChangeForTransport::operator=(const G4P
theTouchableHandle = right.theTouchableHandle;
theMaterialChange = right.theMaterialChange;
theMaterialCutsCoupleChange = right.theMaterialCutsCoupleChange;
theSensitiveDetectorChange = right.theSensitiveDetectorChange;
theMomentumDirectionChange = right.theMomentumDirectionChange;
thePolarizationChange = right.thePolarizationChange;
thePositionChange = right.thePositionChange;
@@ -204,6 +205,7 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForPostStep(G4Step* pStep)
pPostStepPoint->SetMaterial( theMaterialChange );
pPostStepPoint->SetMaterialCutsCouple( theMaterialCutsCoupleChange );
pPostStepPoint->SetSensitiveDetector( theSensitiveDetectorChange );
}
// It used to call base class's method
// - but this would copy uninitialised data members
source/track/src/G4Step.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Step.cc,v 1.5 2001/07/11 10:08:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
source/track/src/G4StepPoint.cc
+5 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.cc,v 1.9 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4StepPoint.cc,v 1.10 2004/08/12 00:50:11 asaim Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
//---------------------------------------------------------------
@@ -46,7 +46,7 @@
//////////////////////////
G4StepPoint::G4StepPoint():
//////////////////////////
fpTouchable(0), fpMaterial(0), fpMaterialCutsCouple(0),
fpTouchable(0), fpMaterial(0), fpMaterialCutsCouple(0), fpSensitiveDetector(0),
fpProcessDefinedStep(0), fCharge(0.)
{
}
@@ -64,6 +64,7 @@ G4StepPoint::G4StepPoint(const G4StepPoint &right):
fpTouchable(right.fpTouchable),
fpMaterial(right.fpMaterial),
fpMaterialCutsCouple(right.fpMaterialCutsCouple),
fpSensitiveDetector(right.fpSensitiveDetector),
fSafety(right.fSafety),
fPolarization(right.fPolarization),
fStepStatus(right.fStepStatus),
@@ -88,6 +89,7 @@ G4StepPoint & G4StepPoint::operator=(const G4StepPoint &right)
fpTouchable = right.fpTouchable;
fpMaterial = right.fpMaterial;
fpMaterialCutsCouple = right.fpMaterialCutsCouple;
fpSensitiveDetector = right.fpSensitiveDetector;
fSafety = right.fSafety;
fPolarization = right.fPolarization;
fStepStatus = right.fStepStatus;
source/track/src/G4Track.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Track.cc,v 1.21 2004/06/11 14:28:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4Track.cc,v 1.22 2004/12/02 06:38:17 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
//---------------------------------------------------------------
@@ -180,7 +180,7 @@ G4double G4Track::GetVelocity() const
}
} else {
G4double T = fpDynamicParticle->GetKineticEnergy();
velocity = c_light*sqrt(T*(T+2.*mass))/(T+mass) ;
velocity = c_light*std::sqrt(T*(T+2.*mass))/(T+mass) ;
}
return velocity ;
source/track/src/G4VParticleChange.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VParticleChange.cc,v 1.16 2003/12/12 13:12:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// $Id: G4VParticleChange.cc,v 1.17 2004/12/02 06:38:21 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
// --------------------------------------------------------------
@@ -261,7 +261,7 @@ G4bool G4VParticleChange::CheckSecondary(G4Track& aTrack)
// MomentumDirection should be unit vector
G4bool itsOKforMomentum = true;
accuracy = abs((aTrack.GetMomentumDirection()).mag2()-1.0);
accuracy = std::abs((aTrack.GetMomentumDirection()).mag2()-1.0);
if (accuracy > accuracyForWarning) {
#ifdef G4VERBOSE
G4cout << " G4VParticleChange::CheckSecondary : ";
source/track/src/G4VUserTrackInformation.cc
+35
View File
@@ -0,0 +1,35 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4VUserTrackInformation.cc,v 1.1 2004/11/26 06:47:00 asaim Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
//
// --------------------------------------------------------------
#include "G4VUserTrackInformation.hh"
G4VUserTrackInformation::G4VUserTrackInformation()
{;}
G4VUserTrackInformation::~G4VUserTrackInformation()
{;}