diff --git a/src/THcHallCSpectrometer.cxx b/src/THcHallCSpectrometer.cxx index 33a7e9e8c32ab4899eab6dca8067606ced338d7a..13852f1bc42cab0e18e87330251b6b1f79aadeb2 100644 --- a/src/THcHallCSpectrometer.cxx +++ b/src/THcHallCSpectrometer.cxx @@ -109,17 +109,17 @@ THcHallCSpectrometer::~THcHallCSpectrometer() } //_____________________________________________________________________________ -Int_t THaSpectrometer::DefineVariables( EMode mode ) +Int_t THcHallCSpectrometer::DefineVariables( EMode mode ) { // Define/delete standard variables for a spectrometer (tracks etc.) // Can be overridden or extended by derived (actual) apparatuses - if( mode == kDefine && fIsSetup ) return kOK; - THaSpectrometer::DefineVariables( mode ); + fIsSetup = ( mode == kDefine ); + // THaSpectrometer::DefineVariables( mode ); RVarDef vars[] = { - { "tr.beta", "Beta", "fTracks,THaTrack.GetBeta()"}, - { "tr.betachisq", "Chi2 of beta", "fTracks,THaTrack.GetBetaChi2()"}, + { "tr.beta", "Beta", "fTracks.THaTrack.GetBeta()"}, + { "tr.betachisq", "Chi2 of beta", "fTracks.THaTrack.GetBetaChi2()"}, { 0 } }; @@ -310,12 +310,11 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date ) fNReconTerms++; good = getline(ifile,line).good(); } - cout << "Read " << fNReconTerms << " matrix element terms" << endl; + cout << "Read " << fNReconTerms << " matrix element terms" << endl; if(!good) { Error(here, "Error processing reconstruction coefficient file %s",reconCoeffFilename.c_str()); return kInitError; // Is this the right return code? } - return kOK; } diff --git a/src/THcHallCSpectrometer.h b/src/THcHallCSpectrometer.h index 931ec23a2ee0e0887b2f5b0afb551ff13306f1bf..7f195bb7feefd7967caab737b16141027ba9e055 100644 --- a/src/THcHallCSpectrometer.h +++ b/src/THcHallCSpectrometer.h @@ -46,6 +46,7 @@ public: virtual Int_t TrackTimes( TClonesArray* tracks ); virtual Int_t ReadRunDatabase( const TDatime& date ); + virtual Int_t DefineVariables( EMode mode = kDefine ); Bool_t SetTrSorting( Bool_t set = kFALSE ); Bool_t GetTrSorting() const;