diff --git a/NPLib/Paris/TParisPhysics.cxx b/NPLib/Paris/TParisPhysics.cxx index 78625989f9014efbd7c47b7e98334de969d7045c..92bdb202c7754bfac25f92d1a36ce2a968ede355 100644 --- a/NPLib/Paris/TParisPhysics.cxx +++ b/NPLib/Paris/TParisPhysics.cxx @@ -54,15 +54,15 @@ TParisPhysics::~TParisPhysics(){ } //////////////////////////////////////////////////////////////////////////////// -void TParisPhysics::BuildSimplePhysicalEvent(TParisData* Data){ - BuildPhysicalEvent(Data); +void TParisPhysics::BuildSimplePhysicalEvent(){ + BuildPhysicalEvent(); } //////////////////////////////////////////////////////////////////////////////// -void TParisPhysics::BuildPhysicalEvent(TParisData* Data){ +void TParisPhysics::BuildPhysicalEvent(){ - int multLaBrE = Data->GetPARISLaBr3StageEMult(); - int multCsIE = Data->GetPARISCsIStageEMult(); + int multLaBrE = m_EventData->GetPARISLaBr3StageEMult(); + int multCsIE = m_EventData->GetPARISCsIStageEMult(); //cout << "multLaBr= " << multLaBrE << endl; //cout << "multCsI= " << multCsIE << endl; @@ -76,7 +76,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){ if(multLaBrE>=1){ //cout << "cava1b" <<endl; - //cout << Data->GetPARISLaBr3StageEEnergy(0) <<endl; + //cout << m_EventData->GetPARISLaBr3StageEEnergy(0) <<endl; //cout << "cava1b" <<endl; double EnergyStripFront; @@ -84,7 +84,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){ for(int j=0;j<multLaBrE;j++) { - EnergyStripFront= Data->GetPARISLaBr3StageEEnergy(j); + EnergyStripFront= m_EventData->GetPARISLaBr3StageEEnergy(j); EnergyStrip = EnergyStripFront; ParisLaBr_E.push_back(EnergyStrip); @@ -102,7 +102,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){ double EnergyTotSecond; for(int j=0;j<multCsIE;j++) { - EnergySecond = Data->GetPARISCsIStageEEnergy(j); + EnergySecond = m_EventData->GetPARISCsIStageEEnergy(j); ParisCsI_E.push_back(EnergySecond); EnergyTotSecond +=EnergySecond; diff --git a/NPLib/Paris/TParisPhysics.h b/NPLib/Paris/TParisPhysics.h index 9b2062540fa0268575e0ccc65e26a697b80f48b3..c43841ba8ee1b9aea7d7ec7d1c3f2de64028d30f 100644 --- a/NPLib/Paris/TParisPhysics.h +++ b/NPLib/Paris/TParisPhysics.h @@ -26,6 +26,7 @@ // STD #include <vector> #include <cstdlib> +using namespace std ; // NPL #include "../include/VDetector.h" @@ -34,7 +35,7 @@ // Root #include "TObject.h" #include "TVector3.h" -using namespace std ; + class TParisPhysics : public TObject, public NPA::VDetector{ public: @@ -44,8 +45,6 @@ class TParisPhysics : public TObject, public NPA::VDetector{ public: void Clear(); void Clear(const Option_t*) {}; - void BuildPhysicalEvent(TParisData* Data); - void BuildSimplePhysicalEvent(TParisData* Data); public: /////////////////////////////////////