Import Geant4 11.0.2 source tree
This commit is contained in:
@@ -255,11 +255,11 @@ namespace G4INCL {
|
||||
|
||||
// First compute the current CM position and total momentum
|
||||
ThreeVector theCMPosition, theTotalMomentum;
|
||||
G4double theTotalEnergy = 0.0;
|
||||
// G4double theTotalEnergy = 0.0;
|
||||
for(ParticleIter p=particles.begin(), e=particles.end(); p!=e; ++p) {
|
||||
theCMPosition += (*p)->getPosition();
|
||||
theTotalMomentum += (*p)->getMomentum();
|
||||
theTotalEnergy += (*p)->getEnergy();
|
||||
// theTotalEnergy += (*p)->getEnergy();
|
||||
}
|
||||
theCMPosition /= theA;
|
||||
// assert((unsigned int)theA==particles.size());
|
||||
|
||||
+2
-2
@@ -148,8 +148,8 @@ namespace G4INCL {
|
||||
**/
|
||||
inline G4double getFermiMomentum(const Particle * const p) const {
|
||||
if(p->isDelta()) {
|
||||
const G4double Tf = getFermiEnergy(p), m = p->getMass();
|
||||
return std::sqrt(Tf*(Tf+2.*m));
|
||||
const G4double Tf = getFermiEnergy(p), mass = p->getMass();
|
||||
return std::sqrt(Tf*(Tf+2.*mass));
|
||||
} else {
|
||||
std::map<ParticleType, G4double>::const_iterator i = fermiMomentum.find(p->getType());
|
||||
// assert(i!=fermiMomentum.end());
|
||||
|
||||
@@ -345,9 +345,9 @@ namespace G4INCL {
|
||||
std::string print();
|
||||
|
||||
Store* getStore() const {return theStore; };
|
||||
void setStore(Store *s) {
|
||||
void setStore(Store *str) {
|
||||
delete theStore;
|
||||
theStore = s;
|
||||
theStore = str;
|
||||
};
|
||||
|
||||
G4double getInitialInternalEnergy() const { return initialInternalEnergy; };
|
||||
|
||||
Reference in New Issue
Block a user