diff --git a/NPLib/Detectors/PISTA/CMakeLists.txt b/NPLib/Detectors/PISTA/CMakeLists.txt index d4edf2bbb788f01b8bb9f96628c6eb89abf50ebd..41848764389a46d338eae0aa8d60b5e782d863c2 100644 --- a/NPLib/Detectors/PISTA/CMakeLists.txt +++ b/NPLib/Detectors/PISTA/CMakeLists.txt @@ -12,8 +12,14 @@ add_custom_command(OUTPUT TICPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh add_custom_command(OUTPUT TVamosReconstructionDict.cxx COMMAND ../../scripts/build_dict.sh TVamosReconstruction.h TVamosReconstructionDict.cxx TVamosReconstruction.rootmap libNPPISTA.dylib DEPENDS TVamosReconstruction.h) -add_library(NPPISTA SHARED TPISTASpectra.cxx TPISTAData.cxx TPISTAPhysics.cxx TPISTADataDict.cxx TPISTAPhysicsDict.cxx TFPMWData.cxx TFPMWDataDict.cxx TFPMWPhysics.cxx TFPMWPhysicsDict.cxx TICData.cxx TICDataDict.cxx TICPhysics.cxx TICPhysicsDict.cxx TVamosReconstruction.cxx TVamosReconstructionDict.cxx) +add_custom_command(OUTPUT TTimeDataDict.cxx COMMAND ../../scripts/build_dict.sh TTimeData.h TTimeDataDict.cxx TTimeData.rootmap libNPPISTA.dylib DEPENDS TTimeData.h) + +add_library(NPPISTA SHARED TPISTASpectra.cxx TPISTAData.cxx TPISTAPhysics.cxx + TPISTADataDict.cxx TPISTAPhysicsDict.cxx TFPMWData.cxx TFPMWDataDict.cxx + TFPMWPhysics.cxx TFPMWPhysicsDict.cxx TICData.cxx TICDataDict.cxx + TICPhysics.cxx TICPhysicsDict.cxx TVamosReconstruction.cxx TVamosReconstructionDict.cxx TTimeData.cxx TTimeDataDict.cxx) target_link_libraries(NPPISTA ${ROOT_LIBRARIES} NPCore) -install(FILES TPISTAData.h TPISTAPhysics.h TPISTASpectra.h TFPMWData.h TFPMWPhysics.h TICData.h TICPhysics.h TVamosReconstruction.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}) + +install(FILES TPISTAData.h TPISTAPhysics.h TPISTASpectra.h TFPMWData.h TFPMWPhysics.h TICData.h TICPhysics.h TVamosReconstruction.h TTimeData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}) diff --git a/NPLib/Detectors/PISTA/TICData.cxx b/NPLib/Detectors/PISTA/TICData.cxx index 52a8670d53b6128f1c59ac84a6f83cabb8d7bba3..6d34fa00d3f52d2ca45472b05195c267cced7abe 100644 --- a/NPLib/Detectors/PISTA/TICData.cxx +++ b/NPLib/Detectors/PISTA/TICData.cxx @@ -46,6 +46,7 @@ TICData::~TICData() { void TICData::Clear() { fIC_Section.clear(); fIC_Charge.clear(); + fIC_TS.clear(); } diff --git a/NPLib/Detectors/PISTA/TICData.h b/NPLib/Detectors/PISTA/TICData.h index 542d76a8b17316d2e902eba40a252ae0f2fe2e73..3fc9c3eec3be709e52b86b6a2b3334fd929894ce 100644 --- a/NPLib/Detectors/PISTA/TICData.h +++ b/NPLib/Detectors/PISTA/TICData.h @@ -36,6 +36,7 @@ class TICData : public TObject { private: vector<int> fIC_Section; vector<double> fIC_Charge; + vector<long> fIC_TS; @@ -64,6 +65,7 @@ class TICData : public TObject { // X setters inline void SetIC_Charge(double Charge){fIC_Charge.push_back(Charge);};//! inline void SetIC_Section(int sec){fIC_Section.push_back(sec);};//! + inline void SetIC_TS(long TS){fIC_TS.push_back(TS);};//! ////////////////////// GETTERS //////////////////////// @@ -73,7 +75,9 @@ class TICData : public TObject { {return fIC_Section[i];}//! inline Double_t GetIC_Charge(const unsigned int &i) const {return fIC_Charge[i];}//! - + inline Double_t GetIC_TS(const unsigned int &i) const + {return fIC_TS[i];}//! + ////////////////////////////////////////////////////////////// // Required for ROOT dictionnary ClassDef(TICData,1) // ICData structure