Skip to content

Fix a number of compilation warnings: #3

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

Open
scott-snyder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix a number of compilation warnings: #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ild/common/ILDConeMeasLayer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ Bool_t ILDConeMeasLayer::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() << ":" << std::endl;
std::cout << "s=" << s << " xx=(" << xx.X() << "," << xx.Y() << "," << xx.Z() << ")" << std::endl;
std::cout << "bool=" << (TMath::Abs(s) < kTol && ((xx.Z()-fZ1)*(xx.Z()-fZ2) <= 0.)) << std::endl;
std::cout << "bool=" << (TMath::Abs(s) < tol && ((xx.Z()-fZ1)*(xx.Z()-fZ2) <= 0.)) << std::endl;
std::cout << "fZ1=" << fZ1 << " fZ2=" << fZ2 << std::endl;
#endif

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

4 changes: 4 additions & 0 deletions ild/ftd/ILDFTDKalDetector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,9 @@ void ILDFTDKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
// which if traversed in the reverse direction to the next boundary then the track be propagated through carbon
// for a significant distance

#ifndef NDEBUG
double eps = 1.0e-08;
#endif

for(int disk=0; disk< _nDisks; ++disk){

Expand Down Expand Up @@ -480,6 +482,7 @@ void ILDFTDKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){

// there should be no gap between support and sensitive

#ifndef NDEBUG
for( int iPetal=0; iPetal< _FTDgeo[disk].nPetals; iPetal++){


Expand All @@ -491,6 +494,7 @@ void ILDFTDKalDetector::setupGearGeom( const gear::GearMgr& gearMgr ){
assert( fabs( endSensitive- endSupport ) < eps );

}
#endif

////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down
8 changes: 4 additions & 4 deletions ild/support/ILDSupportKalDetector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ TVKalDetector(10)


//SJA:FIXME: HERE WE NEED TO MAKE SURE THAT THE BEAM PIPE IS NEVER DECREASING IN RADII OTHERWISE THE SORTING GOES WRONG
if ( rInnerStart < rInnerStart_last ) rInnerStart = rInnerStart_last; rInnerStart_last = rInnerStart;
if ( rInnerEnd < rInnerEnd_last ) rInnerEnd = rInnerEnd_last ; rInnerEnd_last = rInnerEnd;
if ( rOuterStart < rOuterStart_last ) rOuterStart = rOuterStart_last; rOuterStart_last = rOuterStart;
if ( rOuterEnd < rOuterEnd_last ) rOuterEnd = rOuterEnd_last; rOuterEnd_last = rOuterEnd;
rInnerStart = std::max (rInnerStart, rInnerStart_last); rInnerStart_last = rInnerStart;
rInnerEnd = std::max (rInnerEnd, rInnerEnd_last); rInnerEnd_last = rInnerEnd;
rOuterStart = std::max (rOuterStart, rOuterStart_last); rOuterStart_last = rOuterStart;
rOuterEnd = std::max (rOuterEnd, rOuterEnd_last); rOuterEnd_last = rOuterEnd;


std::stringstream sname;
Expand Down