Index: examples/kaltest/cdc/EXEventGen.h =================================================================== --- examples/kaltest/cdc/EXEventGen.h (revision 506) +++ examples/kaltest/cdc/EXEventGen.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXEVENTGEN__ -#define __EXEVENTGEN__ +#ifndef EXEVENTGEN_H +#define EXEVENTGEN_H #include "TKalDetCradle.h" #include "THelicalTrack.h" Index: examples/kaltest/cdc/EXHit.h =================================================================== --- examples/kaltest/cdc/EXHit.h (revision 506) +++ examples/kaltest/cdc/EXHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXHIT__ -#define __EXHIT__ +#ifndef EXHIT_H +#define EXHIT_H #include #include Index: examples/kaltest/cdc/EXKalDetector.h =================================================================== --- examples/kaltest/cdc/EXKalDetector.h (revision 506) +++ examples/kaltest/cdc/EXKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXDETECTOR__ -#define __EXDETECTOR__ +#ifndef EXDETECTOR_H +#define EXDETECTOR_H #include Index: examples/kaltest/cdc/EXMeasLayer.h =================================================================== --- examples/kaltest/cdc/EXMeasLayer.h (revision 506) +++ examples/kaltest/cdc/EXMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXMEASLAYER__ -#define __EXMEASLAYER__ +#ifndef EXMEASLAYER_H +#define EXMEASLAYER_H //************************************************************************* //* =================== //* EXMeasLayer Class Index: examples/kaltest/ct/EXEventGen.h =================================================================== --- examples/kaltest/ct/EXEventGen.h (revision 506) +++ examples/kaltest/ct/EXEventGen.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXEVENTGEN__ -#define __EXEVENTGEN__ +#ifndef EXEVENTGEN_H +#define EXEVENTGEN_H #include "TKalDetCradle.h" #include "THelicalTrack.h" Index: examples/kaltest/ct/EXHit.h =================================================================== --- examples/kaltest/ct/EXHit.h (revision 506) +++ examples/kaltest/ct/EXHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXHIT__ -#define __EXHIT__ +#ifndef EXHIT_H +#define EXHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" Index: examples/kaltest/ct/EXKalDetector.h =================================================================== --- examples/kaltest/ct/EXKalDetector.h (revision 506) +++ examples/kaltest/ct/EXKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXDETECTOR__ -#define __EXDETECTOR__ +#ifndef EXDETECTOR_H +#define EXDETECTOR_H #include "TVector3.h" // from ROOT #include "TVKalDetector.h" // from KalTrackLib Index: examples/kaltest/ct/EXMeasLayer.h =================================================================== --- examples/kaltest/ct/EXMeasLayer.h (revision 506) +++ examples/kaltest/ct/EXMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXMEASLAYER__ -#define __EXMEASLAYER__ +#ifndef EXMEASLAYER_H +#define EXMEASLAYER_H //************************************************************************* //* =================== //* EXMeasLayer Class Index: examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx =================================================================== --- examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx (revision 506) +++ examples/kaltest/hybrid/bp/EXBPConeMeasLayer.cxx (working copy) @@ -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); SetNodePtr(nodep); } } Index: examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h =================================================================== --- examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h (working copy) @@ -61,6 +61,7 @@ Double_t GetSigmaX() const { return fSigmaX; } Double_t GetSigmaZ() const { return fSigmaZ; } + using TObject::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt); Index: examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx =================================================================== --- examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx (revision 506) +++ examples/kaltest/hybrid/bp/EXBPMeasLayer.cxx (working copy) @@ -150,7 +150,7 @@ tubep->SetBit(kCanDelete); TNode *nodep = new TNode(nname,nname,name); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + nodep->SetLineWidth(0); SetNodePtr(nodep); } } Index: examples/kaltest/hybrid/bp/EXBPMeasLayer.h =================================================================== --- examples/kaltest/hybrid/bp/EXBPMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/bp/EXBPMeasLayer.h (working copy) @@ -55,6 +55,7 @@ Double_t GetSigmaX() const { return fSigmaX; } Double_t GetSigmaZ() const { return fSigmaZ; } + using TObject::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt); Index: examples/kaltest/hybrid/gen/EXEventGen.h =================================================================== --- examples/kaltest/hybrid/gen/EXEventGen.h (revision 506) +++ examples/kaltest/hybrid/gen/EXEventGen.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXEVENTGEN__ -#define __EXEVENTGEN__ +#ifndef EXEVENTGEN_H +#define EXEVENTGEN_H #include "TKalDetCradle.h" #include "THelicalTrack.h" Index: examples/kaltest/hybrid/it/EXITFBHit.h =================================================================== --- examples/kaltest/hybrid/it/EXITFBHit.h (revision 506) +++ examples/kaltest/hybrid/it/EXITFBHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXITFBHIT__ -#define __EXITHFBIT__ +#ifndef EXITFBHIT_H +#define EXITHFBIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" Index: examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx =================================================================== --- examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx (revision 506) +++ examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx (working copy) @@ -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); SetNodePtr(nodep); } } Index: examples/kaltest/hybrid/it/EXITFBMeasLayer.h =================================================================== --- examples/kaltest/hybrid/it/EXITFBMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/it/EXITFBMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXITFBMEASLAYER__ -#define __EXITFBMEASLAYER__ +#ifndef EXITFBMEASLAYER_H +#define EXITFBMEASLAYER_H //************************************************************************* //* =================== //* EXITFBMeasLayer Class @@ -78,6 +78,7 @@ inline Double_t Cosalpha() const {return TMath::Abs(GetNormal().Z()/GetNormal().Mag()); } inline Double_t Sinalpha() const {return -TMath::Abs(GetNormal().X()/Cosphi()); } + using TObject::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt); Index: examples/kaltest/hybrid/it/EXITHit.h =================================================================== --- examples/kaltest/hybrid/it/EXITHit.h (revision 506) +++ examples/kaltest/hybrid/it/EXITHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXITHIT__ -#define __EXITHIT__ +#ifndef EXITHIT_H +#define EXITHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" Index: examples/kaltest/hybrid/it/EXITKalDetector.h =================================================================== --- examples/kaltest/hybrid/it/EXITKalDetector.h (revision 506) +++ examples/kaltest/hybrid/it/EXITKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXITDETECTOR__ -#define __EXITDETECTOR__ +#ifndef EXITDETECTOR_H +#define EXITDETECTOR_H #include "EXVKalDetector.h" #include "TMath.h" Index: examples/kaltest/hybrid/it/EXITMeasLayer.cxx =================================================================== --- examples/kaltest/hybrid/it/EXITMeasLayer.cxx (revision 506) +++ examples/kaltest/hybrid/it/EXITMeasLayer.cxx (working copy) @@ -176,7 +176,7 @@ tubep->SetBit(kCanDelete); TNode *nodep = new TNode(nname,nname,name); nodep->SetLineColor(color); - nodep->SetLineWidth(0.01); + nodep->SetLineWidth(0); SetNodePtr(nodep); } } Index: examples/kaltest/hybrid/it/EXITMeasLayer.h =================================================================== --- examples/kaltest/hybrid/it/EXITMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/it/EXITMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXITMEASLAYER__ -#define __EXITMEASLAYER__ +#ifndef EXITMEASLAYER_H +#define EXITMEASLAYER_H //************************************************************************* //* =================== //* EXITMeasLayer Class @@ -52,6 +52,7 @@ Double_t GetSigmaX() const { return fSigmaX; } Double_t GetSigmaZ() const { return fSigmaZ; } + using TObject::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt); Index: examples/kaltest/hybrid/kern/EXHYBTrack.h =================================================================== --- examples/kaltest/hybrid/kern/EXHYBTrack.h (revision 506) +++ examples/kaltest/hybrid/kern/EXHYBTrack.h (working copy) @@ -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 TCollection::Draw; virtual void Draw(Int_t color, const Char_t *opt); ClassDef(EXHYBTrack,1) // Hybrid track class for Kalman Filter Index: examples/kaltest/hybrid/kern/EXVKalDetector.h =================================================================== --- examples/kaltest/hybrid/kern/EXVKalDetector.h (revision 506) +++ examples/kaltest/hybrid/kern/EXVKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXVDETECTOR__ -#define __EXVDETECTOR__ +#ifndef EXVDETECTOR_H +#define EXVDETECTOR_H #include "TVector3.h" #include "TVKalDetector.h" @@ -20,6 +20,7 @@ static Double_t GetBfield (const TVector3 &xx = TVector3(0.)) { return fgBfield; } + using TCollection::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt = ""); Index: examples/kaltest/hybrid/kern/EXVMeasLayer.h =================================================================== --- examples/kaltest/hybrid/kern/EXVMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/kern/EXVMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXVMEASLAYER__ -#define __EXVMEASLAYER__ +#ifndef EXVMEASLAYER_H +#define EXVMEASLAYER_H //************************************************************************* //* =================== //* EXVMeasLayer Class Index: examples/kaltest/hybrid/main/Imakefile =================================================================== --- examples/kaltest/hybrid/main/Imakefile (revision 506) +++ examples/kaltest/hybrid/main/Imakefile (working copy) @@ -20,7 +20,7 @@ $(PROGRAM): $(OBJS) $(LD) -o $(PROGRAM) $(OBJS) \ - -L$(LIBINSTALLDIR) -lEXTPC -lEXIT -lEXVTX -lEXKern -lEXGen \ + -L$(LIBINSTALLDIR) -lEXTPC -lEXIT -lEXVTX -lEXBP -lEXKern -lEXGen \ -lS4KalTrack -lS4Kalman -lS4Geom -lS4Utils \ $(LDFLAGS) Index: examples/kaltest/hybrid/tpc/EXTPCHit.h =================================================================== --- examples/kaltest/hybrid/tpc/EXTPCHit.h (revision 506) +++ examples/kaltest/hybrid/tpc/EXTPCHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXTPCHIT__ -#define __EXTPCHIT__ +#ifndef EXTPCHIT_H +#define EXTPCHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" Index: examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx =================================================================== --- examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx (revision 506) +++ examples/kaltest/hybrid/tpc/EXTPCKalDetector.cxx (working copy) @@ -96,7 +96,7 @@ tubep->SetBit(kCanDelete); fNodePtr = new TNode(nname,nname,name); fNodePtr->SetLineColor(color); - fNodePtr->SetLineWidth(0.01); + fNodePtr->SetLineWidth(0); } EXVKalDetector::Draw(color,opt); } Index: examples/kaltest/hybrid/tpc/EXTPCKalDetector.h =================================================================== --- examples/kaltest/hybrid/tpc/EXTPCKalDetector.h (revision 506) +++ examples/kaltest/hybrid/tpc/EXTPCKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXTPCDETECTOR__ -#define __EXTPCDETECTOR__ +#ifndef EXTPCDETECTOR_H +#define EXTPCDETECTOR_H #include "EXVKalDetector.h" Index: examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h =================================================================== --- examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXTPCMEASLAYER__ -#define __EXTPCMEASLAYER__ +#ifndef EXTPCMEASLAYER_H +#define EXTPCMEASLAYER_H //************************************************************************* //* =================== //* EXTPCMeasLayer Class Index: examples/kaltest/hybrid/vtx/EXVTXHit.h =================================================================== --- examples/kaltest/hybrid/vtx/EXVTXHit.h (revision 506) +++ examples/kaltest/hybrid/vtx/EXVTXHit.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXVTXHIT__ -#define __EXVTXHIT__ +#ifndef EXVTXHIT_H +#define EXVTXHIT_H #include "KalTrackDim.h" #include "TVTrackHit.h" Index: examples/kaltest/hybrid/vtx/EXVTXKalDetector.h =================================================================== --- examples/kaltest/hybrid/vtx/EXVTXKalDetector.h (revision 506) +++ examples/kaltest/hybrid/vtx/EXVTXKalDetector.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXVTXDETECTOR__ -#define __EXVTXDETECTOR__ +#ifndef EXVTXDETECTOR_H +#define EXVTXDETECTOR_H #include "EXVKalDetector.h" #include "TMath.h" Index: examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx =================================================================== --- examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx (revision 506) +++ examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx (working copy) @@ -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); SetNodePtr(nodep); } Index: examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h =================================================================== --- examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h (revision 506) +++ examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXVTXMEASLAYER__ -#define __EXVTXMEASLAYER__ +#ifndef EXVTXMEASLAYER_H +#define EXVTXMEASLAYER_H //************************************************************************* //* =================== //* EXVTXMeasLayer Class @@ -67,6 +67,7 @@ Double_t GetSigmaXi() const { return fSigmaXi; } Double_t GetSigmaZeta() const { return fSigmaZeta; } + using TObject::Draw; using TAttDrawable::Draw; virtual void Draw(Int_t color, const Char_t *opt); Index: examples/kaltest/simple/EXHit.h =================================================================== --- examples/kaltest/simple/EXHit.h (revision 506) +++ examples/kaltest/simple/EXHit.h (working copy) @@ -1,3 +1,5 @@ +#ifndef EXHIT_H +#define EXHIT_H #include #include "TMatrixD.h" @@ -36,3 +38,4 @@ ClassDef(EXHit,1) // Sample hit class }; +#endif \ No newline at end of file Index: examples/kaltest/simple/EXKalSite.h =================================================================== --- examples/kaltest/simple/EXKalSite.h (revision 506) +++ examples/kaltest/simple/EXKalSite.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXKALSITE__ -#define __EXKALSITE__ +#ifndef EXKALSITE_H +#define EXKALSITE_H //************************************************************************* //* =================== //* EXKalSite Class Index: examples/kaltest/simple/EXKalState.h =================================================================== --- examples/kaltest/simple/EXKalState.h (revision 506) +++ examples/kaltest/simple/EXKalState.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXKALSTATE__ -#define __EXKALSTATE__ +#ifndef EXKALSTATE_H +#define EXKALSTATE_H //************************************************************************* //* ==================== //* EXKalState Class @@ -50,6 +50,7 @@ EXKalState & MoveTo(TVKalSite &to, TKalMatrix &F, TKalMatrix &Q) const; + using TKalMatrix::DebugPrint; void DebugPrint() const; // Derived class methods Index: examples/kaltest/simple/EXKalSystem.h =================================================================== --- examples/kaltest/simple/EXKalSystem.h (revision 506) +++ examples/kaltest/simple/EXKalSystem.h (working copy) @@ -1,5 +1,5 @@ -#ifndef __EXKALSYSTEM__ -#define __EXKALSYSTEM__ +#ifndef EXKALSYSTEM_H +#define EXKALSYSTEM_H //************************************************************************* //* =================== //* EXKalSystem Class Index: src/geomlib/Imakefile =================================================================== --- src/geomlib/Imakefile (revision 506) +++ src/geomlib/Imakefile (working copy) @@ -8,7 +8,7 @@ SRCS = THelicalTrack.$(SrcSuf) \ TCircle.$(SrcSuf) \ - TVCutCone.$(SrcSuf) \ + TCutCone.$(SrcSuf) \ TVCurve.$(SrcSuf) \ TCylinder.$(SrcSuf) \ TPlane.$(SrcSuf) \ Index: src/kallib/TKalMatrix.cxx =================================================================== --- src/kallib/TKalMatrix.cxx (revision 506) +++ src/kallib/TKalMatrix.cxx (working copy) @@ -80,6 +80,16 @@ // Print //------------------------------------------------------- +void TKalMatrix::DebugPrint(Int_t ncolsps) const +{ + TKalMatrix::DebugPrint("", ncolsps); +} + +void TKalMatrix::DebugPrint(Option_t *opt) const +{ + TKalMatrix::DebugPrint(opt, 5); +} + void TKalMatrix::DebugPrint(Option_t *opt, Int_t ncolsps) const { using namespace std; Index: src/kallib/TKalMatrix.h =================================================================== --- src/kallib/TKalMatrix.h (revision 506) +++ src/kallib/TKalMatrix.h (working copy) @@ -46,7 +46,9 @@ virtual ~TKalMatrix() {} - virtual void DebugPrint(Option_t *opt = "", Int_t nc = 5) const; + virtual void DebugPrint(Int_t nc) const; + virtual void DebugPrint(Option_t *opt) const; + virtual void DebugPrint(Option_t *opt, Int_t nc) const; static TKalMatrix ToKalMat (const TVector3 &vec); static TVector3 ToThreeVec(const TMatrixD &mat); Index: src/kallib/TVKalState.h =================================================================== --- src/kallib/TVKalState.h (revision 506) +++ src/kallib/TVKalState.h (working copy) @@ -54,6 +54,7 @@ TKalMatrix &F, TKalMatrix &Q) const = 0; + using TKalMatrix::DebugPrint; virtual void DebugPrint() const = 0; virtual void Propagate(TVKalSite &to); // calculates f, F, and Q Index: src/kaltracklib/TKalTrackState.h =================================================================== --- src/kaltracklib/TKalTrackState.h (revision 506) +++ src/kaltracklib/TKalTrackState.h (working copy) @@ -58,6 +58,7 @@ TKalTrackState & MoveTo(TVKalSite &to, TKalMatrix &F, TKalMatrix &Q) const; + using TVKalState::DebugPrint; void DebugPrint() const; // Derived class methods Index: src/kaltracklib/TVTrackHit.h =================================================================== --- src/kaltracklib/TVTrackHit.h (revision 506) +++ src/kaltracklib/TVTrackHit.h (working copy) @@ -40,9 +40,10 @@ inline virtual const TVMeasLayer & GetMeasLayer() const { return *fMeasLayerPtr; } - virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const = 0; + virtual TKalMatrix XvToMv (const TVector3 &xv, Double_t t0) const = 0; - // virtual void DebugPrint(Option_t *opt = "") const = 0; + using TKalMatrix::DebugPrint; + virtual void DebugPrint(Option_t *opt = "") const = 0; private: Int_t fDim; // dimension of coordinate space