Import Geant4 5.1.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 10:15:15 +02:00
parent 37fff30d2e
commit fbd4999cf7
4396 changed files with 56662 additions and 52446 deletions
+18 -2
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.49 2002/12/04 22:45:58 tsasaki Exp $
$Id: History,v 1.52 2003/03/05 04:42:49 kurasige Exp $
-------------------------------------------------------------------
=========================================================
@@ -16,7 +16,23 @@ committal in the CVS repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Dec. 04, 02 T.Sasaki(track-V04-01-03)
Mar. 5, 02 H.Kurashige (track-V05-00-02)
- Fix in G4Step::InitializeStep().
Added initialization of fCharge in StepPoint.
Jan. 24, 02 G.Cosmo (track-V05-00-01)
- Fix in G4ParticleChangeForTransport::UpdateStepForPostStep().
Added call for setting the material-cuts-couple for pPostStepPoint
(V.Ivantchenko).
Dec. 16, 02 G.Cosmo (track-V05-00-00)
- Merged branch "geant4-04-01-ref-02-cuts-branch" to HEAD.
Included development for 'cuts-by-region':
o Updated G4Track, G4Step, G4StepPoint and G4ParticleChangeForTransport
to properly handle new G4MaterialCutsCouple.
Dec. 04, 02 T.Sasaki (track-V04-01-03)
- Initial value for fCharge is given in the constuctor
of G4StepPoint.
Nov. 20, 02 G.Cosmo (track-V04-01-02)
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChange.hh,v 1.9 2001/11/21 14:05:57 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChange.icc,v 1.9 2001/10/20 08:07:49 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
inline
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForDecay.hh,v 1.5 2001/07/11 10:08:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForLoss.hh,v 1.4 2001/07/11 10:08:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForMSC.icc,v 1.4 2001/07/11 10:08:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForRadDecay.hh,v 1.4 2001/10/24 05:41:46 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.hh,v 1.9 2002/11/01 15:55:30 jacek Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4ParticleChangeForTransport.hh,v 1.10 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
@@ -34,6 +34,7 @@
// Added theMaterialChange 16 FEb. 2000 H.Kurahige
// Remove thePolarizationChange 12 Feb. 2001 H.Kurashige
// Modification for G4TouchableHandle 22 Oct. 2001 R.Chytracek
// Add MaterialCutsCouple 8 Oct. 2002 H.Kurashige
//
// Class Description
// This class is a concrete class for ParticleChange for transportation
@@ -45,6 +46,7 @@
#include "G4ios.hh"
#include "G4TouchableHandle.hh"
#include "G4ParticleChange.hh"
#include "G4MaterialCutsCouple.hh"
class G4ParticleChangeForTransport: public G4ParticleChange
@@ -57,7 +59,7 @@ class G4ParticleChangeForTransport: public G4ParticleChange
virtual ~G4ParticleChangeForTransport();
protected:
// hide copy constructor and assignment operaor as protected
// hide copy constructor and assignment operator as protected
G4ParticleChangeForTransport(const G4ParticleChangeForTransport &right);
G4ParticleChangeForTransport & operator=(const G4ParticleChangeForTransport &right);
@@ -91,6 +93,10 @@ class G4ParticleChangeForTransport: public G4ParticleChange
void SetMaterialChange(G4Material* fMaterial);
// Get/Set the material in the touchable of the current particle.
const G4MaterialCutsCouple* GetMaterialCutsCoupleChange() const;
void SetMaterialCutsCoupleChange(const G4MaterialCutsCouple* fMaterialCutsCouple);
// Get/Set the materialCutsCouple in the touchable of the current particle.
G4bool GetMomentumChanged() const;
void SetMomentumChanged(G4bool b);
@@ -101,28 +107,24 @@ class G4ParticleChangeForTransport: public G4ParticleChange
G4TouchableHandle theTouchableHandle;
// The changed touchable of a given particle.
public:
// Prototype implementation of smooth representation of curved trajectories.
// Auxiliary points are ThreeVectors for now; change to G4AuxiliaryPoints.
inline void SetPointerToVectorOfAuxiliaryPoints( G4std::vector<G4ThreeVector>* theNewVectorPointer );
inline G4std::vector<G4ThreeVector>* GetPointerToVectorOfAuxiliaryPoints() const;
private:
G4bool isMomentumChanged;
// The flag which is set if mometum is changed in this stepi
G4Material* theMaterialChange;
// The material where given track currently locates
// Prototyping implementation of smooth representation of curved
// trajectories. (jacek 30/10/2002)
public:
// Auxiliary points are ThreeVectors for now; change to
// G4AuxiliaryPoints or some such (jacek 30/10/2002)
void SetPointerToVectorOfAuxiliaryPoints( G4std::vector<G4ThreeVector>* theNewVectorPointer ) {
fpVectorOfAuxiliaryPointsPointer = theNewVectorPointer;
}
G4std::vector<G4ThreeVector>* GetPointerToVectorOfAuxiliaryPoints() const {
return fpVectorOfAuxiliaryPointsPointer;
}
private:
// Explicity including the word "Pointer" in the name as I keep
// forgetting the * (jacek 30/10/2002)
G4std::vector<G4ThreeVector>* fpVectorOfAuxiliaryPointsPointer;
const G4MaterialCutsCouple* theMaterialCutsCoupleChange;
// The material (and MaterialCutsCouple) where given track
// currently locates
private:
G4std::vector<G4ThreeVector>* fpVectorOfAuxiliaryPointsPointer;
};
#include "G4ParticleChangeForTransport.icc"
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.icc,v 1.7 2001/10/22 04:19:40 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4ParticleChangeForTransport.icc,v 1.8 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
inline
@@ -51,6 +51,18 @@ inline
return theMaterialChange;
}
inline
void G4ParticleChangeForTransport::SetMaterialCutsCoupleChange(const G4MaterialCutsCouple* fMaterialCutsCouple)
{
theMaterialCutsCoupleChange = fMaterialCutsCouple;
}
inline
const G4MaterialCutsCouple* G4ParticleChangeForTransport::GetMaterialCutsCoupleChange() const
{
return theMaterialCutsCoupleChange;
}
inline
G4bool G4ParticleChangeForTransport::GetMomentumChanged() const
{
@@ -99,4 +111,18 @@ inline void G4ParticleChangeForTransport::Initialize(const G4Track& track)
// (P. Urban)
}
// Prototype implementation of smooth representation of curved trajectories.
inline void
G4ParticleChangeForTransport::
SetPointerToVectorOfAuxiliaryPoints( G4std::vector<G4ThreeVector>*
theNewVectorPointer )
{
fpVectorOfAuxiliaryPointsPointer = theNewVectorPointer;
}
inline G4std::vector<G4ThreeVector>*
G4ParticleChangeForTransport::GetPointerToVectorOfAuxiliaryPoints() const
{
return fpVectorOfAuxiliaryPointsPointer;
}
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Step.hh,v 1.9 2002/11/01 15:55:30 jacek Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+6 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Step.icc,v 1.8 2002/10/31 23:41:52 tsasaki Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4Step.icc,v 1.10 2003/03/05 04:42:53 kurasige Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
@@ -182,11 +182,13 @@ inline
fpPreStepPoint->SetVelocity(fpTrack->GetVelocity());
fpPreStepPoint->SetTouchableHandle(fpTrack->GetTouchableHandle());
fpPreStepPoint->SetMaterial( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetMaterial());
fpPreStepPoint->SetMaterialCutsCouple( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetMaterialCutsCouple());
fpPreStepPoint->SetPolarization(fpTrack->GetPolarization());
fpPreStepPoint->SetSafety(0.);
fpPreStepPoint->SetStepStatus(fUndefined);
fpPreStepPoint->SetProcessDefinedStep(0);
fpPreStepPoint->SetMass(fpTrack->GetDynamicParticle()->GetMass());
fpPreStepPoint->SetCharge(fpTrack->GetDynamicParticle()->GetCharge());
fpPreStepPoint->SetWeight(fpTrack->GetWeight());
@@ -232,3 +234,5 @@ inline
+9 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.hh,v 1.9 2001/10/22 04:19:40 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4StepPoint.hh,v 1.10 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
@@ -41,6 +41,7 @@
//
// ---------------------------------------------------------------
// Added fpMaterial 16 FEb. 2000 H.Kurahige
// Added fpMaterialCutsCouple 8 Oct. 2002 H.Kurahige
#ifndef G4StepPoint_h
#define G4StepPoint_h 1
@@ -54,6 +55,7 @@ class G4VProcess;
#include "G4StepStatus.hh" // Include from 'track'
#include "G4TouchableHandle.hh" // Include from 'geometry'
#include "G4Material.hh"
#include "G4MaterialCutsCouple.hh"
#include "G4LogicalVolume.hh"
/////////////////
@@ -130,6 +132,9 @@ class G4StepPoint
G4Material* GetMaterial() const;
void SetMaterial(G4Material*);
const G4MaterialCutsCouple* GetMaterialCutsCouple() const;
void SetMaterialCutsCouple(const G4MaterialCutsCouple*);
G4double GetSafety() const;
void SetSafety(const G4double aValue);
@@ -182,6 +187,8 @@ class G4StepPoint
// Touchable Handle
G4Material* fpMaterial;
// Material of the volmue
const G4MaterialCutsCouple* fpMaterialCutsCouple;
// MaterialCutsCouple of the volmue
G4double fSafety;
G4ThreeVector fPolarization;
G4StepStatus fStepStatus;
+9 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.icc,v 1.5 2001/10/22 04:19:40 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4StepPoint.icc,v 1.6 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
inline const G4ThreeVector& G4StepPoint::GetPosition() const
@@ -161,6 +161,13 @@
inline void G4StepPoint::SetMaterial(G4Material* material)
{fpMaterial = material; }
inline
const G4MaterialCutsCouple* G4StepPoint::GetMaterialCutsCouple() const
{ return fpMaterialCutsCouple; }
inline
void G4StepPoint::SetMaterialCutsCouple(const G4MaterialCutsCouple* materialCutsCouple)
{fpMaterialCutsCouple = materialCutsCouple; }
inline void G4StepPoint::SetWeight(G4double aValue)
{ fWeight = aValue; }
inline G4double G4StepPoint::GetWeight() const
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+7 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Track.hh,v 1.15 2001/12/14 09:59:35 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4Track.hh,v 1.16 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
@@ -39,6 +39,7 @@
//
//---------------------------------------------------------------
// Modification for G4TouchableHandle 22 Oct. 2001 R.Chytracek
// Add MaterialCutCouple 08 Oct. 2002 H.Kurashige
#ifndef G4Track_h
#define G4Track_h 1
@@ -56,6 +57,7 @@
#include "G4Material.hh"
class G4Step; // Forward declaration
class G4MaterialCutsCouple;
//////////////
class G4Track
@@ -134,6 +136,9 @@ public: // With description
G4Material* GetMaterial() const;
G4Material* GetNextMaterial() const;
const G4MaterialCutsCouple* GetMaterialCutsCouple() const;
const G4MaterialCutsCouple* GetNextMaterialCutsCouple() const;
const G4VTouchable* GetTouchable() const;
const G4TouchableHandle& GetTouchableHandle() const;
void SetTouchableHandle( const G4TouchableHandle& apValue);
+11 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Track.icc,v 1.9 2001/12/13 15:31:24 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4Track.icc,v 1.10 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//-----------------------------------------------------------------
// Definitions of inline functions
@@ -108,6 +108,15 @@
inline G4VPhysicalVolume* G4Track::GetNextVolume() const
{ return fpNextTouchable->GetVolume(); }
// material
inline
const G4MaterialCutsCouple* G4Track::GetMaterialCutsCouple() const
{ return fpStep->GetPreStepPoint()->GetMaterialCutsCouple(); }
inline
const G4MaterialCutsCouple* G4Track::GetNextMaterialCutsCouple() const
{ return fpStep->GetPostStepPoint()->GetMaterialCutsCouple(); }
// material
inline G4Material* G4Track::GetMaterial() const
{ return fpStep->GetPreStepPoint()->GetMaterial(); }
@@ -287,13 +296,3 @@
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VParticleChange.hh,v 1.8 2002/11/20 16:52:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// ------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VParticleChange.icc,v 1.9 2001/12/24 05:14:39 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//----------------------------------------------------------------
// Virtual methods for updating G4Step
@@ -22,7 +22,7 @@
//
//
// $Id: G4VUserTrackInformation.hh,v 1.3 2001/07/11 10:08:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChange.cc,v 1.21 2001/12/24 05:14:40 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForDecay.cc,v 1.7 2001/08/16 08:17:59 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForLoss.cc,v 1.6 2001/07/11 10:08:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleChangeForMSC.cc,v 1.8 2001/08/16 08:17:59 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleChangeForTransport.cc,v 1.12 2002/11/01 15:55:45 jacek Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4ParticleChangeForTransport.cc,v 1.14 2003/01/22 17:54:56 vnivanch Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------
@@ -79,6 +79,7 @@ G4ParticleChangeForTransport & G4ParticleChangeForTransport::operator=(const G4P
theStatusChange = right.theStatusChange;
theTouchableHandle = right.theTouchableHandle;
theMaterialChange = right.theMaterialChange;
theMaterialCutsCoupleChange = right.theMaterialCutsCoupleChange;
theMomentumDirectionChange = right.theMomentumDirectionChange;
thePolarizationChange = right.thePolarizationChange;
thePositionChange = right.thePositionChange;
@@ -199,6 +200,7 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForPostStep(G4Step* pStep)
pPostStepPoint->SetTouchableHandle( theTouchableHandle );
pPostStepPoint->SetMaterial( theMaterialChange );
pPostStepPoint->SetMaterialCutsCouple( theMaterialCutsCoupleChange );
// It used to call base class's method
// - but this would copy uninitialised data members
+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-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+6 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StepPoint.cc,v 1.8 2002/12/04 22:46:00 tsasaki Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4StepPoint.cc,v 1.9 2002/12/16 11:59:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
@@ -46,9 +46,9 @@
//////////////////////////
G4StepPoint::G4StepPoint():
//////////////////////////
fpTouchable(0),fpMaterial(0),fpProcessDefinedStep(0),fCharge(0.)
fpTouchable(0), fpMaterial(0), fpMaterialCutsCouple(0),
fpProcessDefinedStep(0), fCharge(0.)
{
}
//////////////////////////
@@ -63,6 +63,7 @@ G4StepPoint::G4StepPoint(const G4StepPoint &right):
fVelocity(right.fVelocity),
fpTouchable(right.fpTouchable),
fpMaterial(right.fpMaterial),
fpMaterialCutsCouple(right.fpMaterialCutsCouple),
fSafety(right.fSafety),
fPolarization(right.fPolarization),
fStepStatus(right.fStepStatus),
@@ -86,6 +87,7 @@ G4StepPoint & G4StepPoint::operator=(const G4StepPoint &right)
fKineticEnergy = right.fKineticEnergy;
fpTouchable = right.fpTouchable;
fpMaterial = right.fpMaterial;
fpMaterialCutsCouple = right.fpMaterialCutsCouple;
fSafety = right.fSafety;
fPolarization = right.fPolarization;
fStepStatus = right.fStepStatus;
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Track.cc,v 1.18 2002/02/12 01:48:53 kurasige Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//---------------------------------------------------------------
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VParticleChange.cc,v 1.11 2002/11/20 16:52:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// --------------------------------------------------------------