diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx index d7679c7736bca3d3e2d1fdd7b0ab64cd7ca3129a..5b95825825f2667cb6b54d1b6700c74951fa1afd 100644 --- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx +++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx @@ -428,16 +428,16 @@ void TTiaraBarrelPhysics::ReadConfiguration(string Path){ InitializeStandardParameter(); ReadAnalysisConfig(); } -/*/////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// void TTiaraBarrelPhysics::InitSpectra(){ - //m_Spectra = new TTiaraBarrelSpectra(); + m_Spectra = new TTiaraBarrelSpectra(m_NumberOfDetector); } /////////////////////////////////////////////////////////////////////////// void TTiaraBarrelPhysics::FillSpectra(){ - //m_Spectra -> FillRawSpectra(m_EventData); - //m_Spectra -> FillPreTreatedSpectra(m_PreTreatedData); - //m_Spectra -> FillPhysicsSpectra(m_EventPhysics); + m_Spectra -> FillRawSpectra(m_EventData); + m_Spectra -> FillPreTreatedSpectra(m_PreTreatedData); + m_Spectra -> FillPhysicsSpectra(m_EventPhysics); } /////////////////////////////////////////////////////////////////////////// void TTiaraBarrelPhysics::CheckSpectra(){ @@ -450,7 +450,7 @@ void TTiaraBarrelPhysics::ClearSpectra(){ /////////////////////////////////////////////////////////////////////////// map< vector<TString>,TH1* > TTiaraBarrelPhysics::GetSpectra() { return m_Spectra->GetMapHisto(); -} */ +} /////////////////////////////////////////////////////////////////////////// void TTiaraBarrelPhysics::AddParameterToCalibrationManager(){ CalibrationManager* Cal = CalibrationManager::getInstance(); diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.h b/NPLib/Tiara/TTiaraBarrelPhysics.h index 7195d1fbbbc62a42c625176336d9da5788e67805..bcebe3d33b8bb61f3a945bd8fdcc787710c6b492 100644 --- a/NPLib/Tiara/TTiaraBarrelPhysics.h +++ b/NPLib/Tiara/TTiaraBarrelPhysics.h @@ -27,7 +27,7 @@ #include <map> // NPL #include "TTiaraBarrelData.h" -//#include "TTiaraBarrelSpectra.h" +#include "TTiaraBarrelSpectra.h" #include "../include/CalibrationManager.h" #include "../include/VDetector.h" @@ -37,7 +37,7 @@ #include "TObject.h" #include "TH1.h" -//class TTiaraBarrelSpectra; +class TTiaraBarrelSpectra; using namespace std ; @@ -117,14 +117,14 @@ class TTiaraBarrelPhysics : public TObject, public NPA::VDetector{ // Method related to the TSpectra classes, aimed at providing a framework // for online applications // Instantiate the Spectra class and the histogramm throught it - // void InitSpectra(); + void InitSpectra(); // Fill the spectra hold by the spectra class - // void FillSpectra(); + void FillSpectra(); // Used for Online mainly, perform check on the histo and for example change // their color if issues are found - // void CheckSpectra(); + void CheckSpectra(); // Used for Online only, clear all the spectra hold by the Spectra class - // void ClearSpectra(); + void ClearSpectra(); public:// Specific to TiaraBarrel Array // Clear The PreTeated object @@ -191,10 +191,10 @@ class TTiaraBarrelPhysics : public TObject, public NPA::VDetector{ vector< vector<double> > m_StripPositionZ;//! private: // Spectra - // TTiaraBarrelSpectra* m_Spectra;//! + TTiaraBarrelSpectra* m_Spectra;//! public: - //map< vector<TString>,TH1* > GetSpectra(); + map< vector<TString>,TH1* > GetSpectra(); ClassDef(TTiaraBarrelPhysics,1) // SharcPhysics structure };