diff --git a/src/THcReactionPoint.cxx b/src/THcReactionPoint.cxx index b37e2b3c5d2de7c2bf8bbe038662452cbfe946a8..f6f45ac5b4c4cd7daa525cd988a800d3e53dff22 100644 --- a/src/THcReactionPoint.cxx +++ b/src/THcReactionPoint.cxx @@ -1,4 +1,4 @@ -//*-- Author : Ole Hansen 13-Mar-03 +//*-- Author : Mark Jones, March 2018 #include "THcReactionPoint.h" #include "THaSpectrometer.h" @@ -19,8 +19,7 @@ ClassImp(THcReactionPoint) //_____________________________________________________________________________ THcReactionPoint::THcReactionPoint( const char* name, const char* description, const char* spectro, const char* beam ) : - THaPhysicsModule(name,description), fSpectroName(spectro), - fBeamName(beam), fSpectro(NULL), fBeam(NULL) +THaReactionPoint(name, description, spectro, beam) { // Normal constructor. @@ -34,48 +33,6 @@ THcReactionPoint::~THcReactionPoint() DefineVariables( kDelete ); } -//_____________________________________________________________________________ -void THcReactionPoint::Clear( Option_t* opt ) -{ - // Clear all event-by-event variables. - - THaPhysicsModule::Clear(opt); - VertexClear(); -} - -//_____________________________________________________________________________ -Int_t THcReactionPoint::DefineVariables( EMode mode ) -{ - // Define/delete analysis variables - - if( mode == kDefine && fIsSetup ) return kOK; - fIsSetup = ( mode == kDefine ); - - return DefineVarsFromList( THaVertexModule::GetRVarDef(), mode ); -} - -//_____________________________________________________________________________ -THaAnalysisObject::EStatus THcReactionPoint::Init( const TDatime& run_time ) -{ - // Initialize the module. - // Locate the spectrometer apparatus named in fSpectroName and save - // pointer to it. - - // Standard initialization. Calls this object's DefineVariables(). - if( THaPhysicsModule::Init( run_time ) != kOK ) - return fStatus; - - fSpectro = static_cast<THaSpectrometer*> - ( FindModule( fSpectroName.Data(), "THaSpectrometer")); - if( !fSpectro ) - return fStatus; - - if( fBeamName.Length() > 0 ) - fBeam = static_cast<THaBeam*>( FindModule( fBeamName.Data(), "THaBeam") ); - - return fStatus; -} - //_____________________________________________________________________________ Int_t THcReactionPoint::Process( const THaEvData& ) { diff --git a/src/THcReactionPoint.h b/src/THcReactionPoint.h index d4d1e5263454f03951c73dfe5b17ca59007003df..243fc8c01c8cf1ff9df2515586c14711eb081285 100644 --- a/src/THcReactionPoint.h +++ b/src/THcReactionPoint.h @@ -7,49 +7,20 @@ // ////////////////////////////////////////////////////////////////////////// -#include "THaPhysicsModule.h" -#include "THaVertexModule.h" -#include "TString.h" +#include "THaReactionPoint.h" -class THaSpectrometer; -class THaBeam; - -class THcReactionPoint : public THaPhysicsModule, public THaVertexModule { +class THcReactionPoint : public THaReactionPoint { public: THcReactionPoint( const char* name, const char* description, const char* spectro="", const char* beam="" ); virtual ~THcReactionPoint(); - virtual void Clear( Option_t* opt="" ); - - virtual EStatus Init( const TDatime& run_time ); virtual Int_t Process( const THaEvData& ); - void SetSpectrometer( const char* name ); - void SetBeam( const char* name ); protected: - TString fSpectroName; // Name of spectrom. to consider - TString fBeamName; // Name of beam position apparatus - THaSpectrometer* fSpectro; // Pointer to spectrometer object - THaBeam* fBeam; // Pointer to beam position apparatus - - virtual Int_t DefineVariables( EMode mode = kDefine ); - ClassDef(THcReactionPoint,0) //Single arm track-beam vertex module }; -//_________ inlines __________________________________________________________ -inline -void THcReactionPoint::SetSpectrometer( const char* name ) { - fSpectroName = name; -} - -//_____________________________________________________________________________ -inline -void THcReactionPoint::SetBeam( const char* name ) { - fBeamName = name; -} - #endif