Import Geant4 2.0.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.2 1999/11/25 14:35:00 japost Exp $
|
||||
$Id: History,v 1.4 2000/06/19 16:23:46 japost Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,21 @@ committal in the CVS repository !
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
Jun 19, 2000 J. Apostolakis transport-V01-01-02
|
||||
|
||||
G4Transportation.cc: Set the True Step Length in G4Transportation.cc
|
||||
|
||||
(Cosmetic: updated other files to the head - as there were no differences from it.)
|
||||
|
||||
|
||||
May 15, 2000 J. Apostolakis transport-V01-01-01
|
||||
|
||||
G4Transportation.cc: Set the material in materialChange, in order to get correct
|
||||
behaviour for volumes that parameterise the material.
|
||||
(Fix is dependant on changes to particleChangeForTransport and StepPoint)
|
||||
|
||||
Modified setting of touchable change, in order to preserve const-ness where it exists.
|
||||
|
||||
|
||||
Nov 25, 1999 J. Apostolakis transport-V00-01-01
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Transportation.hh,v 1.1.10.1 1999/12/07 20:52:55 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4Transportation.hh,v 1.2 1999/12/15 14:53:49 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Transportation.icc,v 1.1.10.1 1999/12/07 20:52:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4Transportation.icc,v 1.2 1999/12/15 14:53:50 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
//
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4UserSpecialCuts.hh,v 1.2.2.1 1999/12/07 20:52:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4UserSpecialCuts.hh,v 1.3 1999/12/15 14:53:50 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
// ------------------------------------------------------------
|
||||
// 15 April 1998 M.Maire
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -5,8 +5,9 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Transportation.cc,v 1.7.2.1.2.1 1999/12/08 17:35:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4Transportation.cc,v 1.11 2000/06/19 16:13:48 japost Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
@@ -288,6 +289,8 @@ G4double G4Transportation::AlongStepGetPhysicalInteractionLength(
|
||||
#endif
|
||||
}
|
||||
|
||||
fParticleChange.SetTrueStepLength(geometryStepLength) ;
|
||||
|
||||
return geometryStepLength;
|
||||
}
|
||||
|
||||
@@ -371,7 +374,7 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
|
||||
const G4Step& stepData
|
||||
)
|
||||
{
|
||||
G4VTouchable* retCurrentTouchable; // The one to return
|
||||
const G4VTouchable* retCurrentTouchable; // The one to return
|
||||
|
||||
// Initialize ParticleChange (by setting all its members equal
|
||||
// to corresponding members in G4Track)
|
||||
@@ -403,6 +406,7 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
|
||||
fParticleChange.SetStatusChange( fStopAndKill ) ;
|
||||
}
|
||||
retCurrentTouchable= fCurrentTouchable;
|
||||
fParticleChange.SetTouchableChange( fCurrentTouchable );
|
||||
}
|
||||
else{ // fGeometryLimitedStep is false
|
||||
#ifdef G4DEBUG
|
||||
@@ -458,8 +462,11 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
|
||||
assert( fCurrentTouchable->GetVolume()->GetName() ==
|
||||
track.GetVolume()->GetName() );
|
||||
retCurrentTouchable = fCurrentTouchable;
|
||||
fParticleChange.SetTouchableChange( fCurrentTouchable );
|
||||
|
||||
}else{
|
||||
retCurrentTouchable = track.GetTouchable();
|
||||
fParticleChange.SetTouchableChange( track.GetTouchable() );
|
||||
}
|
||||
// This must be done in the above if ( AtSur ) fails
|
||||
// We also do it for if (true) in order to get debug/opt to
|
||||
@@ -476,11 +483,22 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
|
||||
// overwrite the (unset) one in particle change)
|
||||
// Although in general this is fCurrentTouchable, at the start of
|
||||
// a step it could be different ... ??
|
||||
fParticleChange.SetTouchableChange( track.GetTouchable() );
|
||||
retCurrentTouchable = track.GetTouchable();
|
||||
#endif
|
||||
|
||||
} // endif ( fGeometryLimitedStep )
|
||||
|
||||
const G4VPhysicalVolume *pNewVol = retCurrentTouchable->GetVolume();
|
||||
const G4Material *pNewMaterial=0;
|
||||
if( pNewVol != 0 ) pNewMaterial= pNewVol->GetLogicalVolume()->GetMaterial();
|
||||
|
||||
// ( <const_cast> pNewMaterial );
|
||||
fParticleChange.SetMaterialChange( (G4Material *) pNewMaterial );
|
||||
// temporarily until Get/Set Material of ParticleChange,
|
||||
// and StepPoint can be made const.
|
||||
|
||||
|
||||
// Set the touchable in ParticleChange
|
||||
// this must always be done because the particle change always
|
||||
// uses this value to overwrite the current touchable pointer.
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4UserSpecialCuts.cc,v 1.2.2.1.2.1 1999/12/08 17:35:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4UserSpecialCuts.cc,v 1.3 1999/12/15 14:53:51 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
// History
|
||||
|
||||
Reference in New Issue
Block a user