Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kassiopeia v3.8.2 #22

Merged
merged 72 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
bce36dc
Feature: numeric gradient determination on magnetic fieldmaps with on…
wdconinc Apr 13, 2021
f7cf19e
KEMField: some additional checks for magnetic field map
zykure Apr 13, 2021
449debc
Kassiopeia: update `KassiopeiaReader` and provide example
zykure Apr 14, 2021
679f1b6
Feature/p8 build fix (#49)
pslocum Apr 14, 2021
5642006
Remove HDF5 from CMakeLists.txt
zykure Apr 14, 2021
f012ccb
Kassiopeia: `KassiopeiaReader` example for updated user guide
zykure Apr 16, 2021
5c8addc
Update from Kasper develop (9d210e7f3c)
zykure Jun 2, 2021
d29c228
Update dependency graphs and requirements
zykure Jun 2, 2021
48171a3
Update from Kasper develop (20f6089daa)
zykure Jun 2, 2021
a00a523
Fix Docker build issue due to putting sources in `/`
zykure Jun 2, 2021
68f74d1
Update from Kasper develop (37c373cbfa)
zykure Jun 2, 2021
5449657
Update from Kasper develop (fce0771c)
zykure Jun 9, 2021
5eb2a68
Update from Kasper develop (1f46fd39)
zykure Jun 10, 2021
b27ad71
Update from Kasper develop (3fb2d8a6)
zykure Aug 11, 2021
2388023
Update from Kasper develop (25cb1351)
zykure Aug 26, 2021
b333749
Bump version numbers
zykure Aug 27, 2021
2ba3c59
Update changelog for 3.8 release
zykure Aug 27, 2021
114925c
Merge branch 'testing'
zykure Aug 27, 2021
c7d8a93
TestField.cxx needs VTK: build if KEMField_USE_VTK
wdconinc Sep 25, 2021
bf969ee
CMakeLists must include C as language to find proper MPI
wdconinc Oct 6, 2021
62378e2
vtkUnsignedCharArray.h must be explicitly included
wdconinc Oct 6, 2021
58beb3c
Updated physical constants to values from PDG2021
renereimann Oct 15, 2021
1e4ba66
Kommon: add build flag to choose epoch for physical constants
zykure Oct 15, 2021
7d1318a
Kommon: update more physical constants
zykure Oct 15, 2021
471d5b4
Kommon: updated / checked more physical constants (PDG 2021)
zykure Oct 18, 2021
8e769a8
Kommon: enable build flag
zykure Oct 18, 2021
e5d6a2f
Merge pull request #55 from KATRIN-Experiment/PhysicalConstants2021
zykure Oct 20, 2021
7e1dd8a
Kommon: fix Boost build issue, fies #56
zykure Oct 20, 2021
236fbd0
Added time parameterr to KMagnetostaticFieldmapCalculatorBuilder, add…
renereimann Dec 16, 2021
424fde8
Update from Kasper develop (652e21d9)
zykure Nov 9, 2021
559358c
Update from Kasper develop (966def8a)
zykure Nov 9, 2021
ac29138
Update from Kasper develop (966def8a) (missing files)
zykure Nov 9, 2021
32e12ed
Update from Kasper develop (791be0653a)
zykure Nov 10, 2021
1094a3c
Update from Kasper develop (93f0421d)
zykure Nov 10, 2021
bdeb4c4
Update from Kasper develop (d80dc44ba3)
zykure Nov 15, 2021
639d5d9
Update from Kasper develop (d41bf208)
zykure Nov 18, 2021
ff42bfb
Update from Kasper develop (aea93c1c)
zykure Nov 23, 2021
3d49b39
Update from Kasper develop (7cae0e64)
zykure Nov 24, 2021
c7c2a7e
Update from Kasper develop (1590d31c)
zykure Nov 24, 2021
88f3182
Update from Kasper develop (a8117d1d)
zykure Nov 30, 2021
f921abb
Update from Kasper develop (e17c5651)
zykure Dec 1, 2021
d1780c3
Update from Kasper develop (6cb16ac0)
zykure Dec 6, 2021
7d7f74d
Update from Kasper develop (283c36cf)
zykure Dec 8, 2021
a2c4deb
Update from Kasper develop (283c36cf) (missing files)
zykure Dec 16, 2021
dace8f3
Update from Kasper develop (8e67080f)
zykure Dec 16, 2021
3402caf
Update from Kasper develop (6cc15c8d)
zykure Dec 22, 2021
f424878
Update from Kasper develop (b0982c0e)
zykure Dec 22, 2021
0325c8e
Update from Kasper develop (1f1e9b8a)
zykure Jan 17, 2022
68602d0
Update from Kasper develop (31639647)
zykure May 2, 2022
c62d160
Update binding docs
zykure May 2, 2022
afa03cc
Update from Kasper devlop (fad5c2f8)
zykure May 31, 2022
9ef4b16
Update bindings docs
zykure May 31, 2022
40ef6b4
Update bindings docs
zykure May 31, 2022
e497d2d
Update from Kasper develop (38e0d0c0)
zykure Jun 1, 2022
35c4817
Update bindings docs
zykure Jun 1, 2022
e871b56
Add bindings docs
zykure Jun 1, 2022
9e8335d
Avoid std::iterator for c++17, use member types
wdconinc Jun 16, 2022
06f34ee
Avoid use inputwire after fclose (#61)
wdconinc Jun 20, 2022
41be4cc
fix std::iterator for c++17, from #62
zykure Jun 20, 2022
8477b05
check the C++ standard set by CMake
zykure Jun 20, 2022
32949c6
Merge branch 'wdconinc-patch-2'
zykure Jun 20, 2022
5a5b2e0
Merge branch 'main' into testing
zykure Jun 20, 2022
4a6f0f3
Update from Kasper develop (3de992d7)
zykure Jun 20, 2022
505c684
Update from Kasper develop (29fdc9df)
zykure Aug 17, 2022
a38b1bd
Bump version numbers
zykure Aug 17, 2022
a31ab76
Update changelog for v3.8.2
zykure Aug 17, 2022
f8680a1
Use C++17 by default (i.e. set `CMAKE_CXX_STANDARD=17`)
zykure Aug 17, 2022
aa98d64
KEMField: build fixes
zykure Aug 17, 2022
807b8f5
Update changelog
zykure Aug 17, 2022
f32b167
Fix Docker build (needs C++14 for ROOT)
zykure Aug 17, 2022
0b8d344
Kommon: build fixes
zykure Aug 17, 2022
816b859
Update README.md; add license info (MIT license)
zykure Nov 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update from Kasper develop (31639647)
Note: build issue with log4cxx, set `Kommon_USE_Log4CXX=OFF`
  • Loading branch information
zykure committed May 2, 2022
commit 68602d0b14eef1aa331eadce826bb25d2097b2c3
20 changes: 8 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ endif()
add_compile_options( -Wall -Wextra -Werror )

# Only link in libraries that we actually need (but not for executables since it makes things slow)
set(_target_type "$<TARGET_PROPERTY:TYPE>")
add_link_options( $<IF:$<STREQUAL:"${_target_type}","SHARED_LIBRARY">,LINKER:--as-needed,LINKER:--no-as-needed> )
if( NOT APPLE )
set(_target_type "$<TARGET_PROPERTY:TYPE>")
add_link_options( $<IF:$<STREQUAL:"${_target_type}","SHARED_LIBRARY">,LINKER:--as-needed,LINKER:--no-as-needed> )
endif()

# Enable some advanced options depending on build type
if (CMAKE_BUILD_TYPE MATCHES Rel)
Expand Down Expand Up @@ -195,6 +197,10 @@ option( KASPER_USE_GSL "Build GSL dependent modules" ${GSL_FOUND} )

if(NOT DEFINED KASPER_USE_VTK)
find_package(VTK QUIET COMPONENTS vtkCommonCore)
find_package(X11 QUIET)
find_package(GLEW QUIET)
find_package(Freetype QUIET)
find_package(JsonCpp QUIET)
if(VTK_FOUND)
message("VTK was found and enabled automatically. Set KASPER_USE_VTK=OFF to change this.")
endif()
Expand Down Expand Up @@ -304,16 +310,6 @@ message(STATUS
" or `${CMAKE_MAKE_PROGRAM_NAME} doc` to generate the documentation.\n")

# Install common project files

configure_file( KasperVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.h @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.h DESTINATION ${INCLUDE_INSTALL_DIR} )

configure_file( KasperVersion.json.in ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.json @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.json DESTINATION ${CONFIG_INSTALL_DIR} )

configure_file( KasperVersion.xml.in ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.xml @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KasperVersion.xml DESTINATION ${CONFIG_INSTALL_DIR} )

configure_file( kasperenv.sh.in ${CMAKE_CURRENT_BINARY_DIR}/kasperenv.sh @ONLY )
configure_file( create_kasper_user_directory.sh.in ${CMAKE_CURRENT_BINARY_DIR}/create_kasper_user_directory.sh @ONLY )
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kasperenv.sh ${CMAKE_CURRENT_BINARY_DIR}/create_kasper_user_directory.sh DESTINATION ${BIN_INSTALL_DIR} )
67 changes: 67 additions & 0 deletions Documentation/Bindings/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@

Bindings documentation
======================

This section provides documentation for the **XML bindings**. Many Kasper
modules can parse XML files during intialization; the bindings classes define
the available XML elements, their attributes and their relation to C++ classes.

Overview
--------

The files below show the allowed *elements* and *attributes* that can be used
in Kasper XML files; according to the syntax:
```
<element attribute_1="value_1" attribute_2="value_2">
<child_element attribute_3="value_3" />
</element>
```

Elements can be nested according to what is shown here, and each element can
have a number of attributes. Note that in some cases, certain child elements
and attributes are required; in other cases, they are mutually exclusive. Note
that this information is not represented here in the documentation.

* **[bindings_full.md](bindings_full.md)** contains a Markdown representation
of the available bindings. The document is grouped into section that each
have a table with all XML elements and attributes. Each section also
includes a brief XML snippet as a usage example and links to child elements.
* **[bindings_full.rst](bindings_full.rst)** contains the same representation
of the available bindings in reStructuredText (rST) format.
* **[bindings_full.xml](bindings_full.xml)** contains all available bindings
and their attributes in XML format. The attributes contain placeholder values
which indicate their data type. This file is not intended to be processed
by Kasper applications, but servers as an almost-complete XML code example.
* **[bindings_full.svg](bindings_full.svg)** contains a graphical
representation of the XML elements and their relations. The graph is produced
with the GraphViz software. The graph shows all relations between XML
elements and their C++ classes, but not their attributes.
* The following files contain a more detailed graphical representation of the
XML elements of individual Kasper modules along with their attributes:
* **[bindings_Kommon.svg](bindings_Kommon.svg)** for the `Kommon` module
* **[bindings_KaLi.svg](bindings_KaLi.svg)** for the `KaLi` module
* **[bindings_KGeoBag.svg](bindings_KGeoBag.svg)** for the `KGeoBag` module
* **[bindings_KEMField.svg](bindings_KEMField.svg)** for the `KEMField` module
* **[bindings_Kassiopeia.svg](bindings_Kassiopeia.svg)** for the `Kassiopeia` module
* **[bindings_KSC.svg](bindings_KSC.svg)** for the `KSC` module
* **[bindings_SSC.svg](bindings_SSC.svg)** for the `SSC` module
* **[bindings_KaFit.svg](bindings_KaFit.svg)** for the `KaFit` module

Source script
-------------

The files in this directory can be autgenerated with a Python script
[gen-bindings-docs.py](../../Scripts/gen-bindings-docs.py) which provides
options to generate XML, Markdown (`.md`), reStructuredText (`.rst`), and
GraphViz (`.dot`) files. The GraphViz files can be converted into image
files (`.svg`). Run the script with the `--help` option to see all options.

The shell script [gen-bindings-docs.sh](../../Scripts/gen-bindings-docs.sh)
carries out all these individual steps and updates the files listed here.

Bindings graph
--------------

This graph shows the available XML elements in Kasper and their relations:

<img src="bindings_full.svg" width="800" >
Binary file added Documentation/Bindings/bindings_KEMField.pdf
Binary file not shown.
Loading