diff --git a/NPLib/Detectors/Actar/TActarPhysics.cxx b/NPLib/Detectors/Actar/TActarPhysics.cxx index eb2fbde2d48b7a6f1f1b3314b95744722f4bd26d..39c51a1af97f6faa1409a31635632db2f96baae0 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 dd6a9acc141fc9565c688ccedf6b435f332c2435..313c5a565aeec5bdcc6f262982d25153f1094948 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 3b899c2a82db380d8647ec49084a5ae981c42849..a3aca597702bc38ba558fc0041c88ed6096df8f2 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 dd69d678231546de6638f21667c09bbfbf4ebfad..60d8904ceefd01eb3ed917f1d687bbac5ced464f 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);