Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -97,7 +97,7 @@ private:
|
||||
void ClearAndDestroy(G4ReactionProductVector * rpv);
|
||||
|
||||
// for debugging purpose
|
||||
void PrintKTVector(G4KineticTrackVector * ktv, G4std::string comment=G4std::string(""));
|
||||
void PrintKTVector(G4KineticTrackVector * ktv, std::string comment=std::string(""));
|
||||
|
||||
private:
|
||||
G4KineticTrackVector theProjectileList;
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
G4KM_DummyField() { }
|
||||
~G4KM_DummyField() { }
|
||||
|
||||
virtual void GetFieldValue(const G4double p[3], G4double *field ) const { }
|
||||
virtual void GetFieldValue(const G4double[4], G4double *) const { }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
+3
-3
@@ -81,9 +81,9 @@ inline G4KM_NucleonEqRhs::~G4KM_NucleonEqRhs()
|
||||
|
||||
// Here by design, but it is unnecessary for nuclear fields
|
||||
inline void
|
||||
G4KM_NucleonEqRhs::SetChargeMomentumMass(G4double particleCharge,
|
||||
G4double MomentumXc,
|
||||
G4double MassXc2)
|
||||
G4KM_NucleonEqRhs::SetChargeMomentumMass(G4double ,
|
||||
G4double ,
|
||||
G4double )
|
||||
{ }
|
||||
|
||||
#endif
|
||||
|
||||
+3
-3
@@ -71,9 +71,9 @@ inline G4KM_OpticalEqRhs::~G4KM_OpticalEqRhs()
|
||||
|
||||
|
||||
// Here by design, but it is unnecessary for nuclear fields
|
||||
inline void G4KM_OpticalEqRhs::SetChargeMomentumMass(G4double particleCharge,
|
||||
G4double MomentumXc,
|
||||
G4double MassXc2)
|
||||
inline void G4KM_OpticalEqRhs::SetChargeMomentumMass(G4double ,
|
||||
G4double ,
|
||||
G4double )
|
||||
{ }
|
||||
|
||||
#endif
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "G4V3DNucleus.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "g4std/vector"
|
||||
#include <vector>
|
||||
|
||||
class G4NeutronField: public G4VNuclearField
|
||||
{
|
||||
@@ -78,7 +78,7 @@ private:
|
||||
const G4VNuclearDensity * theDensity;
|
||||
G4double theR;
|
||||
|
||||
G4std::vector<G4double> theFermiMomBuffer;
|
||||
std::vector<G4double> theFermiMomBuffer;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "G4V3DNucleus.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "g4std/vector"
|
||||
#include <vector>
|
||||
|
||||
class G4ProtonField: public G4VNuclearField
|
||||
{
|
||||
@@ -79,7 +79,7 @@ private:
|
||||
G4FermiMomentum theFermi;
|
||||
const G4VNuclearDensity * theDensity;
|
||||
|
||||
G4std::vector<G4double> theFermiMomBuffer;
|
||||
std::vector<G4double> theFermiMomBuffer;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
+4
-4
@@ -29,15 +29,15 @@ class G4RKFieldIntegrator : public G4FieldPropagation
|
||||
{
|
||||
public:
|
||||
G4RKFieldIntegrator() {}
|
||||
G4RKFieldIntegrator(const G4RKFieldIntegrator &right) {}
|
||||
G4RKFieldIntegrator(const G4RKFieldIntegrator &) : G4FieldPropagation (){}
|
||||
|
||||
~G4RKFieldIntegrator() {}
|
||||
|
||||
//Operators
|
||||
const G4RKFieldIntegrator & operator=(const G4RKFieldIntegrator &right) {return *this;}
|
||||
const G4RKFieldIntegrator & operator=(const G4RKFieldIntegrator &) {return *this;}
|
||||
|
||||
int operator==(const G4RKFieldIntegrator &right) const {return 1;}
|
||||
int operator!=(const G4RKFieldIntegrator &right) const {return 1;}
|
||||
int operator==(const G4RKFieldIntegrator &) const {return 1;}
|
||||
int operator!=(const G4RKFieldIntegrator &) const {return 1;}
|
||||
|
||||
// only theActive are propagated, nothing else
|
||||
// only theSpectators define the field, nothing else
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "G4V3DNucleus.hh"
|
||||
#include "G4KM_DummyField.hh"
|
||||
#include "G4Mag_EqRhs.hh"
|
||||
#include "g4std/map"
|
||||
#include <map>
|
||||
|
||||
|
||||
class G4RKPropagation: public G4VFieldPropagation
|
||||
@@ -70,8 +70,8 @@ public:
|
||||
private:
|
||||
G4double theOuterRadius;
|
||||
G4V3DNucleus * theNucleus;
|
||||
G4std::map <G4int, G4VNuclearField *, G4std::less<G4int> > * theFieldMap;
|
||||
G4std::map <G4int, G4Mag_EqRhs *, G4std::less<G4int> > * theEquationMap;
|
||||
std::map <G4int, G4VNuclearField *, std::less<G4int> > * theFieldMap;
|
||||
std::map <G4int, G4Mag_EqRhs *, std::less<G4int> > * theEquationMap;
|
||||
G4KM_DummyField * theField;
|
||||
|
||||
G4bool GetSphereIntersectionTimes(const G4double radius,
|
||||
@@ -84,14 +84,14 @@ private:
|
||||
G4bool FreeTransport(G4KineticTrack * track, const G4double timestep);
|
||||
|
||||
void delete_FieldsAndMap(
|
||||
G4std::map <G4int, G4VNuclearField *, G4std::less<G4int> > * aMap);
|
||||
std::map <G4int, G4VNuclearField *, std::less<G4int> > * aMap);
|
||||
void delete_EquationsAndMap(
|
||||
G4std::map <G4int, G4Mag_EqRhs *, G4std::less<G4int> > * aMap);
|
||||
std::map <G4int, G4Mag_EqRhs *, std::less<G4int> > * aMap);
|
||||
|
||||
public:
|
||||
inline G4double GetBarrier(G4int encoding)
|
||||
{
|
||||
G4std::map <G4int, G4VNuclearField *, G4std::less<G4int> >::iterator iter;
|
||||
std::map <G4int, G4VNuclearField *, std::less<G4int> >::iterator iter;
|
||||
iter = theFieldMap->find(encoding);
|
||||
if(iter == theFieldMap->end()) return 0;
|
||||
return (*theFieldMap)[encoding]->GetBarrier();
|
||||
@@ -99,7 +99,7 @@ private:
|
||||
|
||||
inline G4double GetField(G4int encoding,G4ThreeVector pos)
|
||||
{
|
||||
G4std::map <G4int, G4VNuclearField *, G4std::less<G4int> >::iterator iter;
|
||||
std::map <G4int, G4VNuclearField *, std::less<G4int> >::iterator iter;
|
||||
iter = theFieldMap->find(encoding);
|
||||
if(iter == theFieldMap->end()) return 0;
|
||||
return (*theFieldMap)[encoding]->GetField(pos);
|
||||
|
||||
Reference in New Issue
Block a user