From 1c3012e510242f1e8450266cd44d60bdd93a985a Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Tue, 20 Jan 2015 17:32:18 -0500
Subject: [PATCH] Modify THcHallCSpectrometer THcHallCSpectrometer inherits
from THaSpectrometer which has method GetPcentral and a member fPcentral.
THcHallCSpectrometer had been using fPCentral but decided to use
fPcentral. Delete fPCentral in THcHallCSpectrometer.h Replace all
fPCentral by fPcentral in ReadDatabase and FindVertices methods.
---
src/THcHallCSpectrometer.cxx | 8 ++++----
src/THcHallCSpectrometer.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/THcHallCSpectrometer.cxx b/src/THcHallCSpectrometer.cxx
index b5f5723..b5f68c1 100644
--- a/src/THcHallCSpectrometer.cxx
+++ b/src/THcHallCSpectrometer.cxx
@@ -206,7 +206,7 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
{"thetacentral_offset", &fThetaCentralOffset, kDouble },
{"_oopcentral_offset", &fOopCentralOffset, kDouble },
{"pcentral_offset", &fPCentralOffset, kDouble },
- {"pcentral", &fPCentral, kDouble },
+ {"pcentral", &fPcentral, kDouble },
{"theta_lab", &fTheta_lab, kDouble },
{"partmass", &fPartMass, kDouble },
{"sel_using_scin", &fSelUsingScin, kInt, 0, 1},
@@ -251,9 +251,9 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
cout << "fPruneNPMT = " << fPruneNPMT << endl;
cout << "sel using prune = " << fSelUsingPrune << endl;
cout << "fPartMass = " << fPartMass << endl;
- cout << "fPcentral = " << fPCentral << " " <<fPCentralOffset << endl;
+ cout << "fPcentral = " << fPcentral << " " <<fPCentralOffset << endl;
cout << "fThate_lab = " << fTheta_lab << " " <<fThetaCentralOffset << endl;
- fPCentral= fPCentral*(1.+fPCentralOffset/100.);
+ fPcentral= fPcentral*(1.+fPCentralOffset/100.);
// Check that these offsets are in radians
fTheta_lab=fTheta_lab + fThetaCentralOffset*TMath::RadToDeg();
Double_t ph = 0.0+fPhiOffset*TMath::RadToDeg();
@@ -378,7 +378,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
track->SetDp(sum[3]*100.0+fDeltaOffset); // Percent. (Don't think podd cares if it is % or fraction)
// There is an hpcentral_offset that needs to be applied somewhere.
// (happly_offs)
- track->SetMomentum(fPCentral*(1+track->GetDp()/100.0));
+ track->SetMomentum(fPcentral*(1+track->GetDp()/100.0));
}
diff --git a/src/THcHallCSpectrometer.h b/src/THcHallCSpectrometer.h
index 4306196..1e132ad 100644
--- a/src/THcHallCSpectrometer.h
+++ b/src/THcHallCSpectrometer.h
@@ -123,9 +123,8 @@ protected:
Double_t fThetaCentralOffset; // Offset of Central spectrometer angle (rad)
Double_t fOopCentralOffset; //Offset of central out-of-plane angle (rad)
Double_t fPCentralOffset; // Offset Central spectrometer momentum (%)
- Double_t fPCentral; // Central spectrometer momentum (GeV)
Double_t fTheta_lab; // Central spectrometer angle (deg)
-
+ // For spectrometer central momentum use fPcentral in THaSpectrometer.h
// THaScintillator *sc_ref; // calculate time track hits this plane
// Flag for fProperties indicating that tracks are to be sorted by chi2
--
GitLab