diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXEventGen.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXEventGen.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXEventGen.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXEventGen.cxx 2023-11-24 19:49:40 @@ -84,7 +84,7 @@ Double_t dfis = dfi; if(!ms.CalcXingPointWith(heltrk, crossingPoint, dfi, 1, eps)) - { + { //no crossing point if (is1stloop && fHitBufPtr->GetEntries() > 3) { @@ -93,20 +93,20 @@ dfi = dfis; continue; } - else - { - std::cout << "no crossing point, stop generating" << std::endl; - break; - } + else + { + std::cout << "no crossing point, stop generating" << std::endl; + break; + } } // should use the material behind the surface since dfi is measured // from the last point to the current surface Bool_t dir = dlyr < 0 ? kTRUE : kFALSE; - const TMaterial &mat = ms.GetMaterial(dir); - if (fCradlePtr->IsMSOn()) - { + [[maybe_unused]] const TMaterial &mat = ms.GetMaterial(dir); + if (fCradlePtr->IsMSOn()) + { TKalMatrix Qms(5,5); ms.CalcQms(dir, heltrk, dfi, Qms); Double_t sgphi = TMath::Sqrt(Qms(1,1)); @@ -136,10 +136,10 @@ heltrk.SetTo(av, heltrk.GetPivot()); } - if (ms.IsActive()) + if (ms.IsActive()) { ms.ProcessHit(crossingPoint, *fHitBufPtr); - } + } } } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx 2023-11-24 18:49:08 @@ -42,7 +42,7 @@ // ----------------- // Drawing method for event display // -void EXHYBTrack::Draw(Int_t color, const Char_t *opt) +void EXHYBTrack::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { if (!gPad || !GetEntries()) return; gPad->cd(); diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHYBTrack.h v02-05-01/examples/kaltest/ct_nonuniform/EXHYBTrack.h --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHYBTrack.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXHYBTrack.h 2023-11-24 15:56:54 @@ -30,6 +30,7 @@ ~EXHYBTrack() {} using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); ClassDef(EXHYBTrack,1) // Hybrid track class for Kalman Filter diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHit.h v02-05-01/examples/kaltest/ct_nonuniform/EXHit.h --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXHit.h 2023-11-24 15:56:54 @@ -18,6 +18,7 @@ // Parent's pure virtual functions to implement virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; ClassDef(EXHit,1) // Sample hit class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXKalDetector.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXKalDetector.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXKalDetector.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXKalDetector.cxx 2023-11-24 19:21:51 @@ -87,7 +87,7 @@ tubep->SetBit(kCanDelete); fNodePtr = new TNode(nname,nname,name); fNodePtr->SetLineColor(color); - fNodePtr->SetLineWidth(0.01); + //fNodePtr->SetLineWidth(0.01); } EXVKalDetector::Draw(color,opt); diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXKalDetector.h v02-05-01/examples/kaltest/ct_nonuniform/EXKalDetector.h --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXKalDetector.h 2023-11-24 15:56:54 @@ -14,7 +14,7 @@ // Utility methods - static Double_t GetBfield (const TVector3 &xx = TVector3(0., 0., 0.)) + static Double_t GetBfield ([[maybe_unused]] const TVector3 &xx = TVector3(0., 0., 0.)) { return fgBfield; } void Draw(Int_t color, const Char_t *opt = ""); diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx 2023-11-24 15:56:54 @@ -20,7 +20,7 @@ return rkTrack; } -void EXRKEventGen::Swim(TRKTrack &rktrk, Double_t mass) +void EXRKEventGen::Swim(TRKTrack &rktrk, [[maybe_unused]] Double_t mass) { // --------------------------- // Swim track and make hits diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx 2023-11-24 15:58:24 @@ -20,7 +20,7 @@ return rkTrack; } -void EXRungeKuttaEventGen::Swim(TRungeKuttaTrack &rktrk, Double_t mass) +void EXRungeKuttaEventGen::Swim(TRungeKuttaTrack &rktrk, [[maybe_unused]] Double_t mass) { // --------------------------- // Swim track and make hits diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx v02-05-01/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx 2023-11-24 15:56:53 @@ -27,7 +27,7 @@ TNode *EXVKalDetector::GetNodePtr() { if (!fgNodePtr) { - TRotMatrix* rot = new TRotMatrix("rotm","rotm", 10.,80.,10.,80.,10.,80.); + [[maybe_unused]] TRotMatrix* rot = new TRotMatrix("rotm","rotm", 10.,80.,10.,80.,10.,80.); new TTUBE("Det","Det","void",1820.,1820.,2020.); fgNodePtr = new TNode("World","World","Det",0.,0.,0.,"rotm"); } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXVKalDetector.h v02-05-01/examples/kaltest/ct_nonuniform/EXVKalDetector.h --- v02-05-01.ORIG/examples/kaltest/ct_nonuniform/EXVKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/ct_nonuniform/EXVKalDetector.h 2023-11-24 15:57:12 @@ -22,6 +22,7 @@ { return TBField::GetGlobalBfield(xx).Mag(); } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt = ""); static void SetNodePtr(TNode *nodep) { fgNodePtr = nodep; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeHit.h v02-05-01/examples/kaltest/hybrid/bp/EXBPConeHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPConeHit.h 2023-11-24 14:48:44 @@ -20,6 +20,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline const TVector3 GetExactX() const { return fXX; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx v02-05-01/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx 2023-11-24 19:21:51 @@ -93,10 +93,10 @@ return TVector3(x,y,z); } -void EXBPConeMeasLayer::CalcDhDa(const TVTrackHit &vht, - const TVector3 &xxv, - const TKalMatrix &dxphiada, - TKalMatrix &H) const +void EXBPConeMeasLayer::CalcDhDa([[maybe_unused]] const TVTrackHit &vht, + const TVector3 &xxv, + const TKalMatrix &dxphiada, + TKalMatrix &H) const { // Calculate // H = (@h/@a) = (@phi/@a, @z/@a)^t @@ -178,7 +178,7 @@ // ----------------- // Drawing method for event display // -void EXBPConeMeasLayer::Draw(Int_t color, const Char_t *opt) +void EXBPConeMeasLayer::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { if (!gPad) return; if (!IsActive()) return; @@ -192,7 +192,7 @@ conep->SetBit(kCanDelete); TNode *nodep = new TNode(nname,nname,name,0.,0.,(fZ1+fZ2)/2); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + //nodep->SetLineWidth(0.01); SetNodePtr(nodep); } } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h v02-05-01/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h 2023-11-24 14:48:44 @@ -62,6 +62,7 @@ Double_t GetSigmaZ() const { return fSigmaZ; } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); private: diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPHit.h v02-05-01/examples/kaltest/hybrid/bp/EXBPHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPHit.h 2023-11-24 14:48:44 @@ -20,6 +20,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline const TVector3 GetExactX() const { return fXX; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx v02-05-01/examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx 2023-11-24 19:21:51 @@ -76,7 +76,7 @@ return TVector3(x,y,z); } -void EXBPMeasLayer::CalcDhDa(const TVTrackHit &vht, +void EXBPMeasLayer::CalcDhDa([[maybe_unused]] const TVTrackHit &vht, const TVector3 &xxv, const TKalMatrix &dxphiada, TKalMatrix &H) const @@ -137,7 +137,7 @@ // ----------------- // Drawing method for event display // -void EXBPMeasLayer::Draw(Int_t color, const Char_t *opt) +void EXBPMeasLayer::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { if (!gPad) return; if (!IsActive()) return; @@ -150,7 +150,7 @@ tubep->SetBit(kCanDelete); TNode *nodep = new TNode(nname,nname,name); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + //nodep->SetLineWidth(0.01); SetNodePtr(nodep); } } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPMeasLayer.h v02-05-01/examples/kaltest/hybrid/bp/EXBPMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/bp/EXBPMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/bp/EXBPMeasLayer.h 2023-11-24 14:48:44 @@ -56,6 +56,7 @@ Double_t GetSigmaZ() const { return fSigmaZ; } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); private: diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/gen/EXEventGen.cxx v02-05-01/examples/kaltest/hybrid/gen/EXEventGen.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/gen/EXEventGen.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/gen/EXEventGen.cxx 2023-11-24 19:49:40 @@ -44,7 +44,7 @@ return THelicalTrack(dr,fi0,cpa,dz,tnl,x0,y0,z0,b); } -void EXEventGen::Swim(THelicalTrack &heltrk) +void EXEventGen::Swim(THelicalTrack &heltrk, [[maybe_unused]] Double_t mass) { // --------------------------- // Swim track and Make hits diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/gen/EXEventGen.h v02-05-01/examples/kaltest/hybrid/gen/EXEventGen.h --- v02-05-01.ORIG/examples/kaltest/hybrid/gen/EXEventGen.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/gen/EXEventGen.h 2023-11-24 20:10:45 @@ -1,5 +1,5 @@ -#ifndef __EXEVENTGEN__ -#define __EXEVENTGEN__ +#ifndef EXEVENTGEN_H +#define EXEVENTGEN_H #include "TKalDetCradle.h" #include "THelicalTrack.h" @@ -13,7 +13,7 @@ THelicalTrack GenerateHelix(Double_t pt, Double_t cosmin, Double_t cosmax); - void Swim(THelicalTrack &heltrk); + void Swim(THelicalTrack &heltrk, Double_t mass); static void SetT0(Double_t t0) { fgT0 = t0; } static Double_t GetT0() { return fgT0; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBHit.h v02-05-01/examples/kaltest/hybrid/it/EXITFBHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITFBHit.h 2023-11-24 14:48:44 @@ -1,5 +1,5 @@ -#ifndef __EXITFBHIT__ -#define __EXITHFBIT__ +#ifndef EXITFBHIT_H +#define EXITFBHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" @@ -20,6 +20,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline const TVector3 GetExactX() const { return fXX; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx v02-05-01/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx 2023-11-24 19:21:51 @@ -93,10 +93,10 @@ return TVector3(x, y, z); } -void EXITFBMeasLayer::CalcDhDa(const TVTrackHit &vht, - const TVector3 &xxv, - const TKalMatrix &dxphiada, - TKalMatrix &H) const +void EXITFBMeasLayer::CalcDhDa([[maybe_unused]] const TVTrackHit &vht, + [[maybe_unused]] const TVector3 &xxv, + const TKalMatrix &dxphiada, + TKalMatrix &H) const { // Calculate // H = (@h/@a) = (@phi/@a, @z/@a)^t @@ -163,7 +163,7 @@ // ----------------- // Drawing method for event display // -void EXITFBMeasLayer::Draw(Int_t color, const Char_t *opt) +void EXITFBMeasLayer::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { Double_t upperbase = 0; Double_t lowerbase = 0; @@ -196,7 +196,7 @@ TRotMatrix *rmatp = new TRotMatrix( "rmat", "rmat", rmat); TNode *nodep = new TNode(nname,nname,trap,GetXc().X()+GetMode()*(GetdxMax()+GetdxMin())/8,GetXc().Y(),z+Sinalpha()*GetMode()*(GetdxMax()+GetdxMin())/8,rmatp,""); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + //nodep->SetLineWidth(0.01); SetNodePtr(nodep); } } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBMeasLayer.h v02-05-01/examples/kaltest/hybrid/it/EXITFBMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITFBMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITFBMeasLayer.h 2023-11-24 20:11:05 @@ -1,5 +1,5 @@ -#ifndef __EXITFBMEASLAYER__ -#define __EXITFBMEASLAYER__ +#ifndef EXITFBMEASLAYER_H +#define EXITFBMEASLAYER_H //************************************************************************* //* =================== //* EXITFBMeasLayer Class @@ -79,6 +79,7 @@ inline Double_t Sinalpha() const {return -TMath::Abs(GetNormal().X()/Cosphi()); } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); private: diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITHit.h v02-05-01/examples/kaltest/hybrid/it/EXITHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITHit.h 2023-11-24 20:11:52 @@ -1,5 +1,5 @@ -#ifndef __EXITHIT__ -#define __EXITHIT__ +#ifndef EXITHIT_H +#define EXITHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" @@ -31,6 +31,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline const TVector3 GetExactX() const { return fXX; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITKalDetector.h v02-05-01/examples/kaltest/hybrid/it/EXITKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITKalDetector.h 2023-11-24 20:33:03 @@ -1,5 +1,5 @@ -#ifndef __EXITDETECTOR__ -#define __EXITDETECTOR__ +#ifndef EXITDETECTOR_H +#define EXITDETECTOR_H #include "EXVKalDetector.h" #include "TMath.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITMeasLayer.cxx v02-05-01/examples/kaltest/hybrid/it/EXITMeasLayer.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITMeasLayer.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITMeasLayer.cxx 2023-11-24 19:21:51 @@ -85,10 +85,10 @@ return TVector3(x,y,z); } -void EXITMeasLayer::CalcDhDa(const TVTrackHit &vht, - const TVector3 &xxv, - const TKalMatrix &dxphiada, - TKalMatrix &H) const +void EXITMeasLayer::CalcDhDa([[maybe_unused]] const TVTrackHit &vht, + const TVector3 &xxv, + const TKalMatrix &dxphiada, + TKalMatrix &H) const { // Calculate // H = (@h/@a) = (@phi/@a, @z/@a)^t @@ -163,7 +163,7 @@ // ----------------- // Drawing method for event display // -void EXITMeasLayer::Draw(Int_t color, const Char_t *opt) +void EXITMeasLayer::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { if (!gPad) return; if (!IsActive()) return; @@ -176,7 +176,7 @@ tubep->SetBit(kCanDelete); TNode *nodep = new TNode(nname,nname,name); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + //nodep->SetLineWidth(0.01); SetNodePtr(nodep); } } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITMeasLayer.h v02-05-01/examples/kaltest/hybrid/it/EXITMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/it/EXITMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/it/EXITMeasLayer.h 2023-11-24 20:12:21 @@ -1,5 +1,5 @@ -#ifndef __EXITMEASLAYER__ -#define __EXITMEASLAYER__ +#ifndef EXITMEASLAYER_H +#define EXITMEASLAYER_H //************************************************************************* //* =================== //* EXITMeasLayer Class @@ -53,6 +53,7 @@ Double_t GetSigmaZ() const { return fSigmaZ; } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); private: diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXHYBTrack.cxx v02-05-01/examples/kaltest/hybrid/kern/EXHYBTrack.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXHYBTrack.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/kern/EXHYBTrack.cxx 2023-11-24 14:48:44 @@ -38,7 +38,7 @@ // ----------------- // Drawing method for event display // -void EXHYBTrack::Draw(Int_t color, const Char_t *opt) +void EXHYBTrack::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { if (!gPad || !GetEntries()) return; gPad->cd(); diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXHYBTrack.h v02-05-01/examples/kaltest/hybrid/kern/EXHYBTrack.h --- v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXHYBTrack.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/kern/EXHYBTrack.h 2023-11-24 14:48:44 @@ -1,5 +1,5 @@ -#ifndef __EXHYBTRACK__ -#define __EXHYBTRACK__ +#ifndef EXHYBTRACK_H +#define EXHYBTRACK_H //************************************************************************* //* ================= //* EXHYBTrack Class @@ -30,6 +30,7 @@ ~EXHYBTrack() {} using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); ClassDef(EXHYBTrack,1) // Hybrid track class for Kalman Filter diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXVKalDetector.h v02-05-01/examples/kaltest/hybrid/kern/EXVKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXVKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/kern/EXVKalDetector.h 2023-11-24 20:12:39 @@ -1,5 +1,5 @@ -#ifndef __EXVDETECTOR__ -#define __EXVDETECTOR__ +#ifndef EXVDETECTOR_H +#define EXVDETECTOR_H #include "TVector3.h" #include "TVKalDetector.h" @@ -17,10 +17,11 @@ inline virtual void PowerOn () { fIsPowerOn = kTRUE; } inline virtual void PowerOff () { fIsPowerOn = kFALSE; } - static Double_t GetBfield (const TVector3 &xx = TVector3(0., 0., 0.)) + static Double_t GetBfield ([[maybe_unused]] const TVector3 &xx = TVector3(0., 0., 0.)) { return fgBfield; } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt = ""); static void SetNodePtr(TNode *nodep) { fgNodePtr = nodep; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXVMeasLayer.h v02-05-01/examples/kaltest/hybrid/kern/EXVMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/kern/EXVMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/kern/EXVMeasLayer.h 2023-11-24 20:12:50 @@ -1,5 +1,5 @@ -#ifndef __EXVMEASLAYER__ -#define __EXVMEASLAYER__ +#ifndef EXVMEASLAYER_H +#define EXVMEASLAYER_H //************************************************************************* //* =================== //* EXVMeasLayer Class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/main/EXKalTest.cxx v02-05-01/examples/kaltest/hybrid/main/EXKalTest.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/main/EXKalTest.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/main/EXKalTest.cxx 2023-11-24 19:49:40 @@ -19,6 +19,9 @@ #include "EXHYBTrack.h" #include "TCanvas.h" +#include "TSystem.h" +#include "TRootCanvas.h" +#include "TGFrame.h" #include "TView.h" #include "TRotMatrix.h" #include "TTUBE.h" @@ -174,7 +177,13 @@ // Loop over events // =================================================================== - for (Int_t eventno = 0; eventno < nevents; eventno++) { + [[maybe_unused]] static const Double_t kMpi = 0.13957018; // pion mass [GeV][[ + #if 1 + Double_t mass = kMpi; + #else + Double_t mass = 100.; + #endif + for (Int_t eventno = 0; eventno < nevents; eventno++) { cerr << "------ Event " << eventno << " ------" << endl; kalhits.Delete(); // clear hit data @@ -189,7 +198,7 @@ // Swim the particle in detector // ============================================================ - gen.Swim(hel); + gen.Swim(hel, mass); // ============================================================ // Do Kalman Filter @@ -372,9 +381,11 @@ // ============================================================ static TCanvas *cvp = 0; + static TRootCanvas *rcp = 0; if (!gROOT->IsBatch()) { if (!cvp) { cvp = new TCanvas("OED", "Event Display", 400, 10, 610, 610); + rcp = static_cast(cvp->GetCanvasImp()); } else { cvp->cd(); cvp->Clear(); @@ -393,8 +404,13 @@ vtxdet.Draw(40); itdet.Draw(40); tpcdet.Draw(40); - kaltrack.Draw(2,""); - + kaltrack.Draw(2,""); + auto stp = static_cast(*kaltrack.Last()); + std::cerr << "pt =" << 1./stp.GetCurState()(2,0) << std::endl; + + gSystem->ProcessEvents(); + static_cast(rcp)->RaiseWindow(); + cout << "Next? [yes/no/edit/quit] " << flush; static const Int_t kMaxLen = 1024; Char_t temp[kMaxLen]; diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITFBHit.h v02-05-01/examples/kaltest/hybrid/old_it/EXITFBHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITFBHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_it/EXITFBHit.h 2023-11-24 20:13:10 @@ -1,5 +1,5 @@ -#ifndef __EXITFBHIT__ -#define __EXITHFBIT__ +#ifndef EXITFBHIT_H +#define EXITHFBIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h v02-05-01/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h 2023-11-24 20:13:23 @@ -1,5 +1,5 @@ -#ifndef __EXITFBMEASLAYER__ -#define __EXITFBMEASLAYER__ +#ifndef EXITFBMEASLAYER_H +#define EXITFBMEASLAYER_H //************************************************************************* //* =================== //* EXITFBMeasLayer Class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITHit.h v02-05-01/examples/kaltest/hybrid/old_it/EXITHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_it/EXITHit.h 2023-11-24 20:13:46 @@ -1,5 +1,5 @@ -#ifndef __EXITHIT__ -#define __EXITHIT__ +#ifndef EXITHIT_H +#define EXITHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITKalDetector.h v02-05-01/examples/kaltest/hybrid/old_it/EXITKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_it/EXITKalDetector.h 2023-11-24 20:14:00 @@ -1,5 +1,5 @@ -#ifndef __EXITDETECTOR__ -#define __EXITDETECTOR__ +#ifndef EXITDETECTOR_H +#define EXITDETECTOR_H #include "EXVKalDetector.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITMeasLayer.h v02-05-01/examples/kaltest/hybrid/old_it/EXITMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_it/EXITMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_it/EXITMeasLayer.h 2023-11-24 20:14:11 @@ -1,5 +1,5 @@ -#ifndef __EXITMEASLAYER__ -#define __EXITMEASLAYER__ +#ifndef EXITMEASLAYER_H +#define EXITMEASLAYER_H //************************************************************************* //* =================== //* EXITMeasLayer Class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXHit.h v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXHit.h 2023-11-24 20:14:25 @@ -1,5 +1,5 @@ -#ifndef __EXVTXHIT__ -#define __EXVTXHIT__ +#ifndef EXVTXHIT_H +#define EXVTXHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXKalDetector.h v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXKalDetector.h 2023-11-24 20:14:34 @@ -1,5 +1,5 @@ -#ifndef __EXVTXDETECTOR__ -#define __EXVTXDETECTOR__ +#ifndef EXVTXDETECTOR_H +#define EXVTXDETECTOR_H #include "EXVKalDetector.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h 2023-11-24 20:14:46 @@ -1,5 +1,5 @@ -#ifndef __EXVTXMEASLAYER__ -#define __EXVTXMEASLAYER__ +#ifndef EXVTXMEASLAYER_H +#define EXVTXMEASLAYER_H //************************************************************************* //* =================== //* EXVTXMeasLayer Class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCHit.h v02-05-01/examples/kaltest/hybrid/tpc/EXTPCHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/tpc/EXTPCHit.h 2023-11-24 20:15:00 @@ -1,5 +1,5 @@ -#ifndef __EXTPCHIT__ -#define __EXTPCHIT__ +#ifndef EXTPCHIT_H +#define EXTPCHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" @@ -22,6 +22,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline Int_t GetSide () const { return fSide; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx v02-05-01/examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx 2023-11-24 19:21:51 @@ -96,7 +96,7 @@ tubep->SetBit(kCanDelete); fNodePtr = new TNode(nname,nname,name); fNodePtr->SetLineColor(color); - fNodePtr->SetLineWidth(0.01); + //fNodePtr->SetLineWidth(0.01); } EXVKalDetector::Draw(color,opt); } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCKalDetector.h v02-05-01/examples/kaltest/hybrid/tpc/EXTPCKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/tpc/EXTPCKalDetector.h 2023-11-24 20:15:09 @@ -1,5 +1,5 @@ -#ifndef __EXTPCDETECTOR__ -#define __EXTPCDETECTOR__ +#ifndef EXTPCDETECTOR_H +#define EXTPCDETECTOR_H #include "EXVKalDetector.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h v02-05-01/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h 2023-11-24 20:15:22 @@ -1,5 +1,5 @@ -#ifndef __EXTPCMEASLAYER__ -#define __EXTPCMEASLAYER__ +#ifndef EXTPCMEASLAYER_H +#define EXTPCMEASLAYER_H //************************************************************************* //* =================== //* EXTPCMeasLayer Class diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXHit.h v02-05-01/examples/kaltest/hybrid/vtx/EXVTXHit.h --- v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXHit.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/vtx/EXVTXHit.h 2023-11-24 20:15:39 @@ -1,5 +1,5 @@ -#ifndef __EXVTXHIT__ -#define __EXVTXHIT__ +#ifndef EXVTXHIT_H +#define EXVTXHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" @@ -20,6 +20,7 @@ virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const; + using TVTrackHit::DebugPrint; virtual void DebugPrint(Option_t *opt = "") const; inline const TVector3 GetExactX() const { return fXX; } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXKalDetector.h v02-05-01/examples/kaltest/hybrid/vtx/EXVTXKalDetector.h --- v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXKalDetector.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/vtx/EXVTXKalDetector.h 2023-11-24 20:15:48 @@ -1,5 +1,5 @@ -#ifndef __EXVTXDETECTOR__ -#define __EXVTXDETECTOR__ +#ifndef EXVTXDETECTOR_H +#define EXVTXDETECTOR_H #include "EXVKalDetector.h" #include "TMath.h" diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx v02-05-01/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx --- v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx 2023-11-24 19:21:51 @@ -88,10 +88,10 @@ return TVector3(x,y,z); } -void EXVTXMeasLayer::CalcDhDa(const TVTrackHit &vht, - const TVector3 &xxv, - const TKalMatrix &dxphiada, - TKalMatrix &H) const +void EXVTXMeasLayer::CalcDhDa([[maybe_unused]] const TVTrackHit &vht, + [[maybe_unused]] const TVector3 &xxv, + const TKalMatrix &dxphiada, + TKalMatrix &H) const { // Calculate // H = (@h/@a) = (@phi/@a, @z/@a)^t @@ -163,7 +163,7 @@ // ----------------- // Drawing method for event display // -void EXVTXMeasLayer::Draw(Int_t color, const Char_t *opt) +void EXVTXMeasLayer::Draw(Int_t color, [[maybe_unused]] const Char_t *opt) { Double_t phi0 = 1.570796327; Double_t phi; @@ -182,7 +182,7 @@ TRotMatrix *rmatp = new TRotMatrix( "rmat", "rmat", rmat); TNode *nodep = new TNode(nname,nname,brikp, GetXc().X() - GetXioffset()*TMath::Sin(phi), GetXc().Y() + GetXioffset()*TMath::Cos(phi), 0, rmatp,""); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + //nodep->SetLineWidth(0.01); SetNodePtr(nodep); } diff -x build -x build.cmdline -uNr v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h v02-05-01/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h --- v02-05-01.ORIG/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h 2022-06-29 18:23:32 +++ v02-05-01/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h 2023-11-24 20:15:57 @@ -1,5 +1,5 @@ -#ifndef __EXVTXMEASLAYER__ -#define __EXVTXMEASLAYER__ +#ifndef EXVTXMEASLAYER_H +#define EXVTXMEASLAYER_H //************************************************************************* //* =================== //* EXVTXMeasLayer Class @@ -68,6 +68,7 @@ Double_t GetSigmaZeta() const { return fSigmaZeta; } using TAttDrawable::Draw; + using TObject::Draw; virtual void Draw(Int_t color, const Char_t *opt); private: diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/CMakeLists.txt v02-05-01/src/CMakeLists.txt --- v02-05-01.ORIG/src/CMakeLists.txt 2022-06-29 18:23:32 +++ v02-05-01/src/CMakeLists.txt 2023-11-24 14:21:40 @@ -43,7 +43,7 @@ IF( APPLE ) #---- need special linker flags for ROOT dictionary on MacOS SET_TARGET_PROPERTIES( KalTest PROPERTIES - LINK_FLAGS "-single_module -undefined dynamic_lookup -bind_at_load" + LINK_FLAGS "-undefined dynamic_lookup -bind_at_load" ) ENDIF( APPLE ) diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/geomlib/THelicalTrack.cxx v02-05-01/src/geomlib/THelicalTrack.cxx --- v02-05-01.ORIG/src/geomlib/THelicalTrack.cxx 2022-06-29 18:23:32 +++ v02-05-01/src/geomlib/THelicalTrack.cxx 2023-11-24 19:17:39 @@ -252,7 +252,7 @@ helto.SetTo(av, pivot); F = Fr * F; -} + } if (!CPtr) { *this = helto; diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/geomlib/TRKTrack.h v02-05-01/src/geomlib/TRKTrack.h --- v02-05-01.ORIG/src/geomlib/TRKTrack.h 2022-06-29 18:23:32 +++ v02-05-01/src/geomlib/TRKTrack.h 2023-11-24 18:51:30 @@ -34,7 +34,7 @@ // 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() {} diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/geomlib/TRungeKuttaTrack.cxx v02-05-01/src/geomlib/TRungeKuttaTrack.cxx --- v02-05-01.ORIG/src/geomlib/TRungeKuttaTrack.cxx 2022-06-29 18:23:32 +++ v02-05-01/src/geomlib/TRungeKuttaTrack.cxx 2023-11-24 18:48:39 @@ -120,7 +120,7 @@ TVector3 xv0to = fFrame.Transform(globalPivot, TTrackFrame::kGlobalToLocal); TKalMatrix F12(6,5); - MoveTo(xv0to, step, &rkDF, &F12); + MoveTo(xv0to, step, &rkDF, &F12, nullptr); double p0 = fPhi0; TVector3 pv = GetCurPosition(); diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/geomlib/TRungeKuttaTrack.h v02-05-01/src/geomlib/TRungeKuttaTrack.h --- v02-05-01.ORIG/src/geomlib/TRungeKuttaTrack.h 2022-06-29 18:23:32 +++ v02-05-01/src/geomlib/TRungeKuttaTrack.h 2023-11-24 18:45:49 @@ -70,15 +70,16 @@ void SetFromTrack(THelicalTrack& heltrack); // Utility methods - virtual void MoveTo(const TVector3 &globalPivot, + using THelicalTrack::MoveTo; + virtual void MoveTo(const TVector3 &globalPivot, Double_t &step, - TMatrixD *FPtr = 0, - TMatrixD *F12Ptr = 0, - TMatrixD *CPtr = 0); + TMatrixD *FPtr = 0, + TMatrixD *F12Ptr = 0, + TMatrixD *CPtr = 0); virtual void MoveTo(const TVector3 &globalPivot, Double_t &step, - TKalMatrix &FPtr); + TKalMatrix &FPtr); virtual TVector3 CalcXAt (Double_t h) const; virtual TMatrixD CalcDxDa (Double_t h) const; diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/kaltracklib/TKalTrackState.cxx v02-05-01/src/kaltracklib/TKalTrackState.cxx --- v02-05-01.ORIG/src/kaltracklib/TKalTrackState.cxx 2022-06-29 18:23:32 +++ v02-05-01/src/kaltracklib/TKalTrackState.cxx 2023-11-24 15:26:34 @@ -107,11 +107,11 @@ return *MoveTo(to, F, &Q); } -void TKalTrackState::DebugPrint() const { +void TKalTrackState::DebugPrint(const char *, int) const { DebugPrint( std::cerr ) ; } -void TKalTrackState::DebugPrint(std::ostream& os) const +void TKalTrackState::DebugPrint(std::ostream& os, const char *, int) const { os << " type " << fType << endl ; os << " +- -+ " << "+-" << endl @@ -120,7 +120,8 @@ << " a = | kappa | = " << "| " << (*this)(2,0) << endl << " | dz | " << "| " << (*this)(3,0) << endl << " | tanl | " << "| " << (*this)(4,0) << endl; - if (GetDimension() == 6) { + int nc = GetDimension(); + if (nc == 6) { os << " | t0 | " << "| " << (*this)(5,0) << endl; } os << " +- -+ " << "+-" << endl; @@ -130,7 +131,7 @@ << " | " << fX0.Z() << endl << " +-" << endl; - GetCovMat().DebugPrint( os , " covMat = ", 6 ); + GetCovMat().DebugPrint(os , " covMat = ", nc); } //_________________________________________________________________________ diff -x build -x build.cmdline -uNr v02-05-01.ORIG/src/kaltracklib/TKalTrackState.h v02-05-01/src/kaltracklib/TKalTrackState.h --- v02-05-01.ORIG/src/kaltracklib/TKalTrackState.h 2022-06-29 18:23:32 +++ v02-05-01/src/kaltracklib/TKalTrackState.h 2023-11-24 19:18:56 @@ -60,8 +60,8 @@ TKalMatrix &F, TKalMatrix &Q) const; - void DebugPrint() const ; - void DebugPrint( std::ostream& os ) const; + void DebugPrint(const char *opt = "", int nc = 6) const; + void DebugPrint(std::ostream& os, const char *opt = "", int nc = 6) const; // Derived class methods