Import Geant4 10.3.0.beta source tree
This commit is contained in:
+10
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History 93028 2015-09-30 16:09:00Z gcosmo $
|
||||
$Id: History 96764 2016-05-04 13:09:31Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -17,6 +17,15 @@ committal in the CVS repository !
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
|
||||
- May 4, 2016 H.Kurashige(track-V10-02-01)
|
||||
- Use G4Log in G4VelocityTable::Value()
|
||||
|
||||
- January 12, 2016 M.Asai (track-V10-02-00)
|
||||
- Chnage G4VUserTrackInformation pointer in G4Track to mutable
|
||||
and set-method to be const-method. This allows the user to
|
||||
set his/her G4VUserTrackInformation pointer without casting
|
||||
G4Track const pointer.
|
||||
|
||||
- September 29, 2015 H.Kurashige (track-V10-01-10)
|
||||
- Add GetNumberOfSecondariesInCurrrentStep method to G4Step
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Track.hh 91231 2015-06-26 10:40:45Z gcosmo $
|
||||
// $Id: G4Track.hh 94983 2016-01-13 11:02:33Z gcosmo $
|
||||
//
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
@@ -258,7 +258,7 @@ public: // With description
|
||||
|
||||
// User information
|
||||
G4VUserTrackInformation* GetUserInformation() const;
|
||||
void SetUserInformation(G4VUserTrackInformation* aValue);
|
||||
void SetUserInformation(G4VUserTrackInformation* aValue) const;
|
||||
|
||||
// Velocity table
|
||||
static void SetVelocityTableProperties(G4double t_max, G4double t_min, G4int nbin);
|
||||
@@ -312,7 +312,7 @@ public: // With description
|
||||
const G4VProcess* fpCreatorProcess; // Process which created the track
|
||||
G4int fCreatorModelIndex; // Index of the physics model which created the track
|
||||
|
||||
G4VUserTrackInformation* fpUserInformation;
|
||||
mutable G4VUserTrackInformation* fpUserInformation;
|
||||
|
||||
// cached values for CalculateVelocity
|
||||
mutable G4Material* prev_mat;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Track.icc 83388 2014-08-21 14:29:33Z gcosmo $
|
||||
// $Id: G4Track.icc 94983 2016-01-13 11:02:33Z gcosmo $
|
||||
//
|
||||
//-----------------------------------------------------------------
|
||||
// Definitions of inline functions
|
||||
@@ -310,7 +310,7 @@ extern G4TRACK_DLL G4ThreadLocal G4Allocator<G4Track> *aTrackAllocator;
|
||||
// user information
|
||||
inline G4VUserTrackInformation* G4Track::GetUserInformation() const
|
||||
{ return fpUserInformation; }
|
||||
inline void G4Track::SetUserInformation(G4VUserTrackInformation* aValue)
|
||||
inline void G4Track::SetUserInformation(G4VUserTrackInformation* aValue) const
|
||||
{ fpUserInformation = aValue; }
|
||||
|
||||
inline const G4Step* G4Track::GetStep() const
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VelocityTable.cc 69005 2013-04-15 09:26:47Z gcosmo $
|
||||
// $Id: G4VelocityTable.cc 96764 2016-05-04 13:09:31Z gcosmo $
|
||||
//
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "G4PhysicalConstants.hh"
|
||||
#include "G4StateManager.hh"
|
||||
#include "G4ApplicationState.hh"
|
||||
#include "G4Log.hh"
|
||||
|
||||
#include "G4ios.hh"
|
||||
|
||||
@@ -72,9 +73,10 @@ G4VelocityTable::~G4VelocityTable()
|
||||
void G4VelocityTable::PrepareVelocityTable()
|
||||
///////////////////
|
||||
{
|
||||
const G4double g4log10 = std::log(10.);
|
||||
|
||||
dataVector.clear();
|
||||
binVector.clear();
|
||||
|
||||
dBin = std::log10(maxT/minT)/NbinT;
|
||||
baseBin = std::log10(minT)/dBin;
|
||||
|
||||
@@ -82,8 +84,6 @@ void G4VelocityTable::PrepareVelocityTable()
|
||||
dataVector.reserve(numberOfNodes);
|
||||
binVector.reserve(numberOfNodes);
|
||||
|
||||
const G4double g4log10 = std::log(10.);
|
||||
|
||||
binVector.push_back(minT);
|
||||
dataVector.push_back(0.0);
|
||||
|
||||
@@ -117,7 +117,8 @@ size_t G4VelocityTable::FindBinLocation(G4double theEnergy) const
|
||||
// not through pointers or references. In this case, the 'inline' will
|
||||
// be invoked. (See R.B.Murray, "C++ Strategies and Tactics", Chap.6.6)
|
||||
|
||||
return size_t( std::log10(theEnergy)/dBin - baseBin );
|
||||
const G4double g4log10 = G4Log(10.);
|
||||
return size_t( G4Log(theEnergy)/dBin/g4log10 - baseBin );
|
||||
}
|
||||
|
||||
G4double G4VelocityTable::Value(G4double theEnergy)
|
||||
|
||||
Reference in New Issue
Block a user