From db7971933a944dc3b684ccf1a3c1e6bbd58c3557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?GIRARD=20ALCINDOR=20Val=C3=A9rian?=
<girard-alcindor@ijclab.in2p3.fr>
Date: Tue, 5 Dec 2023 16:07:45 +0100
Subject: [PATCH] Updating e870
---
Projects/e870/Analysis.cxx | 22 +++++++++++-----------
Projects/e870/Analysis.h | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Projects/e870/Analysis.cxx b/Projects/e870/Analysis.cxx
index 637a7b4ae..68a61475d 100644
--- a/Projects/e870/Analysis.cxx
+++ b/Projects/e870/Analysis.cxx
@@ -58,22 +58,22 @@ void Analysis::Init() {
CATS = (TCATSPhysics*)m_DetectorManager->GetDetector("CATSDetector");
// get reaction information
- // reaction.ReadConfigurationFile(NPOptionManager::getInstance()->GetReactionFile());
- // OriginalBeamEnergy = reaction.GetBeamEnergy();
+ reaction.ReadConfigurationFile(NPOptionManager::getInstance()->GetReactionFile());
+ OriginalBeamEnergy = reaction.GetBeamEnergy();
// target thickness
TargetThickness = m_DetectorManager->GetTargetThickness();
string TargetMaterial = m_DetectorManager->GetTargetMaterial();
// energy losses
- // string light = NPL::ChangeNameToG4Standard(reaction.GetNucleus3()->GetName());
- // string beam = NPL::ChangeNameToG4Standard(reaction.GetNucleus1()->GetName());
- // cout << light << " " << beam << " " << TargetMaterial << " " << TargetThickness << endl;
- //LightTarget = NPL::EnergyLoss(light + "_" + TargetMaterial + ".G4table", "G4Table", 100);
- //LightAl = NPL::EnergyLoss(light + "_Al.G4table", "G4Table", 100);
- //LightSi = NPL::EnergyLoss(light + "_Si.G4table", "G4Table", 100);
- //BeamCD2 = NPL::EnergyLoss(beam + "_" + TargetMaterial + ".G4table", "G4Table", 100);
-
- FinalBeamEnergy = BeamCD2.Slow(OriginalBeamEnergy, TargetThickness * 0.5, 0);
+ string light = NPL::ChangeNameToG4Standard(reaction.GetNucleus3()->GetName());
+ string beam = NPL::ChangeNameToG4Standard(reaction.GetNucleus1()->GetName());
+ cout << light << " " << beam << " " << TargetMaterial << " " << TargetThickness << endl;
+ LightTarget = NPL::EnergyLoss(light + "_" + TargetMaterial + ".G4table", "G4Table", 100);
+ LightAl = NPL::EnergyLoss(light + "_Al.G4table", "G4Table", 100);
+ LightSi = NPL::EnergyLoss(light + "_Si.G4table", "G4Table", 100);
+ BeamTarget = NPL::EnergyLoss(beam + "_" + TargetMaterial + ".G4table", "G4Table", 100);
+
+ FinalBeamEnergy = BeamTarget.Slow(OriginalBeamEnergy, TargetThickness * 0.5, 0);
// FinalBeamEnergy = OriginalBeamEnergy;
cout << "Original beam energy: " << OriginalBeamEnergy << " MeV Mid-target beam energy: " << FinalBeamEnergy
<< "MeV " << endl;
diff --git a/Projects/e870/Analysis.h b/Projects/e870/Analysis.h
index a0881f4f3..0e2b54fce 100644
--- a/Projects/e870/Analysis.h
+++ b/Projects/e870/Analysis.h
@@ -66,7 +66,7 @@ class Analysis: public NPL::VAnalysis{
NPL::EnergyLoss LightTarget;
NPL::EnergyLoss LightAl;
NPL::EnergyLoss LightSi;
- NPL::EnergyLoss BeamCD2;
+ NPL::EnergyLoss BeamTarget;
NPL::EnergyLoss* BeamWindow;
NPL::EnergyLoss* LightWindow;
--
GitLab