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

Import Geant4 10.5.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-04-17 10:39:02 +02:00
parent a7fdc52004
commit 28a70706e0
661 changed files with 55791 additions and 106984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/event/History
+13
View File
@@ -16,6 +16,19 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
March 11th, 2019 G. Cosmo (event-V10-04-09)
- Fixed typos in printouts in G4GeneralParticleSourceMessenger.
January 31st, 2019 I. Hrivnacova
- Merged GitHub PR #4: all Boolean operators now return G4bool.
January 28th, 2019 M. Asai
- G4HEPEvtInterface.cc : Clean up G4Exception seviorities when
end-of-file is detected.
December 14th, 2018 M. Asai
- G4PrimaryTransformer.cc : Allowing absolute zero proper decay time.
November 9th, 2018 G. Cosmo (event-V10-04-08)
- Fixed printout typos.
source/event/include/G4Event.hh
+2 -2
View File
@@ -58,8 +58,8 @@ class G4Event
inline void *operator new(size_t);
inline void operator delete(void* anEvent);
G4int operator==(const G4Event &right) const;
G4int operator!=(const G4Event &right) const;
G4bool operator==(const G4Event &right) const;
G4bool operator!=(const G4Event &right) const;
public: // with description
void Print() const;
source/event/include/G4HEPEvtParticle.hh
+2 -2
View File
@@ -51,8 +51,8 @@ class G4HEPEvtParticle
~G4HEPEvtParticle();
G4HEPEvtParticle & operator=(const G4HEPEvtParticle &right);
G4int operator==(const G4HEPEvtParticle &right) const;
G4int operator!=(const G4HEPEvtParticle &right) const;
G4bool operator==(const G4HEPEvtParticle &right) const;
G4bool operator!=(const G4HEPEvtParticle &right) const;
private:
G4PrimaryParticle * theParticle;
source/event/include/G4ParticleGun.hh
+2 -2
View File
@@ -75,8 +75,8 @@ class G4ParticleGun:public G4VPrimaryGenerator
private:
G4ParticleGun(const G4ParticleGun&) = delete;
const G4ParticleGun & operator=(const G4ParticleGun&) = delete;
G4int operator==(const G4ParticleGun&) const = delete;
G4int operator!=(const G4ParticleGun&) const = delete;
G4bool operator==(const G4ParticleGun&) const = delete;
G4bool operator!=(const G4ParticleGun&) const = delete;
public: // with description
virtual void GeneratePrimaryVertex(G4Event* evt);
source/event/include/G4SmartTrackStack.hh
+2 -2
View File
@@ -51,8 +51,8 @@ class G4SmartTrackStack
private:
const G4SmartTrackStack & operator=
(const G4SmartTrackStack &right);
G4int operator==(const G4SmartTrackStack &right) const;
G4int operator!=(const G4SmartTrackStack &right) const;
G4bool operator==(const G4SmartTrackStack &right) const;
G4bool operator!=(const G4SmartTrackStack &right) const;
public:
void PushToStack(const G4StackedTrack& aStackedTrack);
source/event/include/G4StackManager.hh
+2 -2
View File
@@ -66,8 +66,8 @@ class G4StackManager
private:
const G4StackManager& operator=(const G4StackManager &right);
G4int operator==(const G4StackManager &right) const;
G4int operator!=(const G4StackManager &right) const;
G4bool operator==(const G4StackManager &right) const;
G4bool operator!=(const G4StackManager &right) const;
public:
G4int PushOneTrack(G4Track *newTrack, G4VTrajectory *newTrajectory = 0);
source/event/include/G4TrackStack.hh
+2 -2
View File
@@ -54,8 +54,8 @@ public:
private:
const G4TrackStack & operator=(const G4TrackStack &right);
G4int operator==(const G4TrackStack &right) const;
G4int operator!=(const G4TrackStack &right) const;
G4bool operator==(const G4TrackStack &right) const;
G4bool operator!=(const G4TrackStack &right) const;
public:
void PushToStack(const G4StackedTrack& aStackedTrack) { push_back(aStackedTrack); }
source/event/include/G4TrajectoryContainer.hh
+2 -2
View File
@@ -61,8 +61,8 @@ class G4TrajectoryContainer
inline void *operator new(size_t);
inline void operator delete(void* anEvent);
G4int operator==(const G4TrajectoryContainer& right) const;
G4int operator!=(const G4TrajectoryContainer& right) const;
G4bool operator==(const G4TrajectoryContainer& right) const;
G4bool operator!=(const G4TrajectoryContainer& right) const;
public:
inline size_t size() const { return vect->size(); }
source/event/src/G4Event.cc
+2 -2
View File
@@ -87,12 +87,12 @@ G4Event::~G4Event()
delete randomNumberStatusForProcessing;
}
G4int G4Event::operator==(const G4Event &right) const
G4bool G4Event::operator==(const G4Event &right) const
{
return ( eventID == right.eventID );
}
G4int G4Event::operator!=(const G4Event &right) const
G4bool G4Event::operator!=(const G4Event &right) const
{
return ( eventID != right.eventID );
}
source/event/src/G4EventManager.cc
+2 -2
View File
@@ -91,8 +91,8 @@ G4EventManager::~G4EventManager()
/*
const G4EventManager & G4EventManager::operator=(const G4EventManager &right)
{ }
G4int G4EventManager::operator==(const G4EventManager &right) const { }
G4int G4EventManager::operator!=(const G4EventManager &right) const { }
G4bool G4EventManager::operator==(const G4EventManager &right) const { }
G4bool G4EventManager::operator!=(const G4EventManager &right) const { }
*/
void G4EventManager::DoProcessing(G4Event* anEvent)
source/event/src/G4GeneralParticleSourceMessenger.cc
+3 -3
View File
@@ -131,12 +131,12 @@ G4GeneralParticleSourceMessenger::G4GeneralParticleSourceMessenger
gpsDirectory->SetGuidance("General Paricle Source control commands.");
// gpsDirectory->SetGuidance(" The first 9 commands are the same as in G4ParticleGun ");
// now the commands for mutiple sources
// now the commands for multiple sources
sourceDirectory = new G4UIdirectory("/gps/source/");
sourceDirectory->SetGuidance("Multiple source control sub-directory");
addsourceCmd = new G4UIcmdWithADouble("/gps/source/add",this);
addsourceCmd->SetGuidance("add a new source defintion to the particle gun with the specified intensity");
addsourceCmd->SetGuidance("add a new source definition to the particle gun with the specified intensity");
addsourceCmd->SetParameterName("addsource",false,false);
addsourceCmd->SetRange("addsource > 0.");
@@ -166,7 +166,7 @@ G4GeneralParticleSourceMessenger::G4GeneralParticleSourceMessenger
setintensityCmd->SetRange("setintensity > 0.");
multiplevertexCmd = new G4UIcmdWithABool("/gps/source/multiplevertex",this);
multiplevertexCmd->SetGuidance("true for simulaneous generation mutiple vertex");
multiplevertexCmd->SetGuidance("true for simultaneous generation multiple vertex");
multiplevertexCmd->SetGuidance("Default is false");
multiplevertexCmd->SetParameterName("multiplevertex",true);
multiplevertexCmd->SetDefaultValue(false);
source/event/src/G4HEPEvtInterface.cc
+4 -20
View File
@@ -56,23 +56,7 @@ G4HEPEvtInterface::G4HEPEvtInterface(const char* evfile, G4int vl)
particle_time = 0.0;
}
/*************************************
G4HEPEvtInterface::G4HEPEvtInterface(G4String evfile)
{
const char* fn = evfile.data();
inputFile.open((char*)fn);
if (inputFile.is_open()) {
fileName = evfile;
}
else {
G4Exception("G4HEPEvtInterface::G4HEPEvtInterface","Event0201",FatalException,
"G4HEPEvtInterface:: cannot open file.");
}
G4ThreeVector zero;
particle_position = zero;
particle_time = 0.0;
}
**************************************/
G4HEPEvtInterface::~G4HEPEvtInterface()
{;}
@@ -89,7 +73,7 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
if( inputFile.eof() )
{
G4Exception("G4HEPEvtInterface::GeneratePrimaryVertex","Event0202",
JustWarning,"End-Of-File : HEPEvt input file");
RunMustBeAborted,"End-Of-File : HEPEvt input file -- no more event to read!");
return;
}
@@ -113,8 +97,8 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
>> PHEP1 >> PHEP2 >> PHEP3 >> PHEP5;
if( inputFile.eof() )
{
G4Exception("G4HEPEvtInterface::GeneratePrimaryVertex","Event0202",
FatalException,"Unexpected End-Of-File : HEPEvt input file");
G4Exception("G4HEPEvtInterface::GeneratePrimaryVertex","Event0203",
FatalException,"Unexpected End-Of-File in the middle of an event");
}
if(vLevel > 1)
{
source/event/src/G4HEPEvtParticle.cc
+2 -2
View File
@@ -55,12 +55,12 @@ G4HEPEvtParticle& G4HEPEvtParticle::operator=(const G4HEPEvtParticle &)
return *this;
}
G4int G4HEPEvtParticle::operator==(const G4HEPEvtParticle &right) const
G4bool G4HEPEvtParticle::operator==(const G4HEPEvtParticle &right) const
{
return (this==&right);
}
G4int G4HEPEvtParticle::operator!=(const G4HEPEvtParticle &right) const
G4bool G4HEPEvtParticle::operator!=(const G4HEPEvtParticle &right) const
{
return (this!=&right);
}
source/event/src/G4ParticleGun.cc
+2 -2
View File
@@ -85,13 +85,13 @@ G4ParticleGun::~G4ParticleGun()
// "G4ParticleGun : Equal operator should not be used.");
// return right; }
//
//G4int G4ParticleGun::operator==(const G4ParticleGun& /*right*/) const
//G4bool G4ParticleGun::operator==(const G4ParticleGun& /*right*/) const
//{ G4Exception(
// "G4ParticleGun::operator==","Event0193",FatalException,
// "G4ParticleGun : == operator should not be used.");
// return true; }
//
//G4int G4ParticleGun::operator!=(const G4ParticleGun& /*right*/) const
//G4bool G4ParticleGun::operator!=(const G4ParticleGun& /*right*/) const
//{ G4Exception(
// "G4ParticleGun::operator!=","Event0193",FatalException,
// "G4ParticleGun : != operator should not be used.");
source/event/src/G4PrimaryTransformer.cc
+2 -2
View File
@@ -180,7 +180,7 @@ void G4PrimaryTransformer::GenerateSingleTrack
primaryParticle->GetPolY(),
primaryParticle->GetPolZ());
}
if(primaryParticle->GetProperTime()>0.0)
if(primaryParticle->GetProperTime()>=0.0)
{ DP->SetPreAssignedDecayProperTime(primaryParticle->GetProperTime()); }
// Set Mass if it is specified
@@ -270,7 +270,7 @@ void G4PrimaryTransformer::SetDecayProducts
= new G4DynamicParticle(partDef,daughter->GetMomentum());
DP->SetPrimaryParticle(daughter);
// Decay proper time for daughter
if(daughter->GetProperTime()>0.0)
if(daughter->GetProperTime()>=0.0)
{ DP->SetPreAssignedDecayProperTime(daughter->GetProperTime()); }
// Set Charge is specified
if (daughter->GetCharge()<DBL_MAX) {
source/event/src/G4SmartTrackStack.cc
+2 -2
View File
@@ -63,11 +63,11 @@ G4SmartTrackStack::operator=(const G4SmartTrackStack &) {
return *this;
}
int G4SmartTrackStack::operator==(const G4SmartTrackStack &right) const {
G4bool G4SmartTrackStack::operator==(const G4SmartTrackStack &right) const {
return (this==&right);
}
int G4SmartTrackStack::operator!=(const G4SmartTrackStack &right) const {
G4bool G4SmartTrackStack::operator!=(const G4SmartTrackStack &right) const {
return (this!=&right);
}
source/event/src/G4StackManager.cc
+2 -2
View File
@@ -75,9 +75,9 @@ G4StackManager::~G4StackManager()
const G4StackManager & G4StackManager::operator=
(const G4StackManager &) { return *this; }
G4int G4StackManager::operator==(const G4StackManager &)
G4bool G4StackManager::operator==(const G4StackManager &)
const{ return false; }
G4int G4StackManager::operator!=(const G4StackManager &)
G4bool G4StackManager::operator!=(const G4StackManager &)
const{ return true; }
#include "G4ParticleDefinition.hh"
source/event/src/G4TrajectoryContainer.cc
+2 -2
View File
@@ -45,12 +45,12 @@ G4TrajectoryContainer::~G4TrajectoryContainer()
delete vect;
}
G4int G4TrajectoryContainer::operator==(const G4TrajectoryContainer& right) const
G4bool G4TrajectoryContainer::operator==(const G4TrajectoryContainer& right) const
{
return (this==&right);
}
G4int G4TrajectoryContainer::operator!=(const G4TrajectoryContainer& right) const
G4bool G4TrajectoryContainer::operator!=(const G4TrajectoryContainer& right) const
{
return (this!=&right);
}