Skip to content

Commit

Permalink
Remove bundled genfit
Browse files Browse the repository at this point in the history
  • Loading branch information
olantwin committed Oct 30, 2024
1 parent e066f22 commit d4f2cb5
Show file tree
Hide file tree
Showing 177 changed files with 8 additions and 34,526 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ it in future.
### Changed

* shipStrawTracking: Move to argparse
* CMake: Require external genfit2

### Removed

* Remove obsolete renaming scripts
* Remove online, please see charmdet and muflux branches for respective versions
* Remove charmdet, please see charmdet branch for latest version
* Remove bundled genfit

## 24.10 - Freiburg

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ find_package2(PUBLIC fmt)
find_package2(PUBLIC FairRoot REQUIRED)
find_package2(PUBLIC FairLogger REQUIRED)
find_package2(PUBLIC VMC REQUIRED)
find_package(genfit2 REQUIRED)

IF(DEFINED ${BOOST_ROOT})
Set(Boost_NO_SYSTEM_PATHS TRUE)
Expand Down Expand Up @@ -223,7 +224,6 @@ add_subdirectory (strawtubes)
add_subdirectory (muon)
add_subdirectory (shipgen)
add_subdirectory (field)
add_subdirectory (genfit)
add_subdirectory (pid)
add_subdirectory (muonShieldOptimization)
add_subdirectory (millepede)
Expand Down
5 changes: 4 additions & 1 deletion field/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ${GEANT4_VMC_INCLUDE_DIR}
${GEANT4_INCLUDE_DIR}
${FAIRROOT_INCLUDE_DIR}
${VMC_INCLUDE_DIRS}
${genfit2_INCDIR}
)

include_directories( ${INCLUDE_DIRECTORIES}
Expand All @@ -20,7 +21,7 @@ ${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${GEANT4VMC_LIBRARY_DIR}
${GEANT4_LIBRARY_DIR}

${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand All @@ -34,13 +35,15 @@ ShipBFieldMap.cxx
ShipCompField.cxx
ShipFieldMaker.cxx
ShipGoliathField.cxx
FairShipFields.cxx
)

set(LINKDEF FieldLinkDef.h)
Set(LIBRARY_NAME ShipField)
Set(DEPENDENCIES
Base
FairLogger::FairLogger
genfit2
)

GENERATE_LIBRARY()
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions field/FieldLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
#pragma link C++ class ShipCompField+;
#pragma link C++ class ShipFieldMaker+;
#pragma link C++ class ShipGoliathField+;
#pragma link C++ class FairShipFields+;
#endif
Loading

0 comments on commit d4f2cb5

Please sign in to comment.