Import Geant4 10.6.0.beta source tree
This commit is contained in:
@@ -14,6 +14,11 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
30 May 2019 - Vladimir Ivanchenko (hadr-modman-V10-05-00)
|
||||
-----------------------------------------------------------
|
||||
- G4HadronicInteractionRegistry - fixed typo in comments, remove unused
|
||||
bool flag
|
||||
|
||||
9 November 2018 - Gabriele Cosmo (hadr-modman-V10-04-00)
|
||||
-----------------------------------------------------------
|
||||
- G4V3DNucleus: fixed printout typo.
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ public:
|
||||
// delete all models
|
||||
|
||||
void InitialiseModels();
|
||||
// delete all models
|
||||
// initialise all models before the run
|
||||
|
||||
G4HadronicInteraction* FindModel(const G4String& name);
|
||||
// find existing hadronic interaction by name
|
||||
|
||||
@@ -47,8 +47,8 @@ class G4V3DNucleus
|
||||
private:
|
||||
G4V3DNucleus(const G4V3DNucleus &right);
|
||||
const G4V3DNucleus & operator=(const G4V3DNucleus &right);
|
||||
int operator==(const G4V3DNucleus &right) const;
|
||||
int operator!=(const G4V3DNucleus &right) const;
|
||||
G4bool operator==(const G4V3DNucleus &right) const;
|
||||
G4bool operator!=(const G4V3DNucleus &right) const;
|
||||
|
||||
public:
|
||||
virtual void Init(G4int theA, G4int theZ) = 0;
|
||||
|
||||
@@ -52,8 +52,8 @@ class G4VHighEnergyGenerator
|
||||
private:
|
||||
G4VHighEnergyGenerator(const G4VHighEnergyGenerator &right);
|
||||
const G4VHighEnergyGenerator & operator=(const G4VHighEnergyGenerator &right);
|
||||
int operator==(const G4VHighEnergyGenerator &right) const;
|
||||
int operator!=(const G4VHighEnergyGenerator &right) const;
|
||||
G4bool operator==(const G4VHighEnergyGenerator &right) const;
|
||||
G4bool operator!=(const G4VHighEnergyGenerator &right) const;
|
||||
|
||||
public:
|
||||
virtual G4V3DNucleus * GetWoundedNucleus() const = 0;
|
||||
|
||||
+2
-2
@@ -93,8 +93,8 @@ private:
|
||||
|
||||
G4VIntraNuclearTransportModel(const G4VIntraNuclearTransportModel& right) = delete;
|
||||
const G4VIntraNuclearTransportModel& operator=(const G4VIntraNuclearTransportModel &right) = delete;
|
||||
int operator==(const G4VIntraNuclearTransportModel& right) const = delete;
|
||||
int operator!=(const G4VIntraNuclearTransportModel& right) const = delete;
|
||||
G4bool operator==(const G4VIntraNuclearTransportModel& right) const = delete;
|
||||
G4bool operator!=(const G4VIntraNuclearTransportModel& right) const = delete;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -47,9 +47,9 @@ class G4VKineticNucleon
|
||||
|
||||
const G4VKineticNucleon& operator=(const G4VKineticNucleon& right);
|
||||
|
||||
int operator==(const G4VKineticNucleon& right) const;
|
||||
G4bool operator==(const G4VKineticNucleon& right) const;
|
||||
|
||||
int operator!=(const G4VKineticNucleon& right) const;
|
||||
G4bool operator!=(const G4VKineticNucleon& right) const;
|
||||
|
||||
virtual G4KineticTrackVector* Decay();
|
||||
|
||||
|
||||
@@ -25,12 +25,13 @@
|
||||
//
|
||||
//
|
||||
// 23-Jan-2009 V.Ivanchenko make the class to be a singleton
|
||||
// 17-Aug-2012 V.Ivanchenko added hadronic model factories
|
||||
// 17-Aug-2012 V.Ivanchenko added methods
|
||||
|
||||
#include "G4HadronicInteractionRegistry.hh"
|
||||
#include "G4HadronicInteraction.hh"
|
||||
|
||||
G4ThreadLocal G4HadronicInteractionRegistry* G4HadronicInteractionRegistry::instance = nullptr;
|
||||
G4ThreadLocal G4HadronicInteractionRegistry*
|
||||
G4HadronicInteractionRegistry::instance = nullptr;
|
||||
|
||||
G4HadronicInteractionRegistry* G4HadronicInteractionRegistry::Instance()
|
||||
{
|
||||
@@ -42,10 +43,7 @@ G4HadronicInteractionRegistry* G4HadronicInteractionRegistry::Instance()
|
||||
}
|
||||
|
||||
G4HadronicInteractionRegistry::G4HadronicInteractionRegistry()
|
||||
: isInitialized(false)
|
||||
{
|
||||
//G4cout << "G4HadronicInteractionRegistry " << this << G4endl;
|
||||
}
|
||||
{}
|
||||
|
||||
G4HadronicInteractionRegistry::~G4HadronicInteractionRegistry()
|
||||
{
|
||||
|
||||
@@ -50,14 +50,14 @@ const G4V3DNucleus & G4V3DNucleus::operator=(const G4V3DNucleus &)
|
||||
}
|
||||
|
||||
|
||||
int G4V3DNucleus::operator==(const G4V3DNucleus &) const
|
||||
G4bool G4V3DNucleus::operator==(const G4V3DNucleus &) const
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
int G4V3DNucleus::operator!=(const G4V3DNucleus &) const
|
||||
G4bool G4V3DNucleus::operator!=(const G4V3DNucleus &) const
|
||||
{
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -45,12 +45,12 @@ G4VKineticNucleon::~G4VKineticNucleon()
|
||||
//{}
|
||||
|
||||
|
||||
int G4VKineticNucleon::operator==(const G4VKineticNucleon &right) const
|
||||
G4bool G4VKineticNucleon::operator==(const G4VKineticNucleon &right) const
|
||||
{
|
||||
return this == &right;
|
||||
}
|
||||
|
||||
int G4VKineticNucleon::operator!=(const G4VKineticNucleon &right) const
|
||||
G4bool G4VKineticNucleon::operator!=(const G4VKineticNucleon &right) const
|
||||
{
|
||||
return this != &right;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user