Skip to content

Fix a number of compilation warnings: #11

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
+18 −3
Open

Fix a number of compilation warnings: #11

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
2 changes: 1 addition & 1 deletion src/geomlib/TRKTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TRKTrack : public TEveTrackPropagator {
// Ctors and Dtor
TRKTrack(Double_t chg, TVector3 x, TVector3 p);
TRKTrack(const TRKTrack&);
TRKTrack& operator=(const TRKTrack&) = default ;
TRKTrack& operator=(const TRKTrack&) = delete ;

virtual ~TRKTrack() {}

Expand Down
10 changes: 9 additions & 1 deletion src/geomlib/TRungeKuttaTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class TRungeKuttaTrack : public THelicalTrack {
void SetFromTrack(THelicalTrack& heltrack);

// Utility methods
virtual void MoveTo(const TVector3 &globalPivot,
virtual void MoveTo(const TVector3 &globalPivot,
Double_t &step,
TMatrixD *FPtr = 0,
TMatrixD *F12Ptr = 0,
Expand All @@ -80,6 +80,14 @@ class TRungeKuttaTrack : public THelicalTrack {
Double_t &step,
TKalMatrix &FPtr);

// Do not allow calls to the base class method.
virtual void MoveTo(const TVector3 &,
Double_t &,
TMatrixD *,
TMatrixD *,
Bool_t )
{ std::abort(); }

virtual TVector3 CalcXAt (Double_t h) const;
virtual TMatrixD CalcDxDa (Double_t h) const;
virtual TMatrixD CalcDxDphi(Double_t h) const;
Expand Down
1 change: 1 addition & 0 deletions src/geomlib/TTube.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Int_t TTube::CalcXingPointWith(const TVTrack &hel,
}
}
if (IsOnBarrel(xx)) return 1;
[[fallthrough]];
default: // track hitting end cap part
if (TMath::Abs(tnl) < 0.1) {
return 0;
Expand Down
2 changes: 2 additions & 0 deletions src/kallib/TKalMatrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class TKalMatrix : public TMatrixD {

TKalMatrix(const TRotation &r);

TKalMatrix& operator= (const TKalMatrix &orig) = default;

virtual ~TKalMatrix() {}

// virtual void DebugPrint() const { DebugPrint( "", 5 , std::cerr ) ; }
Expand Down
4 changes: 4 additions & 0 deletions src/kaltracklib/TKalTrackState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ class TKalTrackState : public TVKalState {
TKalMatrix &F,
TKalMatrix &Q) const;

virtual void DebugPrint(std::ostream& os, Option_t *, Int_t ) const
{ DebugPrint(os); }
virtual void DebugPrint(Option_t *, Int_t ) const
{ DebugPrint(); }
void DebugPrint() const ;
void DebugPrint( std::ostream& os ) const;

Expand Down
2 changes: 1 addition & 1 deletion src/kaltracklib/TTrackFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TTrackFrame {
//rotation matrix.
TTrackFrame(const TTrackFrame &lastFrame, const TVector3 &v, const TVector3 &b);

//TTrackFrame& operator=( const TTrackFrame& frame );
TTrackFrame& operator=( const TTrackFrame& frame ) = default;

virtual ~TTrackFrame() {}

Expand Down