From 64f87c9cbcca8a89e38ca2be6b03d7046bf51f24 Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Fri, 19 Dec 2014 18:47:33 -0500
Subject: [PATCH] Fixed problems with DefineVariables in THcHallCSpectrometer
---
src/THcHallCSpectrometer.cxx | 13 ++++++-------
src/THcHallCSpectrometer.h | 1 +
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/THcHallCSpectrometer.cxx b/src/THcHallCSpectrometer.cxx
index 33a7e9e..13852f1 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 931ec23..7f195bb 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;
--
GitLab