Skip to content

Commit afb103b

Browse files
MohammadAlTuranyMohammadAlTurany
committed
Re-arrange the repository
Create Common directory and move field and math to it
1 parent ef8b4fd commit afb103b

14 files changed

Lines changed: 8 additions & 8 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ endif(NOT ALICEO2_MODULAR_BUILD)
212212
if (PYTHIA8_FOUND AND Pythia6_FOUND)
213213
add_subdirectory (Generators)
214214
Endif ()
215-
add_subdirectory (MathUtils)
216-
add_subdirectory (Field)
215+
add_subdirectory (Common)
217216
add_subdirectory (devices)
218217
add_subdirectory (macro)
219218
add_subdirectory (CCDB)

‎Common/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
add_subdirectory (Field)
2+
add_subdirectory(MathUtils)

Field/CMakeLists.txt renamed to Common/Field/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set(INCLUDE_DIRECTORIES
66
${CMAKE_SOURCE_DIR}
7-
${CMAKE_SOURCE_DIR}/Field
7+
${CMAKE_SOURCE_DIR}/Common/Field
88
${CMAKE_SOURCE_DIR}/header
99
)
1010

Field/include/MagneticField.h renamed to Common/Field/include/MagneticField.h

File renamed without changes.

Field/include/MagneticWrapperChebyshev.h renamed to Common/Field/include/MagneticWrapperChebyshev.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <TMath.h> // for ATan2, Cos, Sin, Sqrt
88
#include <TNamed.h> // for TNamed
99
#include <TObjArray.h> // for TObjArray
10-
#include "MathUtils/include/Chebyshev3D.h" // for Chebyshev3D
11-
#include "MathUtils/include/Chebyshev3DCalc.h" // for _INC_CREATION_Chebyshev3D_
10+
#include "Common/MathUtils/include/Chebyshev3D.h" // for Chebyshev3D
11+
#include "Common/MathUtils/include/Chebyshev3DCalc.h" // for _INC_CREATION_Chebyshev3D_
1212
#include "Rtypes.h" // for Double_t, Int_t, Float_t, etc
1313
class FairLogger; // lines 16-16
1414

Field/src/FieldLinkDef.h renamed to Common/Field/src/FieldLinkDef.h

File renamed without changes.

Field/src/MagneticField.cxx renamed to Common/Field/src/MagneticField.cxx

File renamed without changes.

Field/src/MagneticWrapperChebyshev.cxx renamed to Common/Field/src/MagneticWrapperChebyshev.cxx

File renamed without changes.

MathUtils/CMakeLists.txt renamed to Common/MathUtils/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# The extension is already found. Any number of sources could be listed here.
44

55
set(INCLUDE_DIRECTORIES
6-
${CMAKE_SOURCE_DIR}/MathUtils/include
6+
${CMAKE_SOURCE_DIR}/Common/MathUtils/
7+
${CMAKE_SOURCE_DIR}/Common/MathUtils/include
78
)
89

910
set(SYSTEM_INCLUDE_DIRECTORIES
10-
${CMAKE_SOURCE_DIR}/MathUtils
1111
${BASE_INCLUDE_DIRECTORIES}
1212
${FAIRROOT_INCLUDE_DIR}
1313
${ROOT_INCLUDE_DIR}
@@ -17,7 +17,6 @@ include_directories( ${INCLUDE_DIRECTORIES})
1717
include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
1818

1919
set(LINK_DIRECTORIES
20-
${CMAKE_SOURCE_DIR}/MathUtils
2120
${FAIRROOT_LIBRARY_DIR}
2221
${ROOT_LIBRARY_DIR}
2322
)

MathUtils/include/Chebyshev3D.h renamed to Common/MathUtils/include/Chebyshev3D.h

File renamed without changes.

0 commit comments

Comments
 (0)