Import Geant4 5.2.0 source tree
This commit is contained in:
+1
-1
@@ -107,7 +107,7 @@ ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus, G4ParticleChange
|
||||
G4QHadron* iH = new G4QHadron(projectilePDGCode, 1./MeV*proj4Mom);
|
||||
projHV.push_back(iH);
|
||||
G4QEnvironment* pan= new G4QEnvironment(projHV, targetPDGCode);
|
||||
G4std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
projHV.clear();
|
||||
//G4Quasmon* pan= new G4Quasmon(projectilePDGCode, targetPDGCode, 1./MeV*proj4Mom, 1./MeV*targ4Mom, nop);
|
||||
G4QHadronVector* output = pan->Fragment();
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4ElectroNuclearReaction.hh,v 1.15 2003/02/04 10:17:51 jwellisc Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// GEANT4 physics class: G4ElectroNuclearReaction -- header file
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4GammaNuclearReaction.hh,v 1.9 2002/12/12 19:16:59 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// GEANT4 physics class: G4GammaNuclearReaction -- header file
|
||||
|
||||
+8
-8
@@ -23,7 +23,7 @@
|
||||
#include "G4StringChipsInterface.hh"
|
||||
#include "globals.hh"
|
||||
#include "G4Pair.hh"
|
||||
#include "g4std/list"
|
||||
#include <list>
|
||||
#include "G4KineticTrackVector.hh"
|
||||
#include "G4Nucleon.hh"
|
||||
#include "G4LorentzRotation.hh"
|
||||
@@ -66,8 +66,8 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
G4double theEnergyLostInFragmentation = theEnergyLossPerFermi*pathlength/fermi;
|
||||
|
||||
// now select all particles in range
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> > theSorted;
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> >::iterator current;
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> > theSorted;
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> >::iterator current;
|
||||
for(unsigned int secondary = 0; secondary<theSecondaries->size(); secondary++)
|
||||
{
|
||||
G4LorentzVector a4Mom = theSecondaries->operator[](secondary)->Get4Momentum();
|
||||
@@ -111,7 +111,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
G4int nAD = 0;
|
||||
G4int nAU = 0;
|
||||
G4int nAS = 0;
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> >::iterator firstEscaping = theSorted.begin();
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> >::iterator firstEscaping = theSorted.begin();
|
||||
G4double runningEnergy = 0;
|
||||
G4int particleCount = 0;
|
||||
G4LorentzVector theLow = (*(theSorted.begin())).second->Get4Momentum();
|
||||
@@ -158,7 +158,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
theSec->SetMomentum(current4Mom.vect());
|
||||
theResult->push_back(theSec);
|
||||
}
|
||||
G4std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
delete secondaries;
|
||||
}
|
||||
continue;
|
||||
@@ -284,7 +284,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
{
|
||||
G4QEnvironment* pan= new G4QEnvironment(projHV, targetPDGCode);
|
||||
output = pan->Fragment();
|
||||
G4std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
projHV.clear();
|
||||
delete pan;
|
||||
}
|
||||
@@ -330,11 +330,11 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
theSec->SetMomentum(current4Mom.vect());
|
||||
theResult->push_back(theSec);
|
||||
}
|
||||
G4std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
delete secondaries;
|
||||
}
|
||||
}
|
||||
G4std::for_each(theSecondaries->begin(), theSecondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(theSecondaries->begin(), theSecondaries->end(), DeleteKineticTrack());
|
||||
delete theSecondaries;
|
||||
|
||||
// now add the quasmon output
|
||||
|
||||
+13
-13
@@ -23,8 +23,8 @@
|
||||
#include "G4StringChipsParticleLevelInterface.hh"
|
||||
#include "globals.hh"
|
||||
#include "G4Pair.hh"
|
||||
#include "g4std/list"
|
||||
#include "g4std/vector"
|
||||
#include <list>
|
||||
#include <vector>
|
||||
#include "G4KineticTrackVector.hh"
|
||||
#include "G4Nucleon.hh"
|
||||
#include "G4Proton.hh"
|
||||
@@ -140,8 +140,8 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
G4double theEnergyLostInFragmentation = theEnergyLossPerFermi*pathlength/fermi;
|
||||
|
||||
// now select all particles in range
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> > theSorted;
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> >::iterator current;
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> > theSorted;
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> >::iterator current;
|
||||
for(unsigned int secondary = 0; secondary<theSecondaries->size(); secondary++)
|
||||
{
|
||||
G4LorentzVector a4Mom = theSecondaries->operator[](secondary)->Get4Momentum();
|
||||
@@ -177,7 +177,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
G4int nAD = 0;
|
||||
G4int nAU = 0;
|
||||
G4int nAS = 0;
|
||||
G4std::list<G4Pair<G4double, G4KineticTrack *> >::iterator firstEscaping = theSorted.begin();
|
||||
std::list<G4Pair<G4double, G4KineticTrack *> >::iterator firstEscaping = theSorted.begin();
|
||||
G4double runningEnergy = 0;
|
||||
G4int particleCount = 0;
|
||||
G4LorentzVector theLow = (*(theSorted.begin())).second->Get4Momentum();
|
||||
@@ -189,8 +189,8 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
#endif
|
||||
|
||||
G4QHadronVector projHV;
|
||||
G4std::vector<G4QContent> theContents;
|
||||
G4std::vector<G4LorentzVector *> theMomenta;
|
||||
std::vector<G4QContent> theContents;
|
||||
std::vector<G4LorentzVector *> theMomenta;
|
||||
G4ReactionProductVector * theResult = new G4ReactionProductVector;
|
||||
G4ReactionProduct * theSec;
|
||||
G4KineticTrackVector * secondaries;
|
||||
@@ -228,7 +228,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
theSec->SetMomentum(current4Mom.vect());
|
||||
theResult->push_back(theSec);
|
||||
}
|
||||
G4std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
delete secondaries;
|
||||
}
|
||||
}
|
||||
@@ -281,8 +281,8 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
|
||||
theMomenta.push_back(aVec);
|
||||
}
|
||||
G4std::vector<G4QContent> theFinalContents;
|
||||
G4std::vector<G4LorentzVector*> theFinalMomenta;
|
||||
std::vector<G4QContent> theFinalContents;
|
||||
std::vector<G4LorentzVector*> theFinalMomenta;
|
||||
if(theContents.size()<hitCount || 1)
|
||||
{
|
||||
for(unsigned int hp = 0; hp<theContents.size(); hp++)
|
||||
@@ -350,7 +350,7 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
G4QCHIPSWorld aWorld(nop); // Create CHIPS World of nop particles
|
||||
G4QEnvironment* pan= new G4QEnvironment(projHV, targetPDGCode);
|
||||
// clean up particles
|
||||
G4std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
std::for_each(projHV.begin(), projHV.end(), DeleteQHadron());
|
||||
projHV.clear();
|
||||
output = pan->Fragment();
|
||||
delete pan;
|
||||
@@ -395,11 +395,11 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus)
|
||||
theSec->SetMomentum(current4Mom.vect());
|
||||
theResult->push_back(theSec);
|
||||
}
|
||||
G4std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack());
|
||||
delete secondaries;
|
||||
}
|
||||
}
|
||||
G4std::for_each(theSecondaries->begin(), theSecondaries->end(), DeleteKineticTrack());
|
||||
std::for_each(theSecondaries->begin(), theSecondaries->end(), DeleteKineticTrack());
|
||||
delete theSecondaries;
|
||||
|
||||
// now add the quasmon output
|
||||
|
||||
Reference in New Issue
Block a user