diff --git a/CMakeLists.txt b/CMakeLists.txt index 7532f59..4137170 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,8 @@ IF( NOT BUILD_WITH_T0_FIT) ADD_DEFINITIONS( -D __NOT0__ ) ENDIF() +INCLUDE_DIRECTORIES( "${PROJECT_SOURCE_DIR}/include" ) + ADD_SUBDIRECTORY( ./src ) diff --git a/examples/kaltest/cdc/EXEventGen.h b/examples/kaltest/cdc/EXEventGen.h index dd2e3fa..ef271a2 100644 --- a/examples/kaltest/cdc/EXEventGen.h +++ b/examples/kaltest/cdc/EXEventGen.h @@ -1,8 +1,8 @@ #ifndef __EXEVENTGEN__ #define __EXEVENTGEN__ -#include "TKalDetCradle.h" -#include "THelicalTrack.h" +#include +#include class EXEventGen { public: diff --git a/examples/kaltest/cdc/EXHit.h b/examples/kaltest/cdc/EXHit.h index b5c76c6..e180792 100644 --- a/examples/kaltest/cdc/EXHit.h +++ b/examples/kaltest/cdc/EXHit.h @@ -3,8 +3,8 @@ #include #include -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXMeasLayer.h" using namespace std; diff --git a/examples/kaltest/cdc/EXKalDetector.cxx b/examples/kaltest/cdc/EXKalDetector.cxx index 3a2a80a..eb6d5a6 100644 --- a/examples/kaltest/cdc/EXKalDetector.cxx +++ b/examples/kaltest/cdc/EXKalDetector.cxx @@ -5,7 +5,7 @@ //------------------- #define __REALISTIC__ -#include "TKalDetCradle.h" +#include #include "EXKalDetector.h" ClassImp(EXKalDetector) diff --git a/examples/kaltest/cdc/EXKalDetector.h b/examples/kaltest/cdc/EXKalDetector.h index aaf427e..8303a20 100644 --- a/examples/kaltest/cdc/EXKalDetector.h +++ b/examples/kaltest/cdc/EXKalDetector.h @@ -5,7 +5,7 @@ #include "TVector3.h" -#include "TVKalDetector.h" +#include #include "EXMeasLayer.h" using namespace std; diff --git a/examples/kaltest/cdc/EXKalTest.cxx b/examples/kaltest/cdc/EXKalTest.cxx index 78e7b7d..e65acba 100644 --- a/examples/kaltest/cdc/EXKalTest.cxx +++ b/examples/kaltest/cdc/EXKalTest.cxx @@ -1,7 +1,7 @@ -#include "TKalDetCradle.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib #include "EXKalTest.h" #include "EXKalDetector.h" diff --git a/examples/kaltest/cdc/EXMeasLayer.h b/examples/kaltest/cdc/EXMeasLayer.h index c69a3ff..fcc72d7 100644 --- a/examples/kaltest/cdc/EXMeasLayer.h +++ b/examples/kaltest/cdc/EXMeasLayer.h @@ -18,10 +18,10 @@ #include #include "TVector3.h" -#include "TKalMatrix.h" -#include "THype.h" -#include "TVMeasLayer.h" -#include "KalTrackDim.h" +#include +#include +#include +#include #include "EXEventGen.h" using namespace std; diff --git a/examples/kaltest/ct/EXEventGen.cxx b/examples/kaltest/ct/EXEventGen.cxx index 2a15622..da75580 100644 --- a/examples/kaltest/ct/EXEventGen.cxx +++ b/examples/kaltest/ct/EXEventGen.cxx @@ -2,7 +2,7 @@ #include "EXMeasLayer.h" #include "EXKalDetector.h" #include "TRandom.h" -#include "TStraightTrack.h" +#include // ----------------------------------- // Track Parameters diff --git a/examples/kaltest/ct/EXEventGen.h b/examples/kaltest/ct/EXEventGen.h index 0f744f0..9bd09cc 100644 --- a/examples/kaltest/ct/EXEventGen.h +++ b/examples/kaltest/ct/EXEventGen.h @@ -1,9 +1,9 @@ #ifndef __EXEVENTGEN__ #define __EXEVENTGEN__ -#include "TKalDetCradle.h" -#include "THelicalTrack.h" -#include "TStraightTrack.h" +#include +#include +#include class EXEventGen { public: diff --git a/examples/kaltest/ct/EXHit.h b/examples/kaltest/ct/EXHit.h index 9e87b48..08b623c 100644 --- a/examples/kaltest/ct/EXHit.h +++ b/examples/kaltest/ct/EXHit.h @@ -1,8 +1,8 @@ #ifndef __EXHIT__ #define __EXHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXMeasLayer.h" class EXHit : public TVTrackHit { diff --git a/examples/kaltest/ct/EXKalDetector.h b/examples/kaltest/ct/EXKalDetector.h index c6fd61d..3568cda 100644 --- a/examples/kaltest/ct/EXKalDetector.h +++ b/examples/kaltest/ct/EXKalDetector.h @@ -2,7 +2,7 @@ #define __EXDETECTOR__ #include "TVector3.h" // from ROOT -#include "TVKalDetector.h" // from KalTrackLib +#include // from KalTrackLib #include "EXMeasLayer.h" class EXKalDetector : public TVKalDetector { diff --git a/examples/kaltest/ct/EXKalTest.cxx b/examples/kaltest/ct/EXKalTest.cxx index d5770f4..f68b9cf 100644 --- a/examples/kaltest/ct/EXKalTest.cxx +++ b/examples/kaltest/ct/EXKalTest.cxx @@ -1,7 +1,7 @@ -#include "TKalDetCradle.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib #include "EXKalTest.h" #include "EXKalDetector.h" diff --git a/examples/kaltest/ct/EXMeasLayer.h b/examples/kaltest/ct/EXMeasLayer.h index de293c5..c2f6346 100644 --- a/examples/kaltest/ct/EXMeasLayer.h +++ b/examples/kaltest/ct/EXMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" -#include "TVMeasLayer.h" -#include "KalTrackDim.h" +#include +#include +#include +#include class TVTrackHit; diff --git a/examples/kaltest/ct_nonuniform/EXEventGen.cxx b/examples/kaltest/ct_nonuniform/EXEventGen.cxx index e30b5cc..202c744 100644 --- a/examples/kaltest/ct_nonuniform/EXEventGen.cxx +++ b/examples/kaltest/ct_nonuniform/EXEventGen.cxx @@ -1,12 +1,12 @@ #include "EXEventGen.h" #include "EXMeasLayer.h" #include "EXKalDetector.h" -#include "TTrackFrame.h" -#include "TKalDetCradle.h" -#include "TBField.h" +#include +#include +#include #include "EXHit.h" #include "TRandom.h" -#include "TBField.h" +#include #include // ----------------------------------- diff --git a/examples/kaltest/ct_nonuniform/EXEventGen.h b/examples/kaltest/ct_nonuniform/EXEventGen.h index 7c40ba1..fbd2417 100644 --- a/examples/kaltest/ct_nonuniform/EXEventGen.h +++ b/examples/kaltest/ct_nonuniform/EXEventGen.h @@ -1,8 +1,8 @@ #ifndef __EXEVENTGEN__ #define __EXEVENTGEN__ -#include "TKalDetCradle.h" -#include "THelicalTrack.h" +#include +#include class EXEventGen { public: diff --git a/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx b/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx index c668d89..dcaba55 100755 --- a/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx +++ b/examples/kaltest/ct_nonuniform/EXHYBTrack.cxx @@ -17,13 +17,13 @@ //************************************************************************* #include "EXHYBTrack.h" -#include "TKalTrackSite.h" // from KalTrackLib +#include // from KalTrackLib #include "TVirtualPad.h" // from ROOT #include "TPolyMarker3D.h" // from ROOT #define __DEBUG__ #ifdef __DEBUG__ #include -#include "TBField.h" +#include #endif //_________________________________________________________________________ // ------------------------------ diff --git a/examples/kaltest/ct_nonuniform/EXHYBTrack.h b/examples/kaltest/ct_nonuniform/EXHYBTrack.h index 051db86..7c664af 100755 --- a/examples/kaltest/ct_nonuniform/EXHYBTrack.h +++ b/examples/kaltest/ct_nonuniform/EXHYBTrack.h @@ -16,8 +16,8 @@ //* //************************************************************************* -#include "TKalTrack.h" // from KalTrackLib -#include "TAttDrawable.h" // from Utils +#include // from KalTrackLib +#include // from Utils //_________________________________________________________________________ // ------------------------------ diff --git a/examples/kaltest/ct_nonuniform/EXHit.h b/examples/kaltest/ct_nonuniform/EXHit.h index 9e87b48..08b623c 100644 --- a/examples/kaltest/ct_nonuniform/EXHit.h +++ b/examples/kaltest/ct_nonuniform/EXHit.h @@ -1,8 +1,8 @@ #ifndef __EXHIT__ #define __EXHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXMeasLayer.h" class EXHit : public TVTrackHit { diff --git a/examples/kaltest/ct_nonuniform/EXKalTest.cxx b/examples/kaltest/ct_nonuniform/EXKalTest.cxx index 73b88a4..14ea635 100644 --- a/examples/kaltest/ct_nonuniform/EXKalTest.cxx +++ b/examples/kaltest/ct_nonuniform/EXKalTest.cxx @@ -1,6 +1,6 @@ -#include "TKalDetCradle.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib #include "EXHYBTrack.h" // from KalTrackLib #include "EXKalTest.h" @@ -19,7 +19,7 @@ #include "TH1F.h" -#include "TBField.h" +#include #include diff --git a/examples/kaltest/ct_nonuniform/EXMeasLayer.h b/examples/kaltest/ct_nonuniform/EXMeasLayer.h index de293c5..c2f6346 100644 --- a/examples/kaltest/ct_nonuniform/EXMeasLayer.h +++ b/examples/kaltest/ct_nonuniform/EXMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" -#include "TVMeasLayer.h" -#include "KalTrackDim.h" +#include +#include +#include +#include class TVTrackHit; diff --git a/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx b/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx index 45d2b7f..88f9bdb 100644 --- a/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx +++ b/examples/kaltest/ct_nonuniform/EXRKEventGen.cxx @@ -1,11 +1,11 @@ #include "EXRKEventGen.h" #include "EXMeasLayer.h" #include "EXKalDetector.h" -#include "TKalDetCradle.h" -#include "TBField.h" +#include +#include #include "EXHit.h" #include "TRandom.h" -#include "TBField.h" +#include #include ClassImp(EXRKEventGen) diff --git a/examples/kaltest/ct_nonuniform/EXRKEventGen.h b/examples/kaltest/ct_nonuniform/EXRKEventGen.h index 87f73fe..2bf1977 100644 --- a/examples/kaltest/ct_nonuniform/EXRKEventGen.h +++ b/examples/kaltest/ct_nonuniform/EXRKEventGen.h @@ -1,8 +1,8 @@ #ifndef __EXRKEVENTGEN__ #define __EXRKEVENTGEN__ -#include "TKalDetCradle.h" -#include "TRKTrack.h" +#include +#include class EXRKEventGen { public: diff --git a/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx b/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx index a8cd932..ae82af2 100644 --- a/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx +++ b/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.cxx @@ -1,11 +1,11 @@ #include "EXRungeKuttaEventGen.h" #include "EXMeasLayer.h" #include "EXKalDetector.h" -#include "TKalDetCradle.h" -#include "TBField.h" +#include +#include #include "EXHit.h" #include "TRandom.h" -#include "TBField.h" +#include #include ClassImp(EXRungeKuttaEventGen) diff --git a/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.h b/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.h index 58f34e5..100e4a4 100644 --- a/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.h +++ b/examples/kaltest/ct_nonuniform/EXRungeKuttaEventGen.h @@ -1,8 +1,8 @@ #ifndef __EXRUNGEKUTTAEVENTGEN__ #define __EXRUNGEKUTTAEVENTGEN__ -#include "TKalDetCradle.h" -#include "TRungeKuttaTrack.h" +#include +#include class EXRungeKuttaEventGen { public: diff --git a/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx b/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx index cff44f9..b6c993c 100644 --- a/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx +++ b/examples/kaltest/ct_nonuniform/EXVKalDetector.cxx @@ -1,6 +1,6 @@ #include "EXVKalDetector.h" //#include "EXVMeasLayer.h" -#include "TVKalDetector.h" +#include //#include "TTUBE.h" #include "TTUBS.h" #include "TNode.h" diff --git a/examples/kaltest/ct_nonuniform/EXVKalDetector.h b/examples/kaltest/ct_nonuniform/EXVKalDetector.h index 5adb82c..a26d4f4 100644 --- a/examples/kaltest/ct_nonuniform/EXVKalDetector.h +++ b/examples/kaltest/ct_nonuniform/EXVKalDetector.h @@ -2,9 +2,9 @@ #define EXVDETECTOR_H #include "TVector3.h" -#include "TVKalDetector.h" -#include "TAttDrawable.h" -#include "TBField.h" +#include +#include +#include class TVMeasLayer; class TNode; diff --git a/examples/kaltest/hybrid/bp/EXBPConeHit.h b/examples/kaltest/hybrid/bp/EXBPConeHit.h index 1138c63..6420dbe 100644 --- a/examples/kaltest/hybrid/bp/EXBPConeHit.h +++ b/examples/kaltest/hybrid/bp/EXBPConeHit.h @@ -1,8 +1,8 @@ #ifndef EXBPCONEHIT_H #define EXBPCONEHIT_H -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXBPConeMeasLayer.h" class EXBPConeHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h b/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h index 9163d12..e555253 100644 --- a/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h +++ b/examples/kaltest/hybrid/bp/EXBPConeMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCutCone.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/bp/EXBPHit.h b/examples/kaltest/hybrid/bp/EXBPHit.h index ce0d15c..5875eaf 100644 --- a/examples/kaltest/hybrid/bp/EXBPHit.h +++ b/examples/kaltest/hybrid/bp/EXBPHit.h @@ -1,8 +1,8 @@ #ifndef EXBPHIT_H #define EXBPHIT_H -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXBPMeasLayer.h" class EXBPHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/bp/EXBPMeasLayer.h b/examples/kaltest/hybrid/bp/EXBPMeasLayer.h index 115259e..08977bd 100644 --- a/examples/kaltest/hybrid/bp/EXBPMeasLayer.h +++ b/examples/kaltest/hybrid/bp/EXBPMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/gen/EXEventGen.cxx b/examples/kaltest/hybrid/gen/EXEventGen.cxx index f6c30ba..d5d05bb 100644 --- a/examples/kaltest/hybrid/gen/EXEventGen.cxx +++ b/examples/kaltest/hybrid/gen/EXEventGen.cxx @@ -1,7 +1,7 @@ #include "EXEventGen.h" #include "EXVKalDetector.h" #include "EXVMeasLayer.h" -#include "TPlane.h" +#include #include "TRandom.h" //----------------------------------- diff --git a/examples/kaltest/hybrid/gen/EXEventGen.h b/examples/kaltest/hybrid/gen/EXEventGen.h index 3dca449..20b9ac9 100644 --- a/examples/kaltest/hybrid/gen/EXEventGen.h +++ b/examples/kaltest/hybrid/gen/EXEventGen.h @@ -1,8 +1,8 @@ #ifndef __EXEVENTGEN__ #define __EXEVENTGEN__ -#include "TKalDetCradle.h" -#include "THelicalTrack.h" +#include +#include class EXEventGen { public: diff --git a/examples/kaltest/hybrid/it/EXITFBHit.h b/examples/kaltest/hybrid/it/EXITFBHit.h index 1ddaed3..7d202ce 100644 --- a/examples/kaltest/hybrid/it/EXITFBHit.h +++ b/examples/kaltest/hybrid/it/EXITFBHit.h @@ -1,8 +1,8 @@ #ifndef __EXITFBHIT__ #define __EXITHFBIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXITFBMeasLayer.h" class EXITFBHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx b/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx index 61396b2..2aad10e 100644 --- a/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx +++ b/examples/kaltest/hybrid/it/EXITFBMeasLayer.cxx @@ -19,7 +19,7 @@ #include "EXITFBMeasLayer.h" #include "EXITFBHit.h" #include "EXITKalDetector.h" -#include "TVTrack.h" +#include #include "TRandom.h" #include #include diff --git a/examples/kaltest/hybrid/it/EXITFBMeasLayer.h b/examples/kaltest/hybrid/it/EXITFBMeasLayer.h index c85b7ad..745ebe2 100644 --- a/examples/kaltest/hybrid/it/EXITFBMeasLayer.h +++ b/examples/kaltest/hybrid/it/EXITFBMeasLayer.h @@ -18,10 +18,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TPlane.h" -#include "TKalMatrix.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include #include "TMath.h" class TVTrackHit; diff --git a/examples/kaltest/hybrid/it/EXITHit.h b/examples/kaltest/hybrid/it/EXITHit.h index 40da0b8..801205e 100644 --- a/examples/kaltest/hybrid/it/EXITHit.h +++ b/examples/kaltest/hybrid/it/EXITHit.h @@ -1,8 +1,8 @@ #ifndef __EXITHIT__ #define __EXITHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXITMeasLayer.h" class EXITHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/it/EXITMeasLayer.h b/examples/kaltest/hybrid/it/EXITMeasLayer.h index 38394a9..9196aa9 100644 --- a/examples/kaltest/hybrid/it/EXITMeasLayer.h +++ b/examples/kaltest/hybrid/it/EXITMeasLayer.h @@ -16,9 +16,9 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/kern/EXHYBTrack.cxx b/examples/kaltest/hybrid/kern/EXHYBTrack.cxx index 7fcd57d..26595d3 100644 --- a/examples/kaltest/hybrid/kern/EXHYBTrack.cxx +++ b/examples/kaltest/hybrid/kern/EXHYBTrack.cxx @@ -17,7 +17,7 @@ //************************************************************************* #include "EXHYBTrack.h" -#include "TKalTrackSite.h" // from KalTrackLib +#include // from KalTrackLib #include "TVirtualPad.h" // from ROOT #include "TPolyMarker3D.h" // from ROOT diff --git a/examples/kaltest/hybrid/kern/EXHYBTrack.h b/examples/kaltest/hybrid/kern/EXHYBTrack.h index 9d2b2c9..5fd1970 100644 --- a/examples/kaltest/hybrid/kern/EXHYBTrack.h +++ b/examples/kaltest/hybrid/kern/EXHYBTrack.h @@ -16,8 +16,8 @@ //* //************************************************************************* -#include "TKalTrack.h" // from KalTrackLib -#include "TAttDrawable.h" // from Utils +#include // from KalTrackLib +#include // from Utils //_________________________________________________________________________ // ------------------------------ diff --git a/examples/kaltest/hybrid/kern/EXVKalDetector.cxx b/examples/kaltest/hybrid/kern/EXVKalDetector.cxx index 08cab0b..2125ca5 100644 --- a/examples/kaltest/hybrid/kern/EXVKalDetector.cxx +++ b/examples/kaltest/hybrid/kern/EXVKalDetector.cxx @@ -1,6 +1,6 @@ #include "EXVKalDetector.h" #include "EXVMeasLayer.h" -#include "TVKalDetector.h" +#include #include "TTUBE.h" #include "TNode.h" #include "TRotMatrix.h" diff --git a/examples/kaltest/hybrid/kern/EXVKalDetector.h b/examples/kaltest/hybrid/kern/EXVKalDetector.h index 0140e54..bfc2777 100644 --- a/examples/kaltest/hybrid/kern/EXVKalDetector.h +++ b/examples/kaltest/hybrid/kern/EXVKalDetector.h @@ -2,8 +2,8 @@ #define __EXVDETECTOR__ #include "TVector3.h" -#include "TVKalDetector.h" -#include "TAttDrawable.h" +#include +#include class TVMeasLayer; class TNode; diff --git a/examples/kaltest/hybrid/kern/EXVMeasLayer.h b/examples/kaltest/hybrid/kern/EXVMeasLayer.h index ef2130e..4e00385 100644 --- a/examples/kaltest/hybrid/kern/EXVMeasLayer.h +++ b/examples/kaltest/hybrid/kern/EXVMeasLayer.h @@ -16,11 +16,11 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" -#include "TVMeasLayer.h" -#include "TAttDrawable.h" -#include "KalTrackDim.h" +#include +#include +#include +#include +#include #include "TString.h" class TVTrackHit; diff --git a/examples/kaltest/hybrid/main/EXKalTest.cxx b/examples/kaltest/hybrid/main/EXKalTest.cxx index 7e96a51..d6de279 100644 --- a/examples/kaltest/hybrid/main/EXKalTest.cxx +++ b/examples/kaltest/hybrid/main/EXKalTest.cxx @@ -1,10 +1,10 @@ //#define SAVE_RESIDUAL #include "TNtupleD.h" #include "TFile.h" -#include "TKalDetCradle.h" -#include "TKalTrackState.h" -#include "TKalTrackSite.h" -#include "TVTrackHit.h" +#include +#include +#include +#include #include "EXKalTest.h" #include "EXTPCKalDetector.h" #include "EXITKalDetector.h" diff --git a/examples/kaltest/hybrid/old_it/EXITFBHit.h b/examples/kaltest/hybrid/old_it/EXITFBHit.h index 1ddaed3..7d202ce 100644 --- a/examples/kaltest/hybrid/old_it/EXITFBHit.h +++ b/examples/kaltest/hybrid/old_it/EXITFBHit.h @@ -1,8 +1,8 @@ #ifndef __EXITFBHIT__ #define __EXITHFBIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXITFBMeasLayer.h" class EXITFBHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.cxx b/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.cxx index 3188eb1..fa78cbe 100644 --- a/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.cxx +++ b/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.cxx @@ -18,7 +18,7 @@ #include "EXITFBMeasLayer.h" #include "EXITFBHit.h" #include "EXITKalDetector.h" -#include "TVTrack.h" +#include #include "TRandom.h" #include diff --git a/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h b/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h index 2506eef..8108e8a 100644 --- a/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h +++ b/examples/kaltest/hybrid/old_it/EXITFBMeasLayer.h @@ -17,10 +17,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TPlane.h" -#include "TKalMatrix.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/old_it/EXITHit.h b/examples/kaltest/hybrid/old_it/EXITHit.h index 40da0b8..801205e 100644 --- a/examples/kaltest/hybrid/old_it/EXITHit.h +++ b/examples/kaltest/hybrid/old_it/EXITHit.h @@ -1,8 +1,8 @@ #ifndef __EXITHIT__ #define __EXITHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXITMeasLayer.h" class EXITHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/old_it/EXITMeasLayer.h b/examples/kaltest/hybrid/old_it/EXITMeasLayer.h index 38394a9..9196aa9 100644 --- a/examples/kaltest/hybrid/old_it/EXITMeasLayer.h +++ b/examples/kaltest/hybrid/old_it/EXITMeasLayer.h @@ -16,9 +16,9 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/old_vtx/EXVTXHit.h b/examples/kaltest/hybrid/old_vtx/EXVTXHit.h index 2163c9f..a8c54f0 100644 --- a/examples/kaltest/hybrid/old_vtx/EXVTXHit.h +++ b/examples/kaltest/hybrid/old_vtx/EXVTXHit.h @@ -1,8 +1,8 @@ #ifndef __EXVTXHIT__ #define __EXVTXHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXVTXMeasLayer.h" class EXVTXHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h b/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h index 49a51be..02e0fed 100644 --- a/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h +++ b/examples/kaltest/hybrid/old_vtx/EXVTXMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/tpc/EXTPCHit.h b/examples/kaltest/hybrid/tpc/EXTPCHit.h index ddacb83..935f8f2 100644 --- a/examples/kaltest/hybrid/tpc/EXTPCHit.h +++ b/examples/kaltest/hybrid/tpc/EXTPCHit.h @@ -1,8 +1,8 @@ #ifndef __EXTPCHIT__ #define __EXTPCHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXTPCMeasLayer.h" class EXTPCHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h b/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h index 3630718..9803666 100644 --- a/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h +++ b/examples/kaltest/hybrid/tpc/EXTPCMeasLayer.h @@ -16,10 +16,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TCylinder.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include class TVTrackHit; diff --git a/examples/kaltest/hybrid/vtx/EXVTXHit.h b/examples/kaltest/hybrid/vtx/EXVTXHit.h index 2163c9f..a8c54f0 100644 --- a/examples/kaltest/hybrid/vtx/EXVTXHit.h +++ b/examples/kaltest/hybrid/vtx/EXVTXHit.h @@ -1,8 +1,8 @@ #ifndef __EXVTXHIT__ #define __EXVTXHIT__ -#include "KalTrackDim.h" -#include "TVTrackHit.h" +#include +#include #include "EXVTXMeasLayer.h" class EXVTXHit : public TVTrackHit { diff --git a/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx b/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx index 8d1801f..cfc576e 100644 --- a/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx +++ b/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.cxx @@ -18,7 +18,7 @@ #include "EXVTXMeasLayer.h" #include "EXVTXHit.h" #include "EXVTXKalDetector.h" -#include "TVTrack.h" +#include #include "TVector3.h" #include "TRandom.h" #include "TMath.h" diff --git a/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h b/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h index 688500b..1fae417 100644 --- a/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h +++ b/examples/kaltest/hybrid/vtx/EXVTXMeasLayer.h @@ -17,10 +17,10 @@ //************************************************************************* // #include "TVector3.h" -#include "TKalMatrix.h" -#include "TPlane.h" +#include +#include #include "EXVMeasLayer.h" -#include "KalTrackDim.h" +#include #include "TMath.h" #include class TVTrackHit; diff --git a/examples/kaltest/simple/EXKalSite.h b/examples/kaltest/simple/EXKalSite.h index 418eb07..ac04bc3 100644 --- a/examples/kaltest/simple/EXKalSite.h +++ b/examples/kaltest/simple/EXKalSite.h @@ -16,7 +16,7 @@ //* //************************************************************************* // -#include "TVKalSite.h" +#include class EXHit; class TVKalState; class EXKalState; diff --git a/examples/kaltest/simple/EXKalState.h b/examples/kaltest/simple/EXKalState.h index 68871eb..6cf3964 100644 --- a/examples/kaltest/simple/EXKalState.h +++ b/examples/kaltest/simple/EXKalState.h @@ -16,7 +16,7 @@ //* //************************************************************************* // -#include "TVKalState.h" +#include class EXKalSite; diff --git a/examples/kaltest/simple/EXKalSystem.h b/examples/kaltest/simple/EXKalSystem.h index 6c0243e..cfd80cd 100644 --- a/examples/kaltest/simple/EXKalSystem.h +++ b/examples/kaltest/simple/EXKalSystem.h @@ -16,7 +16,7 @@ //* //************************************************************************* -#include "TVKalSystem.h" +#include //_____________________________________________________________________ // ------------------------------ diff --git a/src/kaltracklib/KalTrackDim.h b/include/kaltest/KalTrackDim.h similarity index 100% rename from src/kaltracklib/KalTrackDim.h rename to include/kaltest/KalTrackDim.h diff --git a/src/utils/TAttDrawable.h b/include/kaltest/TAttDrawable.h similarity index 100% rename from src/utils/TAttDrawable.h rename to include/kaltest/TAttDrawable.h diff --git a/src/utils/TAttElement.h b/include/kaltest/TAttElement.h similarity index 100% rename from src/utils/TAttElement.h rename to include/kaltest/TAttElement.h diff --git a/src/utils/TAttLockable.h b/include/kaltest/TAttLockable.h similarity index 100% rename from src/utils/TAttLockable.h rename to include/kaltest/TAttLockable.h diff --git a/src/bfield/TBField.h b/include/kaltest/TBField.h similarity index 100% rename from src/bfield/TBField.h rename to include/kaltest/TBField.h diff --git a/src/geomlib/TCircle.h b/include/kaltest/TCircle.h similarity index 98% rename from src/geomlib/TCircle.h rename to include/kaltest/TCircle.h index 2bb548a..e41f9df 100644 --- a/src/geomlib/TCircle.h +++ b/include/kaltest/TCircle.h @@ -18,7 +18,7 @@ // #include #include "TVector2.h" -#include "TVCurve.h" +#include using namespace std; //_____________________________________________________________________ diff --git a/src/geomlib/TCutCone.h b/include/kaltest/TCutCone.h similarity index 99% rename from src/geomlib/TCutCone.h rename to include/kaltest/TCutCone.h index b66cfef..2805ed7 100644 --- a/src/geomlib/TCutCone.h +++ b/include/kaltest/TCutCone.h @@ -20,7 +20,7 @@ //* IsOnSurface(), etc. //************************************************************************* // -#include "TVSurface.h" +#include #include "TVector3.h" #include "TMatrixD.h" @@ -119,4 +119,3 @@ Double_t TCutCone::GetSortingPolicy() const return GetZ1()*GetTanA(); } #endif - diff --git a/src/geomlib/TCylinder.h b/include/kaltest/TCylinder.h similarity index 98% rename from src/geomlib/TCylinder.h rename to include/kaltest/TCylinder.h index 793da63..33b6f03 100644 --- a/src/geomlib/TCylinder.h +++ b/include/kaltest/TCylinder.h @@ -17,7 +17,7 @@ //* //************************************************************************* // -#include "TVSurface.h" +#include #include "TVector3.h" #include "TMatrixD.h" @@ -101,4 +101,3 @@ Double_t TCylinder::GetSortingPolicy() const return GetR(); } #endif - diff --git a/src/geomlib/THelicalTrack.h b/include/kaltest/THelicalTrack.h similarity index 98% rename from src/geomlib/THelicalTrack.h rename to include/kaltest/THelicalTrack.h index dcdfcce..acd4178 100644 --- a/src/geomlib/THelicalTrack.h +++ b/include/kaltest/THelicalTrack.h @@ -28,8 +28,8 @@ //************************************************************************* // -#include "TVTrack.h" -#include "TKalMatrix.h" +#include +#include //_____________________________________________________________________ // ----------------------------------- @@ -106,4 +106,3 @@ class THelicalTrack : public TVTrack { }; #endif - diff --git a/src/geomlib/THype.h b/include/kaltest/THype.h similarity index 98% rename from src/geomlib/THype.h rename to include/kaltest/THype.h index d3e2be5..b63bbf1 100644 --- a/src/geomlib/THype.h +++ b/include/kaltest/THype.h @@ -17,7 +17,7 @@ //* //************************************************************************* // -#include "TVSurface.h" +#include #include "TVector3.h" #include "TMatrixD.h" @@ -107,4 +107,3 @@ Double_t THype::GetSortingPolicy() const return GetR0(); } #endif - diff --git a/src/kaltracklib/TKalDetCradle.h b/include/kaltest/TKalDetCradle.h similarity index 96% rename from src/kaltracklib/TKalDetCradle.h rename to include/kaltest/TKalDetCradle.h index 28ccd3b..f0c7edb 100644 --- a/src/kaltracklib/TKalDetCradle.h +++ b/include/kaltest/TKalDetCradle.h @@ -24,9 +24,9 @@ //************************************************************************* #include "TObjArray.h" // from ROOT -#include "TAttElement.h" // from Utils -#include "TKalMatrix.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib +#include // from Utils +#include // from KalTrackLib +#include // from KalTrackLib #include // from STL class TKalTrackSite; diff --git a/src/kaltracklib/TKalFilterCond.h b/include/kaltest/TKalFilterCond.h similarity index 100% rename from src/kaltracklib/TKalFilterCond.h rename to include/kaltest/TKalFilterCond.h diff --git a/src/kallib/TKalMatrix.h b/include/kaltest/TKalMatrix.h similarity index 100% rename from src/kallib/TKalMatrix.h rename to include/kaltest/TKalMatrix.h diff --git a/src/kaltracklib/TKalTrack.h b/include/kaltest/TKalTrack.h similarity index 94% rename from src/kaltracklib/TKalTrack.h rename to include/kaltest/TKalTrack.h index 1151663..601bd63 100644 --- a/src/kaltracklib/TKalTrack.h +++ b/include/kaltest/TKalTrack.h @@ -21,8 +21,8 @@ //* //************************************************************************* -#include "TVKalSystem.h" // from KalLib -#include "TKalTrackState.h" // from KalTrackLib +#include // from KalLib +#include // from KalTrackLib //_________________________________________________________________________ // ------------------------------ diff --git a/src/kaltracklib/TKalTrackSite.h b/include/kaltest/TKalTrackSite.h similarity index 94% rename from src/kaltracklib/TKalTrackSite.h rename to include/kaltest/TKalTrackSite.h index 78a88d6..eadc7b2 100644 --- a/src/kaltracklib/TKalTrackSite.h +++ b/include/kaltest/TKalTrackSite.h @@ -20,11 +20,11 @@ //************************************************************************* #include "TVector3.h" // from ROOT -#include "TVKalSite.h" // from KalLib -#include "TVTrackHit.h" // from KalTrackLib +#include // from KalLib +#include // from KalTrackLib -#include "TTrackFrame.h" // from KalTrackLib -#include "TBField.h" // from Bfield +#include // from KalTrackLib +#include // from Bfield class TVKalState; class TKalTrackState; diff --git a/src/kaltracklib/TKalTrackState.h b/include/kaltest/TKalTrackState.h similarity index 93% rename from src/kaltracklib/TKalTrackState.h rename to include/kaltest/TKalTrackState.h index 64aff26..6b39b66 100644 --- a/src/kaltracklib/TKalTrackState.h +++ b/include/kaltest/TKalTrackState.h @@ -21,10 +21,10 @@ //* //************************************************************************* -#include "TVKalState.h" // from KalLib -#include "THelicalTrack.h" // from GeomLib -#include "TStraightTrack.h" // from GeomLib -#include "KalTrackDim.h" // from KalTrackLib +#include // from KalLib +#include // from GeomLib +#include // from GeomLib +#include // from KalTrackLib #include class TKalTrackSite; diff --git a/src/geomlib/TPlane.h b/include/kaltest/TPlane.h similarity index 98% rename from src/geomlib/TPlane.h rename to include/kaltest/TPlane.h index bca5aec..1fb7441 100644 --- a/src/geomlib/TPlane.h +++ b/include/kaltest/TPlane.h @@ -17,7 +17,7 @@ //* //************************************************************************* // -#include "TVSurface.h" +#include #include "TVector3.h" #include "TMatrixD.h" @@ -77,4 +77,3 @@ Double_t TPlane::GetSortingPolicy() const return TMath::Abs(fXc*fNormal.Unit()); } #endif - diff --git a/src/bfield/TRKMagField.h b/include/kaltest/TRKMagField.h similarity index 100% rename from src/bfield/TRKMagField.h rename to include/kaltest/TRKMagField.h diff --git a/src/geomlib/TRKTrack.h b/include/kaltest/TRKTrack.h similarity index 97% rename from src/geomlib/TRKTrack.h rename to include/kaltest/TRKTrack.h index e462610..d1d9e4b 100644 --- a/src/geomlib/TRKTrack.h +++ b/include/kaltest/TRKTrack.h @@ -23,7 +23,7 @@ #include "TVector3.h" -#include "TVMeasLayer.h" +#include //_____________________________________________________________________ // ----------------------------------- diff --git a/src/geomlib/TRungeKuttaTrack.h b/include/kaltest/TRungeKuttaTrack.h similarity index 98% rename from src/geomlib/TRungeKuttaTrack.h rename to include/kaltest/TRungeKuttaTrack.h index c334e3a..d32c7de 100644 --- a/src/geomlib/TRungeKuttaTrack.h +++ b/include/kaltest/TRungeKuttaTrack.h @@ -16,9 +16,9 @@ //************************************************************************* // #include "TVector3.h" -#include "TVMeasLayer.h" -#include "THelicalTrack.h" -#include "TVSurface.h" +#include +#include +#include using namespace std; diff --git a/src/geomlib/TStraightTrack.h b/include/kaltest/TStraightTrack.h similarity index 98% rename from src/geomlib/TStraightTrack.h rename to include/kaltest/TStraightTrack.h index 2162f05..31d4667 100644 --- a/src/geomlib/TStraightTrack.h +++ b/include/kaltest/TStraightTrack.h @@ -25,7 +25,7 @@ //************************************************************************* // -#include "TVTrack.h" +#include //_____________________________________________________________________ // ----------------------------------- @@ -79,4 +79,3 @@ class TStraightTrack : public TVTrack { }; #endif - diff --git a/src/kaltracklib/TTrackFrame.h b/include/kaltest/TTrackFrame.h similarity index 98% rename from src/kaltracklib/TTrackFrame.h rename to include/kaltest/TTrackFrame.h index f1cd93d..d179bad 100644 --- a/src/kaltracklib/TTrackFrame.h +++ b/include/kaltest/TTrackFrame.h @@ -16,7 +16,7 @@ //* //************************************************************************* -#include "TKalMatrix.h" +#include #include "TRotation.h" #include "TVector3.h" diff --git a/src/geomlib/TTube.h b/include/kaltest/TTube.h similarity index 98% rename from src/geomlib/TTube.h rename to include/kaltest/TTube.h index 7588f4b..2ef9e18 100644 --- a/src/geomlib/TTube.h +++ b/include/kaltest/TTube.h @@ -16,7 +16,7 @@ //* //************************************************************************* // -#include "TVSolid.h" +#include #include "TVector3.h" class TVTrack; @@ -89,4 +89,3 @@ Bool_t TTube::IsOutside(const TVector3 &xx) const return (r < fRin || r > fRout || z < GetZmin() || z > GetZmax()); } #endif - diff --git a/src/geomlib/TVCurve.h b/include/kaltest/TVCurve.h similarity index 100% rename from src/geomlib/TVCurve.h rename to include/kaltest/TVCurve.h diff --git a/src/kaltracklib/TVKalDetector.h b/include/kaltest/TVKalDetector.h similarity index 95% rename from src/kaltracklib/TVKalDetector.h rename to include/kaltest/TVKalDetector.h index 0edc394..a7a331c 100644 --- a/src/kaltracklib/TVKalDetector.h +++ b/include/kaltest/TVKalDetector.h @@ -19,7 +19,7 @@ //************************************************************************* #include "TObjArray.h" // from ROOT -#include "TAttElement.h" // from Utils +#include // from Utils //_________________________________________________________________________ // ------------------------------ diff --git a/src/kallib/TVKalSite.h b/include/kaltest/TVKalSite.h similarity index 97% rename from src/kallib/TVKalSite.h rename to include/kaltest/TVKalSite.h index 4389748..4cf2789 100644 --- a/src/kallib/TVKalSite.h +++ b/include/kaltest/TVKalSite.h @@ -23,9 +23,9 @@ // #include "TObjArray.h" -#include "TAttLockable.h" -#include "TKalMatrix.h" -#include "TVKalState.h" +#include +#include +#include class TVKalSystem; diff --git a/src/kallib/TVKalState.h b/include/kaltest/TVKalState.h similarity index 99% rename from src/kallib/TVKalState.h rename to include/kaltest/TVKalState.h index 0b7463b..a7770a5 100644 --- a/src/kallib/TVKalState.h +++ b/include/kaltest/TVKalState.h @@ -16,7 +16,7 @@ //* //************************************************************************* // -#include "TKalMatrix.h" +#include class TVKalSite; //_____________________________________________________________________ // ----------------------------------- diff --git a/src/kallib/TVKalSystem.h b/include/kaltest/TVKalSystem.h similarity index 98% rename from src/kallib/TVKalSystem.h rename to include/kaltest/TVKalSystem.h index 7520bf7..aae7382 100644 --- a/src/kallib/TVKalSystem.h +++ b/include/kaltest/TVKalSystem.h @@ -19,7 +19,7 @@ //************************************************************************* #include "TObjArray.h" -#include "TVKalSite.h" +#include #include //_____________________________________________________________________ // ------------------------------ diff --git a/src/kaltracklib/TVMeasLayer.h b/include/kaltest/TVMeasLayer.h similarity index 95% rename from src/kaltracklib/TVMeasLayer.h rename to include/kaltest/TVMeasLayer.h index fdc91c9..ae3b615 100644 --- a/src/kaltracklib/TVMeasLayer.h +++ b/include/kaltest/TVMeasLayer.h @@ -30,9 +30,9 @@ #include "TVector3.h" // from ROOT #include "TMaterial.h" // from ROOT -#include "TAttElement.h" // from Utils -#include "TKalMatrix.h" // from KalLib -#include "KalTrackDim.h" // from KalTrackLib +#include // from Utils +#include // from KalLib +#include // from KalTrackLib class TVTrack; class TVTrackHit; diff --git a/src/geomlib/TVSolid.h b/include/kaltest/TVSolid.h similarity index 100% rename from src/geomlib/TVSolid.h rename to include/kaltest/TVSolid.h diff --git a/src/geomlib/TVSurface.h b/include/kaltest/TVSurface.h similarity index 100% rename from src/geomlib/TVSurface.h rename to include/kaltest/TVSurface.h diff --git a/src/geomlib/TVTrack.h b/include/kaltest/TVTrack.h similarity index 98% rename from src/geomlib/TVTrack.h rename to include/kaltest/TVTrack.h index 98653ae..2a74ca8 100644 --- a/src/geomlib/TVTrack.h +++ b/include/kaltest/TVTrack.h @@ -26,8 +26,8 @@ #include "TCollection.h" #endif -#include "TVCurve.h" -#include "TTrackFrame.h" +#include +#include #include diff --git a/src/kaltracklib/TVTrackHit.h b/include/kaltest/TVTrackHit.h similarity index 91% rename from src/kaltracklib/TVTrackHit.h rename to include/kaltest/TVTrackHit.h index 152a84b..18be36d 100644 --- a/src/kaltracklib/TVTrackHit.h +++ b/include/kaltest/TVTrackHit.h @@ -18,9 +18,9 @@ //************************************************************************* #include "TVector3.h" // from ROOT -#include "TKalMatrix.h" // from KalLib -#include "KalTrackDim.h" // from KalTrackLib -#include "TVMeasLayer.h" // from KalTrackLib +#include // from KalLib +#include // from KalTrackLib +#include // from KalTrackLib class TVTrackHit : public TKalMatrix { public: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec172c6..818ed52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,36 +2,43 @@ SET( lib_input_dirs geomlib kallib kaltracklib utils bfield ) -FOREACH( lib_input_dir ${lib_input_dirs} ) - LIST( APPEND ROOT_DICT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${lib_input_dir} ) +SET( KalTest_PUBLIC_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include" ) +SET( KalTest_PUBLIC_HEADER_DIR "${KalTest_PUBLIC_INCLUDE_DIR}/kaltest" ) + +# One dictionary and one PCM serve the whole KalTest library. Every header is +# passed by its stable public spelling, kaltest/Header.h. +FILE( GLOB KALTEST_PUBLIC_HEADERS "${KalTest_PUBLIC_HEADER_DIR}/*.h" ) + +SET( KALTEST_DICT_HEADERS ) +SET( KALTEST_DICT_DEPENDS ) +FOREACH( _header ${KALTEST_PUBLIC_HEADERS} ) + GET_FILENAME_COMPONENT( _header_name "${_header}" NAME ) + LIST( APPEND KALTEST_DICT_HEADERS "kaltest/${_header_name}" ) + LIST( APPEND KALTEST_DICT_DEPENDS "${_header}" ) ENDFOREACH() -#MESSAGE( STATUS "ROOT_DICT_INCLUDE_DIRS: ${ROOT_DICT_INCLUDE_DIRS}" ) - - +SET( KALTEST_DICT_LINKDEF "${CMAKE_CURRENT_SOURCE_DIR}/KalTestLinkDef.h" ) +SET( KALTEST_DICT_SOURCE "${CMAKE_BINARY_DIR}/rootdict/KalTestDict.cxx" ) +SET( KALTEST_DICT_PCM "${CMAKE_BINARY_DIR}/rootdict/KalTestDict_rdict.pcm" ) +ADD_CUSTOM_COMMAND( + OUTPUT "${KALTEST_DICT_SOURCE}" "${KALTEST_DICT_PCM}" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_BINARY_DIR}/rootdict" + COMMAND ${ROOT_CINT_WRAPPER} -f "${KALTEST_DICT_SOURCE}" -c + ${ROOT_DICT_CINT_DEFINITIONS} -I${KalTest_PUBLIC_INCLUDE_DIR} + ${KALTEST_DICT_HEADERS} "${KALTEST_DICT_LINKDEF}" + WORKING_DIRECTORY "${KalTest_PUBLIC_INCLUDE_DIR}" + DEPENDS ${KALTEST_DICT_DEPENDS} "${KALTEST_DICT_LINKDEF}" + COMMENT "generating: ${KALTEST_DICT_SOURCE} ${KALTEST_DICT_PCM}" +) + +SET( lib_sources ) FOREACH( lib_input_dir ${lib_input_dirs} ) - - AUX_SOURCE_DIRECTORY( ${lib_input_dir} lib_sources ) - - PREPARE_ROOT_DICT_HEADERS( ${lib_input_dir} ) - - INSTALL_DIRECTORY( ${lib_input_dir}/ DESTINATION "include/kaltest" - FILES_MATCHING PATTERN "*.h" PATTERN "LinkDef.h" EXCLUDE - ) - - - GEN_ROOT_DICT_SOURCES( ${lib_input_dir}Dict.cxx ) - - install(FILES ${ROOT_DICT_OUTPUT_DIR}/${lib_input_dir}Dict_rdict.pcm DESTINATION lib) - - LIST( APPEND lib_sources ${ROOT_DICT_OUTPUT_SOURCES} ) - + AUX_SOURCE_DIRECTORY( ${lib_input_dir} _component_sources ) + LIST( APPEND lib_sources ${_component_sources} ) ENDFOREACH() +LIST( APPEND lib_sources "${KALTEST_DICT_SOURCE}" ) -INCLUDE_DIRECTORIES( ${ROOT_DICT_INCLUDE_DIRS} ) -INCLUDE_DIRECTORIES( SYSTEM ${ROOT_INCLUDE_DIRS} ) -#fg: for ROOT 6 we need the .src/cpp as include directory -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) +INCLUDE_DIRECTORIES( SYSTEM ${ROOT_INCLUDE_DIRS} ) #MESSAGE( STATUS "KalTest lib sources: ${lib_sources}" ) @@ -48,3 +55,7 @@ IF( APPLE ) #---- need special linker flags for ROOT dictionary on MacOS ENDIF( APPLE ) +install( FILES "${KALTEST_DICT_PCM}" DESTINATION lib ) +INSTALL( DIRECTORY "${KalTest_PUBLIC_HEADER_DIR}/" DESTINATION "include/kaltest" + FILES_MATCHING PATTERN "*.h" +) diff --git a/src/KalTestLinkDef.h b/src/KalTestLinkDef.h new file mode 100644 index 0000000..9a53ddd --- /dev/null +++ b/src/KalTestLinkDef.h @@ -0,0 +1,44 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class TCircle+; +#pragma link C++ class TCutCone+; +#pragma link C++ class TCylinder+; +#pragma link C++ class TPlane+; +#pragma link C++ class THype+; +#pragma link C++ class TTube+; +#pragma link C++ class THelicalTrack+; +#pragma link C++ class TStraightTrack+; +#pragma link C++ class TVCurve+; +#pragma link C++ class TVSolid+; +#pragma link C++ class TVSurface+; +#pragma link C++ class TVTrack+; +#pragma link C++ class TRKTrack+; +#pragma link C++ class TRungeKuttaTrack+; + +#pragma link C++ class TKalMatrix+; +#pragma link C++ class TVKalSite+; +#pragma link C++ class TVKalState+; +#pragma link C++ class TVKalSystem+; + +#pragma link C++ class TVTrackHit+; +#pragma link C++ class TVMeasLayer+; +#pragma link C++ class TKalTrackSite+; +#pragma link C++ class TKalTrackState+; +#pragma link C++ class TKalTrack+; +#pragma link C++ class TKalDetCradle+; +#pragma link C++ class TVKalDetector+; +#pragma link C++ class TKalFilterCond+; +#pragma link C++ class TTrackFrame+; + +#pragma link C++ class TAttDrawable+; +#pragma link C++ class TAttElement+; +#pragma link C++ class TAttLockable+; + +#pragma link C++ class TBField+; +#pragma link C++ class TRKMagField+; + +#endif diff --git a/src/bfield/TBField.cxx b/src/bfield/TBField.cxx index 1b312cc..b2db284 100644 --- a/src/bfield/TBField.cxx +++ b/src/bfield/TBField.cxx @@ -24,7 +24,7 @@ #include #include // from STL -#include "TBField.h" // from KalTrackLib +#include // from KalTrackLib ClassImp(TBField) diff --git a/src/bfield/TRKMagField.cxx b/src/bfield/TRKMagField.cxx index fa2d4cd..2fee87d 100644 --- a/src/bfield/TRKMagField.cxx +++ b/src/bfield/TRKMagField.cxx @@ -9,9 +9,9 @@ //* //************************************************************************* // -#include "TRKMagField.h" +#include #include "TVector3.h" -#include "TBField.h" +#include #include #include diff --git a/src/geomlib/TCircle.cxx b/src/geomlib/TCircle.cxx index eca9a6d..9f5a843 100644 --- a/src/geomlib/TCircle.cxx +++ b/src/geomlib/TCircle.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TCircle.h" +#include #if ROOT_VERSION_CODE >= ROOT_VERSION(5,15,0) #include "TMath.h" #endif @@ -64,4 +64,3 @@ Int_t TCircle::CalcXingPointWith(const TCircle &c, return 2; } } - diff --git a/src/geomlib/TCutCone.cxx b/src/geomlib/TCutCone.cxx index 642b42c..973a599 100644 --- a/src/geomlib/TCutCone.cxx +++ b/src/geomlib/TCutCone.cxx @@ -19,9 +19,9 @@ //************************************************************************* // #include -#include "TCircle.h" -#include "TCutCone.h" -#include "TVTrack.h" +#include +#include +#include using namespace std; diff --git a/src/geomlib/TCylinder.cxx b/src/geomlib/TCylinder.cxx index e423c93..22e40c5 100644 --- a/src/geomlib/TCylinder.cxx +++ b/src/geomlib/TCylinder.cxx @@ -17,10 +17,10 @@ //************************************************************************* // #include -#include "TCircle.h" -#include "TCylinder.h" -#include "TVTrack.h" -#include "TBField.h" +#include +#include +#include +#include using namespace std; diff --git a/src/geomlib/THelicalTrack.cxx b/src/geomlib/THelicalTrack.cxx index a5fbea1..0660eed 100644 --- a/src/geomlib/THelicalTrack.cxx +++ b/src/geomlib/THelicalTrack.cxx @@ -16,8 +16,8 @@ // #include -#include "THelicalTrack.h" -#include "TBField.h" +#include +#include using namespace std; @@ -495,4 +495,3 @@ void THelicalTrack::CalcDapDa(Double_t fid, F(4,3) = 0.; F(4,4) = 1.; } - diff --git a/src/geomlib/THype.cxx b/src/geomlib/THype.cxx index 49fe26c..1ff853b 100644 --- a/src/geomlib/THype.cxx +++ b/src/geomlib/THype.cxx @@ -15,9 +15,9 @@ //************************************************************************* // #include -#include "TCircle.h" -#include "THype.h" -#include "TVTrack.h" +#include +#include +#include using namespace std; diff --git a/src/geomlib/TPlane.cxx b/src/geomlib/TPlane.cxx index 84206c1..01887b1 100644 --- a/src/geomlib/TPlane.cxx +++ b/src/geomlib/TPlane.cxx @@ -15,7 +15,7 @@ //* //************************************************************************* // -#include "TPlane.h" +#include //_____________________________________________________________________ @@ -64,4 +64,3 @@ TMatrixD TPlane::CalcDSDx(const TVector3 &/*xx*/) const return dsdx; } - diff --git a/src/geomlib/TRKTrack.cxx b/src/geomlib/TRKTrack.cxx index 51f52a4..ab25d47 100644 --- a/src/geomlib/TRKTrack.cxx +++ b/src/geomlib/TRKTrack.cxx @@ -10,9 +10,9 @@ //************************************************************************* // #include -#include "TRKTrack.h" -#include "TBField.h" -#include "TRKMagField.h" +#include +#include +#include ClassImp(TRKTrack) diff --git a/src/geomlib/TRungeKuttaTrack.cxx b/src/geomlib/TRungeKuttaTrack.cxx index f20c9f9..6ebe0b6 100644 --- a/src/geomlib/TRungeKuttaTrack.cxx +++ b/src/geomlib/TRungeKuttaTrack.cxx @@ -12,9 +12,9 @@ #include #include -#include "TRungeKuttaTrack.h" -#include "TBField.h" -#include "TRKMagField.h" +#include +#include +#include ClassImp(TRungeKuttaTrack) diff --git a/src/geomlib/TStraightTrack.cxx b/src/geomlib/TStraightTrack.cxx index ada8017..8446a5a 100644 --- a/src/geomlib/TStraightTrack.cxx +++ b/src/geomlib/TStraightTrack.cxx @@ -16,7 +16,7 @@ // #include -#include "TStraightTrack.h" +#include using namespace std; @@ -280,4 +280,3 @@ void TStraightTrack::CalcDapDa(Double_t fid, F(4,3) = 0; F(4,4) = 1; } - diff --git a/src/geomlib/TTube.cxx b/src/geomlib/TTube.cxx index 61988c8..cdb7fea 100644 --- a/src/geomlib/TTube.cxx +++ b/src/geomlib/TTube.cxx @@ -15,9 +15,9 @@ //************************************************************************* // #include -#include "TCircle.h" -#include "TTube.h" -#include "TVTrack.h" +#include +#include +#include using namespace std; diff --git a/src/geomlib/TVCurve.cxx b/src/geomlib/TVCurve.cxx index 38b3fcc..9ff68cd 100644 --- a/src/geomlib/TVCurve.cxx +++ b/src/geomlib/TVCurve.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TVCurve.h" +#include //_____________________________________________________________________ // ----------------------------------- // Base Class for any curve diff --git a/src/geomlib/TVSolid.cxx b/src/geomlib/TVSolid.cxx index afc58e5..d0dbd96 100644 --- a/src/geomlib/TVSolid.cxx +++ b/src/geomlib/TVSolid.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TVSolid.h" +#include //_____________________________________________________________________ // ----------------------------------- // Base Class for any solid diff --git a/src/geomlib/TVSurface.cxx b/src/geomlib/TVSurface.cxx index 326be83..df9f64f 100644 --- a/src/geomlib/TVSurface.cxx +++ b/src/geomlib/TVSurface.cxx @@ -17,8 +17,8 @@ //************************************************************************* // #include -#include "TVSurface.h" -#include "TVTrack.h" +#include +#include using namespace std; diff --git a/src/geomlib/TVTrack.cxx b/src/geomlib/TVTrack.cxx index 5c18c4d..b524482 100644 --- a/src/geomlib/TVTrack.cxx +++ b/src/geomlib/TVTrack.cxx @@ -16,8 +16,8 @@ // #include -#include "TVTrack.h" -#include "TTrackFrame.h" +#include +#include using namespace std; #if __GNUC__ < 4 && !defined(__STRICT_ANSI__) @@ -89,4 +89,3 @@ TVTrack::TVTrack(const TMatrixD &a, { SetMagField(b); } - diff --git a/src/kallib/TKalMatrix.cxx b/src/kallib/TKalMatrix.cxx index 72d43e6..08b718a 100644 --- a/src/kallib/TKalMatrix.cxx +++ b/src/kallib/TKalMatrix.cxx @@ -17,7 +17,7 @@ #include #include #include "TString.h" -#include "TKalMatrix.h" +#include //_____________________________________________________________________ // ------------------------------ diff --git a/src/kallib/TVKalSite.cxx b/src/kallib/TVKalSite.cxx index 68c767d..9085e48 100644 --- a/src/kallib/TVKalSite.cxx +++ b/src/kallib/TVKalSite.cxx @@ -19,8 +19,8 @@ #include #include -#include "TVKalSite.h" -#include "TVKalState.h" +#include +#include //_____________________________________________________________________ // ------------------------------ diff --git a/src/kallib/TVKalState.cxx b/src/kallib/TVKalState.cxx index bd50938..c3a245c 100644 --- a/src/kallib/TVKalState.cxx +++ b/src/kallib/TVKalState.cxx @@ -14,8 +14,8 @@ //* //************************************************************************* // -#include "TVKalState.h" -#include "TVKalSite.h" +#include +#include //_____________________________________________________________________ // ------------------------------ // Base Class for measurement vector used by Kalman filter diff --git a/src/kallib/TVKalSystem.cxx b/src/kallib/TVKalSystem.cxx index 2737e54..742d62e 100644 --- a/src/kallib/TVKalSystem.cxx +++ b/src/kallib/TVKalSystem.cxx @@ -18,8 +18,8 @@ #include #include #include -#include "TVKalSystem.h" -#include "TVKalState.h" +#include +#include //_____________________________________________________________________ // ------------------------------ diff --git a/src/kaltracklib/TKalDetCradle.cxx b/src/kaltracklib/TKalDetCradle.cxx index a2da1b9..5e6428c 100644 --- a/src/kaltracklib/TKalDetCradle.cxx +++ b/src/kaltracklib/TKalDetCradle.cxx @@ -23,16 +23,16 @@ //* //************************************************************************* -#include "TKalDetCradle.h" // from KalTrackLib -#include "TVMeasLayer.h" // from KalTrackLib -#include "TVKalDetector.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib -#include "TVSurface.h" // from GeomLib -#include "TVTrack.h" // from GeomLib -#include "TBField.h" // from Bfield -#include "TRungeKuttaTrack.h" +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from GeomLib +#include // from GeomLib +#include // from Bfield +#include #include // from STL @@ -494,4 +494,3 @@ void TKalDetCradle::Update() } - diff --git a/src/kaltracklib/TKalFilterCond.cxx b/src/kaltracklib/TKalFilterCond.cxx index 3010585..6cf56be 100644 --- a/src/kaltracklib/TKalFilterCond.cxx +++ b/src/kaltracklib/TKalFilterCond.cxx @@ -13,8 +13,8 @@ //* //************************************************************************* -#include "TKalFilterCond.h" -#include "TKalTrackSite.h" +#include +#include #include //_____________________________________________________________________ diff --git a/src/kaltracklib/TKalTrack.cxx b/src/kaltracklib/TKalTrack.cxx index c55c7c3..8f06e50 100644 --- a/src/kaltracklib/TKalTrack.cxx +++ b/src/kaltracklib/TKalTrack.cxx @@ -17,9 +17,9 @@ //* //************************************************************************* -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib #include // from STL #include // from STL diff --git a/src/kaltracklib/TKalTrackSite.cxx b/src/kaltracklib/TKalTrackSite.cxx index 7e13e9f..12ef1ca 100644 --- a/src/kaltracklib/TKalTrackSite.cxx +++ b/src/kaltracklib/TKalTrackSite.cxx @@ -18,12 +18,12 @@ //* //************************************************************************* -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TVTrackHit.h" // from KalTrackLib -#include "TKalFilterCond.h" // from KalTrackLib -#include "TVSurface.h" // from GeomLib -#include "TBField.h" // from Bfield +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from GeomLib +#include // from Bfield #include // from STL #include // from STL @@ -190,4 +190,3 @@ void TKalTrackSite::DebugPrint() const cout << " res_z = " << (*(TKalTrackSite *)this).GetResVec()(1,0) << endl; fHitPtr->DebugPrint(); } - diff --git a/src/kaltracklib/TKalTrackState.cxx b/src/kaltracklib/TKalTrackState.cxx index 57a39d9..45d8e91 100644 --- a/src/kaltracklib/TKalTrackState.cxx +++ b/src/kaltracklib/TKalTrackState.cxx @@ -20,13 +20,13 @@ //* //************************************************************************* -#include "TKalDetCradle.h" // from KalTrackLib -#include "TVKalDetector.h" // from KalTrackLib -#include "TKalTrackState.h" // from KalTrackLib -#include "TKalTrackSite.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib -#include "TTrackFrame.h" // from KalTrackLib -#include "TBField.h" // from Bfield +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from Bfield #include // from STL #include // from STL @@ -178,4 +178,3 @@ TVTrack &TKalTrackState::CreateTrack() const return *tkp; } - diff --git a/src/kaltracklib/TTrackFrame.cxx b/src/kaltracklib/TTrackFrame.cxx index 9ff619c..6e9774b 100644 --- a/src/kaltracklib/TTrackFrame.cxx +++ b/src/kaltracklib/TTrackFrame.cxx @@ -2,7 +2,7 @@ #include #include "TString.h" -#include "TTrackFrame.h" +#include #include "TMath.h" diff --git a/src/kaltracklib/TVKalDetector.cxx b/src/kaltracklib/TVKalDetector.cxx index 438b72f..abc5cdf 100644 --- a/src/kaltracklib/TVKalDetector.cxx +++ b/src/kaltracklib/TVKalDetector.cxx @@ -17,6 +17,6 @@ //* //************************************************************************* -#include "TVKalDetector.h" +#include ClassImp(TVKalDetector) diff --git a/src/kaltracklib/TVMeasLayer.cxx b/src/kaltracklib/TVMeasLayer.cxx index bbe3664..a13886a 100644 --- a/src/kaltracklib/TVMeasLayer.cxx +++ b/src/kaltracklib/TVMeasLayer.cxx @@ -28,9 +28,9 @@ //* //************************************************************************* -#include "TVMeasLayer.h" // from KalTrackLib -#include "TKalTrack.h" // from KalTrackLib -#include "TVTrack.h" // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib +#include // from KalTrackLib ClassImp(TVMeasLayer) diff --git a/src/kaltracklib/TVTrackHit.cxx b/src/kaltracklib/TVTrackHit.cxx index ad9284a..71eeab9 100644 --- a/src/kaltracklib/TVTrackHit.cxx +++ b/src/kaltracklib/TVTrackHit.cxx @@ -13,7 +13,7 @@ //* //************************************************************************* -#include "TVTrackHit.h" // from KalTrackLib +#include // from KalTrackLib ClassImp(TVTrackHit) diff --git a/src/utils/TAttDrawable.cxx b/src/utils/TAttDrawable.cxx index 0b2b06d..a725aa4 100644 --- a/src/utils/TAttDrawable.cxx +++ b/src/utils/TAttDrawable.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TAttDrawable.h" +#include //_________________________________________________________________________ // ------------------------------- // Base Class for Drawable Objects diff --git a/src/utils/TAttElement.cxx b/src/utils/TAttElement.cxx index b086fc8..42beba7 100644 --- a/src/utils/TAttElement.cxx +++ b/src/utils/TAttElement.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TAttElement.h" +#include //_____________________________________________________________________ // -------------------------------- // Base Class for Element Objects diff --git a/src/utils/TAttLockable.cxx b/src/utils/TAttLockable.cxx index d2d8132..d6c13b4 100644 --- a/src/utils/TAttLockable.cxx +++ b/src/utils/TAttLockable.cxx @@ -14,7 +14,7 @@ //* //************************************************************************* // -#include "TAttLockable.h" +#include //_____________________________________________________________________ // ------------------------------ // Base Class for Lockale Objects