Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions src/DDConeMeasLayer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ Bool_t DDConeMeasLayer::IsOnSurface(const TVector3 &xx) const {
Double_t r = xxc.Perp();
Double_t z = xxc.Z();
Double_t s = (r - GetTanA()*z) * (r + GetTanA()*z);
const Double_t kTol = 1.e-8;
const Double_t tol = 1.e-8;

#if 0
std::cout << this->TVMeasLayer::GetName() << ":" << this->GetIndex() << ":"
<< "s=" << s << " xx=(" << xx.X() << "," << xx.Y() << "," << xx.Z() << ")"
<< "bool=" << (TMath::Abs(s) < kTol && ((xx.Z()-_Z1)*(xx.Z()-_Z2) <= 0.))
<< "bool=" << (TMath::Abs(s) < tol && ((xx.Z()-_Z1)*(xx.Z()-_Z2) <= 0.))
<< "_Z1=" << _Z1 << " _Z2=" << _Z2 << std::endl;
#endif

return (TMath::Abs(s) < kTol && ((xx.Z()-_Z1)*(xx.Z()-_Z2) <= 0.));
return (TMath::Abs(s) < tol && ((xx.Z()-_Z1)*(xx.Z()-_Z2) <= 0.));
}

Int_t DDConeMeasLayer::CalcXingPointWith(const TVTrack &hel,
Expand Down
2 changes: 1 addition & 1 deletion src/DDCylinderMeasLayer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ DDCylinderMeasLayer::DDCylinderMeasLayer(dd4hep::rec::ISurface* surf,
_cellIDs.push_back( encoder.lowWord() ) ;
}

fSortingPolicy = dynamic_cast<dd4hep::rec::ICylinder*>(surf)->radius()/dd4hep::mm + side * epsilon ;
fSortingPolicy = dynamic_cast<dd4hep::rec::ICylinder&>(*surf).radius()/dd4hep::mm + side * epsilon ;
Comment thread
jmcarcell marked this conversation as resolved.
Outdated

// assumptions made here: the cylinder runs parallel to z and v ...

Expand Down
3 changes: 2 additions & 1 deletion src/DDPlanarMeasLayer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ DDPlanarMeasLayer::DDPlanarMeasLayer(dd4hep::rec::ISurface* surf, Double_t Bz,

// get global/local origin
const dd4hep::rec::Vector3D& o = surf->origin() ;
const dd4hep::rec::Vector3D& oL = ((dd4hep::rec::Surface*)surf)->volSurface().origin() ;
dd4hep::rec::VolSurface vs = ((dd4hep::rec::Surface*)surf)->volSurface();
Comment thread
jmcarcell marked this conversation as resolved.
Outdated
const dd4hep::rec::Vector3D& oL = vs.origin() ;

// dd4hep::rec::Vector3D oR( o[0] , o[1] , 0 ) ; // radial direction of origin in global coordinates
// if ( oR.trans2() < epsilon ){ // if origin has zero length use x-axis
Expand Down
Loading