From ac9dd08c00c68c894a5237d2590a77eef948c5a9 Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Fri, 22 Sep 2017 07:44:26 -0400
Subject: [PATCH] Fix problem with
THcHallCSpectrometer::CalculateTargetQuantities
Previous was trying to return the reconstructed target
quantities as values which was totaly wrong.
Changed so that the references are returned. Now get the
reconstructed target quantities properly.
---
src/THcHallCSpectrometer.cxx | 6 +++---
src/THcHallCSpectrometer.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/THcHallCSpectrometer.cxx b/src/THcHallCSpectrometer.cxx
index 89e3f44..fd145e8 100644
--- a/src/THcHallCSpectrometer.cxx
+++ b/src/THcHallCSpectrometer.cxx
@@ -358,7 +358,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
Double_t xptar=kBig,yptar=kBig,ytar=kBig,delta=kBig;
Double_t xtar=0;
CalculateTargetQuantities(track,xtar,xptar,ytar,yptar,delta);
- // Transfer results to track
+ // Transfer results to track
// No beam raster yet
//; In transport coordinates phi = hyptar = dy/dz and theta = hxptar = dx/dz
//; but for unknown reasons the yp offset is named htheta_offset
@@ -369,7 +369,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
// There is an hpcentral_offset that needs to be applied somewhere.
// (happly_offs)
Double_t ptemp = fPcentral*(1+track->GetDp()/100.0);
- track->SetMomentum(ptemp);
+ track->SetMomentum(ptemp);
TVector3 pvect_temp;
TransportToLab(track->GetP(),track->GetTTheta(),track->GetTPhi(),pvect_temp);
track->SetPvect(pvect_temp);
@@ -387,7 +387,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
return 0;
}
//
-void THcHallCSpectrometer::CalculateTargetQuantities(THaTrack* track,Double_t gbeam_y,Double_t xptar,Double_t ytar,Double_t yptar,Double_t delta)
+void THcHallCSpectrometer::CalculateTargetQuantities(THaTrack* track,Double_t& gbeam_y,Double_t& xptar,Double_t& ytar,Double_t& yptar,Double_t& delta)
{
Double_t hut[5];
Double_t hut_rot[5];
diff --git a/src/THcHallCSpectrometer.h b/src/THcHallCSpectrometer.h
index cd968dc..3f36798 100644
--- a/src/THcHallCSpectrometer.h
+++ b/src/THcHallCSpectrometer.h
@@ -41,7 +41,7 @@ public:
virtual Int_t ReadDatabase( const TDatime& date );
virtual void EnforcePruneLimits();
- virtual void CalculateTargetQuantities(THaTrack* track,Double_t gbeam_y,Double_t xptar,Double_t ytar,Double_t yptar,Double_t delta);
+ virtual void CalculateTargetQuantities(THaTrack* track,Double_t& gbeam_y,Double_t& xptar,Double_t& ytar,Double_t& yptar,Double_t& delta);
virtual Int_t FindVertices( TClonesArray& tracks );
virtual Int_t TrackCalc();
virtual Int_t BestTrackSimple();
--
GitLab