Skip to content

Commit

Permalink
chore: update ACTSVG version (#3643)
Browse files Browse the repository at this point in the history
This PR updates the ACTSVG version in order to prepare for new plotting functionality to be included.
  • Loading branch information
asalzburger authored Sep 24, 2024
1 parent 17b7b92 commit 6f79652
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ endif()
# minimal dependency versions. they are defined here in a single place so
# they can be easily upgraded, although they might not be used if the
# dependency is included via `add_subdirectory(...)`.
set(_acts_actsvg_version 0.4.47)
set(_acts_actsvg_version 0.4.50)
set(_acts_boost_version 1.71.0)
set(_acts_dd4hep_version 1.21)
set(_acts_edm4hep_version 0.7)
Expand Down
1 change: 1 addition & 0 deletions Examples/Python/src/Base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <pybind11/eval.h>
#include <pybind11/pybind11.h>
#include <pybind11/pytypes.h>
#include <pybind11/stl.h>

namespace py = pybind11;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace View {
static inline actsvg::svg::object xy(const ProtoSurface& pSurface,
const std::string& identification) {
actsvg::views::x_y xyView;
return actsvg::display::surface(identification, pSurface, xyView, true);
return actsvg::display::surface(identification, pSurface, xyView);
}

/// Convert into an acts::svg::object with an z-r view
Expand All @@ -67,7 +67,7 @@ static inline actsvg::svg::object xy(const ProtoSurface& pSurface,
static inline actsvg::svg::object zr(const ProtoSurface& pSurface,
const std::string& identification) {
actsvg::views::z_r zrView;
return actsvg::display::surface(identification, pSurface, zrView, true);
return actsvg::display::surface(identification, pSurface, zrView);
}

/// Convert into an acts::svg::object with an z-phi view
Expand All @@ -79,7 +79,7 @@ static inline actsvg::svg::object zr(const ProtoSurface& pSurface,
static inline actsvg::svg::object zphi(const ProtoSurface& pSurface,
const std::string& identification) {
actsvg::views::z_phi zphiView;
return actsvg::display::surface(identification, pSurface, zphiView, true);
return actsvg::display::surface(identification, pSurface, zphiView);
}

/// Convert into an acts::svg::object with an z-rphi view
Expand All @@ -94,7 +94,7 @@ static inline actsvg::svg::object zrphi(const ProtoSurface& pSurface,
const std::string& identification) {
actsvg::views::z_rphi zrphiView;
zrphiView._fixed_r = pSurface._radii[0u];
return actsvg::display::surface(identification, pSurface, zrphiView, true);
return actsvg::display::surface(identification, pSurface, zrphiView);
}

} // namespace View
Expand Down
2 changes: 1 addition & 1 deletion cmake/ActsExternSources.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ACTS_ACTSVG_SOURCE
"URL;https://github.com/acts-project/actsvg/archive/refs/tags/v${_acts_actsvg_version}.tar.gz;URL_HASH;SHA256=aeb3927f8db1c7c9b8afa76adaa720013aa03a01032c8d5f457f623e2b04a172"
"URL;https://github.com/acts-project/actsvg/archive/refs/tags/v${_acts_actsvg_version}.tar.gz;URL_HASH;SHA256=8073a371465ce2edef3bfdba5eae900e17ee61ae21766111ad1834e29250f304"
CACHE STRING
"Source to take ACTSVG from"
)
Expand Down
6 changes: 6 additions & 0 deletions thirdparty/actsvg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@ message(STATUS "Building actsvg as part of the ACTS project")

FetchContent_Declare(actsvg ${ACTS_ACTSVG_SOURCE})

set(ACTSVG_BUILD_PYTHON_BINDINGS
OFF
CACHE BOOL
"Do not build the Python bindings for actsvg"
)

# Now set up its build.
FetchContent_MakeAvailable(actsvg)

0 comments on commit 6f79652

Please sign in to comment.