diff --git a/NPLib/Physics/NPInelasticBreakup.cxx b/NPLib/Physics/NPInelasticBreakup.cxx index ee9690d8e0b2e3c8272bf40bc9f328fe438196fe..1714ed6d67378ac6b54db8778016dbff6a8d399b 100644 --- a/NPLib/Physics/NPInelasticBreakup.cxx +++ b/NPLib/Physics/NPInelasticBreakup.cxx @@ -180,6 +180,11 @@ void InelasticBreakup::ReadConfigurationFile(NPL::InputParser parser) { fBeamEnergy = fBeam.GetEnergy(); // set the particle fReaction.SetParticle1(fBeam); + // fParticle1 = GetParticle(blocks[i]->GetString("Beam"), parser); + fParticle2 = GetParticle(blocks[i]->GetString("Target"), parser); + fParticle3 = GetParticle(blocks[i]->GetString("Light"), parser); + fParticle4 = GetParticle(blocks[i]->GetString("Heavy"), parser); + fReaction.GetParticle1()->SetUp(blocks[i]->GetString("Heavy")); fReaction.SetParticle2(GetParticle(blocks[i]->GetString("Target"), parser)); fReaction.SetParticle3(GetParticle(blocks[i]->GetString("Target"), parser)); diff --git a/NPLib/Physics/NPInelasticBreakup.h b/NPLib/Physics/NPInelasticBreakup.h index 889ba3a727cb3d0312d75c3eacec0c84cfd43c33..82f89e480b6d38e41ebcbce2f58cbe5e2beae2ef 100644 --- a/NPLib/Physics/NPInelasticBreakup.h +++ b/NPLib/Physics/NPInelasticBreakup.h @@ -105,14 +105,14 @@ namespace NPL { double GetQValue() const { return fQValue; } Particle* GetParticleBeam() { return &fBeam; } Particle* GetParticle1() { return &fParticle1; } - Particle* GetParticle2() { return &fParticle2; } - Particle* GetParticle3() { return &fParticle3; } - Particle* GetParticle4() { return &fParticle4; } - Particle* GetNucleus1() { return GetParticle1(); } - Particle* GetNucleus2() { return GetParticle2(); } - Particle* GetNucleus3() { return GetParticle3(); } - Particle* GetNucleus4() { return GetParticle4(); } - + Particle* GetParticleTarget() { return &fParticle2; } + Particle* GetParticleLight() { return &fParticle3; } + Particle* GetParticleHeavy() { return &fParticle4; } + /* Particle* GetNucleus1() { return GetParticle1(); } + Particle* GetNucleus2() { return GetParticle2(); } + Particle* GetNucleus3() { return GetParticle3(); } + Particle* GetNucleus4() { return GetParticle4(); } + */ TH1F* GetCrossSectionHist() const { return fCrossSectionHist; } int GetVerboseLevel() const { return fVerboseLevel; }