diff --git a/NPLib/Physics/NPQFS.h b/NPLib/Physics/NPQFS.h index e82efc30012a7da9964123978f45abaeab3b6005..863d659cda5f6286659b878841e5a140c88d68d2 100644 --- a/NPLib/Physics/NPQFS.h +++ b/NPLib/Physics/NPQFS.h @@ -178,6 +178,8 @@ namespace NPL{ Particle* GetParticleB() {return &fParticleB;} Particle* GetParticle1() {return &fParticle1;} Particle* GetParticle2() {return &fParticle2;} + double GetExcitationA() {return fExcitationA;} + double GetExcitationB() {return fExcitationB;} bool GetShoot1() const {return fshoot1;} bool GetShoot2() const {return fshoot2;} bool GetShootB() const {return fshootB;} @@ -185,7 +187,7 @@ namespace NPL{ double GetPhiCM() const {return fPhiCM;} double GetMomentumSigma() const {return fMomentumSigma;} TVector3 GetInternalMomentum() const {return fInternalMomentum;} - + TLorentzVector* GetEnergyImpulsionLab_A() {return &fEnergyImpulsionLab_A;} TLorentzVector* GetEnergyImpulsionLab_T() {return &fEnergyImpulsionLab_T;} TLorentzVector* GetEnergyImpulsionLab_a() {return &fEnergyImpulsionLab_a;} diff --git a/NPSimulation/Process/BeamReaction.cc b/NPSimulation/Process/BeamReaction.cc index 7a9bd3ade0b45c5ba8c8ce8e2f5051d744f987e5..bf3703fa8fd2329c69c9bb54e6194df8d7478933 100644 --- a/NPSimulation/Process/BeamReaction.cc +++ b/NPSimulation/Process/BeamReaction.cc @@ -455,7 +455,7 @@ void NPS::BeamReaction::DoIt(const G4FastTrack& fastTrack, G4int Heavy_A = m_QFS.GetParticleB()->GetA(); G4ParticleDefinition* HeavyName; - HeavyName = IonTable->GetIon(Heavy_Z, Heavy_A); + HeavyName = IonTable->GetIon(Heavy_Z, Heavy_A,m_QFS.GetExcitationB()); // Set the Energy of the reaction m_QFS.SetBeamEnergy(reac_energy); diff --git a/NPSimulation/Process/Decay.cc b/NPSimulation/Process/Decay.cc index 3300f65f75e1aedc8578825acc95b7cbcc3146ea..30c82cdd4cfc5a142ba3456f28abc6608a4567b1 100644 --- a/NPSimulation/Process/Decay.cc +++ b/NPSimulation/Process/Decay.cc @@ -97,8 +97,6 @@ G4bool Decay::ModelTrigger(const G4FastTrack& fastTrack) { //////////////////////////////////////////////////////////////////////////////// void Decay::DoIt(const G4FastTrack& fastTrack,G4FastStep& fastStep){ - - cout << m_ExcitationEnergy << endl; // Get the track info const G4Track* PrimaryTrack = fastTrack.GetPrimaryTrack(); G4ThreeVector pdirection = PrimaryTrack->GetMomentum().unit();