Skip to content
Snippets Groups Projects
Commit ac9dd08c authored by Mark Jones's avatar Mark Jones Committed by Mark K Jones
Browse files

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.
parent 21053544
No related branches found
No related tags found
No related merge requests found
...@@ -358,7 +358,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks ) ...@@ -358,7 +358,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
Double_t xptar=kBig,yptar=kBig,ytar=kBig,delta=kBig; Double_t xptar=kBig,yptar=kBig,ytar=kBig,delta=kBig;
Double_t xtar=0; Double_t xtar=0;
CalculateTargetQuantities(track,xtar,xptar,ytar,yptar,delta); CalculateTargetQuantities(track,xtar,xptar,ytar,yptar,delta);
// Transfer results to track // Transfer results to track
// No beam raster yet // No beam raster yet
//; In transport coordinates phi = hyptar = dy/dz and theta = hxptar = dx/dz //; In transport coordinates phi = hyptar = dy/dz and theta = hxptar = dx/dz
//; but for unknown reasons the yp offset is named htheta_offset //; but for unknown reasons the yp offset is named htheta_offset
...@@ -369,7 +369,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks ) ...@@ -369,7 +369,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
// There is an hpcentral_offset that needs to be applied somewhere. // There is an hpcentral_offset that needs to be applied somewhere.
// (happly_offs) // (happly_offs)
Double_t ptemp = fPcentral*(1+track->GetDp()/100.0); Double_t ptemp = fPcentral*(1+track->GetDp()/100.0);
track->SetMomentum(ptemp); track->SetMomentum(ptemp);
TVector3 pvect_temp; TVector3 pvect_temp;
TransportToLab(track->GetP(),track->GetTTheta(),track->GetTPhi(),pvect_temp); TransportToLab(track->GetP(),track->GetTTheta(),track->GetTPhi(),pvect_temp);
track->SetPvect(pvect_temp); track->SetPvect(pvect_temp);
...@@ -387,7 +387,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks ) ...@@ -387,7 +387,7 @@ Int_t THcHallCSpectrometer::FindVertices( TClonesArray& tracks )
return 0; 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[5];
Double_t hut_rot[5]; Double_t hut_rot[5];
......
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
virtual Int_t ReadDatabase( const TDatime& date ); virtual Int_t ReadDatabase( const TDatime& date );
virtual void EnforcePruneLimits(); 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 FindVertices( TClonesArray& tracks );
virtual Int_t TrackCalc(); virtual Int_t TrackCalc();
virtual Int_t BestTrackSimple(); virtual Int_t BestTrackSimple();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment