From 18e6fabe99529627f956b7c5466cfa529b55af3c Mon Sep 17 00:00:00 2001
From: Adrien Matta <matta@lpccaen.in2p3.fr>
Date: Fri, 18 Dec 2020 10:16:19 +0100
Subject: [PATCH] * suppressing debug cout from decay * adding Ex to NucleusB
in QFS simulation
---
NPLib/Physics/NPQFS.h | 4 +++-
NPSimulation/Process/BeamReaction.cc | 2 +-
NPSimulation/Process/Decay.cc | 2 --
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/NPLib/Physics/NPQFS.h b/NPLib/Physics/NPQFS.h
index e82efc300..863d659cd 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 7a9bd3ade..bf3703fa8 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 3300f65f7..30c82cdd4 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();
--
GitLab