Skip to content

Fixed TGeoPGon::GetPhiCrossList for point on the Z axis. #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
agheata wants to merge 2 commits into from
Closed

Fixed TGeoPGon::GetPhiCrossList for point on the Z axis. #484

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18ecdbd
Fixed TGeoPGon::GetPhiCrossList for point on the Z axis.
agheata Apr 6, 2017
b073643
Merge remote-tracking branch 'upstream/master'
agheata Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions geom/geom/src/TGeoPgon.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,24 +540,23 @@ Int_t TGeoPgon::GetPhiCrossList(const Double_t *point, const Double_t *dir, Int_
if (shootorig) {
Double_t rdotn = point[0]*dir[0]+point[1]*dir[1];
if (rdotn>0) {
sphi[icrossed] = stepmax;
iphi[icrossed++] = istart;
return icrossed;
sphi[0] = stepmax;
iphi[0] = istart;
return 1;
}
sphi[icrossed] = TMath::Sqrt((point[0]*point[0]+point[1]*point[1])/(1.-dir[2]*dir[2]));
iphi[icrossed++] = istart;
if (sphi[icrossed-1]>stepmax) {
sphi[icrossed-1] = stepmax;
return icrossed;
sphi[0] = TMath::Sqrt((point[0]*point[0]+point[1]*point[1])/(1.-dir[2]*dir[2]));
iphi[0] = istart;
if (sphi[0]>stepmax) {
sphi[0] = stepmax;
return 1;
}
phi = TMath::ATan2(dir[1], dir[0])*TMath::RadToDeg();
while (phi<fPhi1) phi+=360.;
istart = Int_t((phi-fPhi1)/divphi);
if (istart>fNedges-1) istart=-1;
iphi[icrossed] = istart;
sphi[icrossed] = stepmax;
icrossed++;
return icrossed;
iphi[0] = istart;
sphi[0] = stepmax;
return 1;
}
Int_t incsec = Int_t(TMath::Sign(1., point[0]*dir[1]-point[1]*dir[0]));
Int_t ist;
Expand Down