From cfa174ba4c5618b362b6c3145a0e560b18b0dbb8 Mon Sep 17 00:00:00 2001
From: dthisse <damien.thisse@cea.fr>
Date: Tue, 19 Nov 2024 17:41:57 +0100
Subject: [PATCH] ACTAR: Added the reading of the branch "ReactionConditions"
if it is a simulation
---
NPLib/Detectors/Actar/TActarPhysics.cxx | 6 +++---
NPLib/Detectors/Actar/TActarPhysics.h | 1 +
NPLib/Detectors/Actar/TActarPhysicsReader.cxx | 7 ++++++-
NPLib/Detectors/Actar/TActarPhysicsReader.h | 4 +++-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/NPLib/Detectors/Actar/TActarPhysics.cxx b/NPLib/Detectors/Actar/TActarPhysics.cxx
index eb2fbde2d..39c51a1af 100644
--- a/NPLib/Detectors/Actar/TActarPhysics.cxx
+++ b/NPLib/Detectors/Actar/TActarPhysics.cxx
@@ -740,9 +740,9 @@ void TActarPhysics::InitSpectra() {
}
///////////////////////////////////////////////////////////////////////////
-void TActarPhysics::SetTreeReader(TTreeReader* TreeReader) {TActarPhysicsReader::r_SetTreeReader(TreeReader);}
-
-
+void TActarPhysics::SetTreeReader(TTreeReader* TreeReader) {
+ TActarPhysicsReader::r_SetTreeReader(TreeReader, fIsSimulation);
+}
///////////////////////////////////////////////////////////////////////////
void TActarPhysics::FillSpectra() {
diff --git a/NPLib/Detectors/Actar/TActarPhysics.h b/NPLib/Detectors/Actar/TActarPhysics.h
index dd6a9acc1..313c5a565 100644
--- a/NPLib/Detectors/Actar/TActarPhysics.h
+++ b/NPLib/Detectors/Actar/TActarPhysics.h
@@ -217,6 +217,7 @@ public:
string GetGasName() {return fGas;}
bool IsGoodEvent() {return fIsGoodEvent;}
+ bool IsSimulation() {return fIsSimulation;}
// parameters used in the analysis
private:
diff --git a/NPLib/Detectors/Actar/TActarPhysicsReader.cxx b/NPLib/Detectors/Actar/TActarPhysicsReader.cxx
index 3b899c2a8..a3aca5977 100644
--- a/NPLib/Detectors/Actar/TActarPhysicsReader.cxx
+++ b/NPLib/Detectors/Actar/TActarPhysicsReader.cxx
@@ -30,6 +30,11 @@ TActarPhysicsReader::TActarPhysicsReader()
{
};
-void TActarPhysicsReader::r_SetTreeReader(TTreeReader* TreeReader){
+void TActarPhysicsReader::r_SetTreeReader(TTreeReader* TreeReader, bool is_simulation){
r_ReaderEventData = new TTreeReaderValue<MEventReduced>(*TreeReader, "data");
+ if (is_simulation)
+ {
+ r_ReaderReactionCondition = new TTreeReaderValue<TReactionConditions>(*TreeReader, "ReactionConditions");
+ }
+
};
\ No newline at end of file
diff --git a/NPLib/Detectors/Actar/TActarPhysicsReader.h b/NPLib/Detectors/Actar/TActarPhysicsReader.h
index dd69d6782..60d8904ce 100644
--- a/NPLib/Detectors/Actar/TActarPhysicsReader.h
+++ b/NPLib/Detectors/Actar/TActarPhysicsReader.h
@@ -35,6 +35,7 @@
#include "RootOutput.h"
#include "TTree.h"
#include "NPVTreeReader.h"
+#include "TReactionConditions.h"
using namespace std;
@@ -45,11 +46,12 @@ public:
~TActarPhysicsReader(){};
public:
- void r_SetTreeReader(TTreeReader* TreeReader);
+ void r_SetTreeReader(TTreeReader* TreeReader, bool is_simulation);
private:
TTreeReader *dummy = new TTreeReader();
public:
TTreeReaderValue<MEventReduced>* r_ReaderEventData = new TTreeReaderValue<MEventReduced>(*dummy,"");
+ TTreeReaderValue<TReactionConditions>* r_ReaderReactionCondition= new TTreeReaderValue<TReactionConditions>(*dummy,"");
public:
ClassDef(TActarPhysicsReader,0);
--
GitLab