Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d173203ff | |||
| 8b054b77b9 | |||
| 4e29ad6898 | |||
| 4ac7a7d01c | |||
| 227bfb7419 | |||
| 70eb0397df | |||
| 4de660788d | |||
| af3c8832fe | |||
| 123acec405 | |||
| eaa2ba8faf | |||
| 8b9ac6e5b1 | |||
| 2601e80c8a | |||
| 1b91d8b281 | |||
| db54db3394 |
@@ -1,6 +1,11 @@
|
|||||||
# - musrfit
|
# - musrfit
|
||||||
cmake_minimum_required(VERSION 3.17)
|
cmake_minimum_required(VERSION 3.17)
|
||||||
|
|
||||||
|
# cmake: use BoostConfig.cmake instead of FindBoost
|
||||||
|
if (CMAKE_VERSION GREATER_EQUAL "3.3")
|
||||||
|
cmake_policy(SET CMP0167 NEW)
|
||||||
|
endif ()
|
||||||
|
|
||||||
project(musrfit VERSION 1.9.10 LANGUAGES C CXX)
|
project(musrfit VERSION 1.9.10 LANGUAGES C CXX)
|
||||||
|
|
||||||
#--- musrfit specific options -------------------------------------------------
|
#--- musrfit specific options -------------------------------------------------
|
||||||
@@ -211,6 +216,7 @@ if (nexus)
|
|||||||
find_package(HDF5 COMPONENTS CXX REQUIRED)
|
find_package(HDF5 COMPONENTS CXX REQUIRED)
|
||||||
if (HAVE_HDF4)
|
if (HAVE_HDF4)
|
||||||
find_package(HDF4 REQUIRED)
|
find_package(HDF4 REQUIRED)
|
||||||
|
add_definitions(-DHAVE_HDF4)
|
||||||
endif (HAVE_HDF4)
|
endif (HAVE_HDF4)
|
||||||
find_package(NEXUS REQUIRED)
|
find_package(NEXUS REQUIRED)
|
||||||
add_definitions(-DPNEXUS_ENABLED)
|
add_definitions(-DPNEXUS_ENABLED)
|
||||||
@@ -234,13 +240,15 @@ endif ()
|
|||||||
|
|
||||||
#--- start create git-revision.h ----------------------------------------------
|
#--- start create git-revision.h ----------------------------------------------
|
||||||
if (IS_GIT_REPO)
|
if (IS_GIT_REPO)
|
||||||
execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/src/git_revision.sh)
|
add_custom_target(git_revision ALL
|
||||||
|
COMMAND sh ${CMAKE_SOURCE_DIR}/src/git_revision.sh ${CMAKE_BINARY_DIR}/src
|
||||||
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
COMMENT "Checking git revision"
|
||||||
|
)
|
||||||
|
|
||||||
set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
|
set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
|
||||||
set(GIT_REV_H "git-revision.h")
|
|
||||||
else (IS_GIT_REPO)
|
else (IS_GIT_REPO)
|
||||||
set(HAVE_GIT_REV_H "")
|
set(HAVE_GIT_REV_H "")
|
||||||
set(GIT_REV_H "")
|
|
||||||
endif (IS_GIT_REPO)
|
endif (IS_GIT_REPO)
|
||||||
|
|
||||||
#--- end create git-revision.h ------------------------------------------------
|
#--- end create git-revision.h ------------------------------------------------
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ PROJECT_NAME = musrfit
|
|||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
PROJECT_NUMBER = 1.9.9
|
PROJECT_NUMBER = 1.9.10
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||||
# for a project that appears at the top of each page and should give viewer a
|
# for a project that appears at the top of each page and should give viewer a
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ endif (nexus)
|
|||||||
set(MUSRFIT_LIBS ${MUSRFIT_LIBS} PMusr)
|
set(MUSRFIT_LIBS ${MUSRFIT_LIBS} PMusr)
|
||||||
|
|
||||||
#--- add all executables ------------------------------------------------------
|
#--- add all executables ------------------------------------------------------
|
||||||
add_executable(addRun ${GIT_REV_H} addRun.cpp)
|
add_executable(addRun addRun.cpp)
|
||||||
target_compile_options(addRun BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(addRun BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(addRun
|
target_include_directories(addRun
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -34,7 +34,7 @@ target_include_directories(addRun
|
|||||||
)
|
)
|
||||||
target_link_libraries(addRun ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${Boost_LIBRARIES})
|
target_link_libraries(addRun ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${Boost_LIBRARIES})
|
||||||
|
|
||||||
add_executable(any2many ${GIT_REV_H} any2many.cpp)
|
add_executable(any2many any2many.cpp)
|
||||||
target_compile_options(any2many BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(any2many BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(any2many
|
target_include_directories(any2many
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -45,7 +45,7 @@ target_include_directories(any2many
|
|||||||
)
|
)
|
||||||
target_link_libraries(any2many ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(any2many ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(dump_header ${GIT_REV_H} dump_header.cpp)
|
add_executable(dump_header dump_header.cpp)
|
||||||
target_compile_options(dump_header BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(dump_header BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(dump_header
|
target_include_directories(dump_header
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -62,7 +62,7 @@ target_include_directories(dump_header
|
|||||||
)
|
)
|
||||||
target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(msr2data ${GIT_REV_H} msr2data.cpp)
|
add_executable(msr2data msr2data.cpp)
|
||||||
target_compile_options(msr2data BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(msr2data BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(msr2data
|
target_include_directories(msr2data
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -76,7 +76,7 @@ target_link_libraries(msr2data ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
|||||||
add_executable(msr2msr msr2msr.cpp)
|
add_executable(msr2msr msr2msr.cpp)
|
||||||
target_link_libraries(msr2msr ${ROOT_LIBRARIES})
|
target_link_libraries(msr2msr ${ROOT_LIBRARIES})
|
||||||
|
|
||||||
add_executable(musrfit ${GIT_REV_H} musrfit.cpp)
|
add_executable(musrfit musrfit.cpp)
|
||||||
target_compile_options(musrfit BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(musrfit BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(musrfit
|
target_include_directories(musrfit
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -87,7 +87,7 @@ target_include_directories(musrfit
|
|||||||
)
|
)
|
||||||
target_link_libraries(musrfit ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(musrfit ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(musrFT ${GIT_REV_H} musrFT.cpp)
|
add_executable(musrFT musrFT.cpp)
|
||||||
target_compile_options(musrFT BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(musrFT BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(musrFT
|
target_include_directories(musrFT
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -99,7 +99,7 @@ target_include_directories(musrFT
|
|||||||
)
|
)
|
||||||
target_link_libraries(musrFT FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(musrFT FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(musrRootValidation ${GIT_REV_H} musrRootValidation.cpp)
|
add_executable(musrRootValidation musrRootValidation.cpp)
|
||||||
target_compile_options(musrRootValidation BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(musrRootValidation BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(musrRootValidation
|
target_include_directories(musrRootValidation
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -110,7 +110,7 @@ target_include_directories(musrRootValidation
|
|||||||
)
|
)
|
||||||
target_link_libraries(musrRootValidation ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
|
target_link_libraries(musrRootValidation ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
|
||||||
|
|
||||||
add_executable(musrt0 ${GIT_REV_H} musrt0.cpp)
|
add_executable(musrt0 musrt0.cpp)
|
||||||
target_compile_options(musrt0 BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(musrt0 BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(musrt0
|
target_include_directories(musrt0
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -121,7 +121,7 @@ target_include_directories(musrt0
|
|||||||
)
|
)
|
||||||
target_link_libraries(musrt0 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(musrt0 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(musrview ${GIT_REV_H} musrview.cpp)
|
add_executable(musrview musrview.cpp)
|
||||||
target_compile_options(musrview BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(musrview BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(musrview
|
target_include_directories(musrview
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -133,7 +133,7 @@ target_include_directories(musrview
|
|||||||
)
|
)
|
||||||
target_link_libraries(musrview FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
target_link_libraries(musrview FFTW3::FFTW3 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
|
||||||
|
|
||||||
add_executable(write_musrRoot_runHeader ${GIT_REV_H} write_musrRoot_runHeader.cpp)
|
add_executable(write_musrRoot_runHeader write_musrRoot_runHeader.cpp)
|
||||||
target_compile_options(write_musrRoot_runHeader BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
target_compile_options(write_musrRoot_runHeader BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_REV_H}")
|
||||||
target_include_directories(write_musrRoot_runHeader
|
target_include_directories(write_musrRoot_runHeader
|
||||||
BEFORE PRIVATE
|
BEFORE PRIVATE
|
||||||
@@ -145,6 +145,20 @@ target_include_directories(write_musrRoot_runHeader
|
|||||||
)
|
)
|
||||||
target_link_libraries(write_musrRoot_runHeader ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
|
target_link_libraries(write_musrRoot_runHeader ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
|
||||||
|
|
||||||
|
#--- ensure git-revision.h is regenerated before compiling --------------------
|
||||||
|
if (IS_GIT_REPO)
|
||||||
|
add_dependencies(addRun git_revision)
|
||||||
|
add_dependencies(any2many git_revision)
|
||||||
|
add_dependencies(dump_header git_revision)
|
||||||
|
add_dependencies(msr2data git_revision)
|
||||||
|
add_dependencies(musrfit git_revision)
|
||||||
|
add_dependencies(musrFT git_revision)
|
||||||
|
add_dependencies(musrRootValidation git_revision)
|
||||||
|
add_dependencies(musrt0 git_revision)
|
||||||
|
add_dependencies(musrview git_revision)
|
||||||
|
add_dependencies(write_musrRoot_runHeader git_revision)
|
||||||
|
endif (IS_GIT_REPO)
|
||||||
|
|
||||||
#--- installation info --------------------------------------------------------
|
#--- installation info --------------------------------------------------------
|
||||||
install(
|
install(
|
||||||
TARGETS
|
TARGETS
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Bastian M. Wojek / Andreas Suter *
|
* Copyright (C) 2009-2026 by Bastian M. Wojek / Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2018-2025 by Zaher Salman *
|
* Copyright (C) 2018-2026 by Zaher Salman *
|
||||||
* zaher.salman@psi.ch *
|
* zaher.salman@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
@@ -1946,7 +1946,12 @@ Bool_t PRunDataHandler::ReadRootFile()
|
|||||||
runData.SetBeamline(str);
|
runData.SetBeamline(str);
|
||||||
|
|
||||||
// read run summary to obtain ring anode HV values
|
// read run summary to obtain ring anode HV values
|
||||||
TObjArray *runSummary = dynamic_cast<TObjArray*>(folder->FindObjectAny("RunSummary"));
|
TObjArray *runSummary = nullptr;
|
||||||
|
if (fileType == PRH_MUSR_ROOT) // TFolder
|
||||||
|
runSummary = dynamic_cast<TObjArray*>(folder->FindObjectAny("RunSummary"));
|
||||||
|
else { // TDirectory
|
||||||
|
f.GetObject("RunHeader/RunSummary", runSummary);
|
||||||
|
}
|
||||||
|
|
||||||
// check if run summary is valid
|
// check if run summary is valid
|
||||||
if (!runSummary) {
|
if (!runSummary) {
|
||||||
@@ -2056,59 +2061,110 @@ Bool_t PRunDataHandler::ReadRootFile()
|
|||||||
|
|
||||||
// read data ---------------------------------------------------------
|
// read data ---------------------------------------------------------
|
||||||
|
|
||||||
// check if histos folder is found
|
if (fileType == PRH_MUSR_ROOT) { // TFolder
|
||||||
f.GetObject("histos", folder);
|
// check if histos folder is found
|
||||||
if (!folder) {
|
f.GetObject("histos", folder);
|
||||||
std::cerr << std::endl << ">> PRunDataHandler::ReadRootFile: **ERROR** Couldn't obtain histos from " << fRunPathName.Data() << std::endl;
|
if (!folder) {
|
||||||
f.Close();
|
std::cerr << std::endl << ">> PRunDataHandler::ReadRootFile: **ERROR** Couldn't obtain histos from " << fRunPathName.Data() << std::endl;
|
||||||
return false;
|
f.Close();
|
||||||
}
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// get all the data
|
// get all the data
|
||||||
for (UInt_t i=0; i<redGreenOffsets.size(); i++) {
|
for (UInt_t i=0; i<redGreenOffsets.size(); i++) {
|
||||||
for (Int_t j=0; j<noOfHistos; j++) {
|
for (Int_t j=0; j<noOfHistos; j++) {
|
||||||
str.Form("hDecay%03d", redGreenOffsets[i]+j+1);
|
str.Form("hDecay%03d", redGreenOffsets[i]+j+1);
|
||||||
TH1F *histo = dynamic_cast<TH1F*>(folder->FindObjectAny(str.Data()));
|
TH1F *histo = dynamic_cast<TH1F*>(folder->FindObjectAny(str.Data()));
|
||||||
if (!histo) {
|
if (!histo) {
|
||||||
std::cerr << std::endl << ">> PRunDataHandler::ReadRootFile: **ERROR** Couldn't get histo " << str;
|
std::cerr << std::endl << ">> PRunDataHandler::ReadRootFile: **ERROR** Couldn't get histo " << str;
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
f.Close();
|
f.Close();
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
dataSet.Clear();
|
||||||
|
dataSet.SetTitle(histo->GetTitle());
|
||||||
|
dataSet.SetHistoNo(redGreenOffsets[i]+j+1);
|
||||||
|
|
||||||
|
// get detector info
|
||||||
|
path.Form("DetectorInfo/Detector%03d/", redGreenOffsets[i]+j+1);
|
||||||
|
pathName = path + "Name";
|
||||||
|
header->Get(pathName, str, ok);
|
||||||
|
if (ok)
|
||||||
|
dataSet.SetName(str);
|
||||||
|
pathName = path + "Time Zero Bin";
|
||||||
|
header->Get(pathName, dval, ok);
|
||||||
|
if (ok)
|
||||||
|
dataSet.SetTimeZeroBin(dval);
|
||||||
|
pathName = path + "First Good Bin";
|
||||||
|
header->Get(pathName, ival, ok);
|
||||||
|
if (ok)
|
||||||
|
dataSet.SetFirstGoodBin(ival);
|
||||||
|
pathName = path + "Last Good Bin";
|
||||||
|
header->Get(pathName, ival, ok);
|
||||||
|
if (ok)
|
||||||
|
dataSet.SetLastGoodBin(ival);
|
||||||
|
dataSet.SetTimeZeroBinEstimated(histo->GetMaximumBin());
|
||||||
|
|
||||||
|
// fill data
|
||||||
|
for (Int_t j=1; j<=histo->GetNbinsX(); j++) {
|
||||||
|
histoData.push_back(histo->GetBinContent(j));
|
||||||
|
}
|
||||||
|
dataSet.SetData(histoData);
|
||||||
|
runData.SetDataSet(dataSet);
|
||||||
|
|
||||||
|
// clear histoData for the next histo
|
||||||
|
histoData.clear();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} else { // TDirectory
|
||||||
|
// get all the data
|
||||||
|
TH1F *histo;
|
||||||
|
for (UInt_t i=0; i<redGreenOffsets.size(); i++) {
|
||||||
|
for (Int_t j=0; j<noOfHistos; j++) {
|
||||||
|
str.Form("histos/DecayAnaModule/hDecay%03d", redGreenOffsets[i]+j+1);
|
||||||
|
f.GetObject(str, histo);
|
||||||
|
if (!histo) {
|
||||||
|
std::cerr << std::endl << ">> PRunDataHandler::ReadRootFile: **ERROR** Couldn't get histo " << str;
|
||||||
|
std::cerr << std::endl;
|
||||||
|
f.Close();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
dataSet.Clear();
|
dataSet.Clear();
|
||||||
dataSet.SetTitle(histo->GetTitle());
|
dataSet.SetTitle(histo->GetTitle());
|
||||||
dataSet.SetHistoNo(redGreenOffsets[i]+j+1);
|
dataSet.SetHistoNo(redGreenOffsets[i]+j+1);
|
||||||
|
|
||||||
// get detector info
|
// get detector info
|
||||||
path.Form("DetectorInfo/Detector%03d/", redGreenOffsets[i]+j+1);
|
path.Form("DetectorInfo/Detector%03d/", redGreenOffsets[i]+j+1);
|
||||||
pathName = path + "Name";
|
pathName = path + "Name";
|
||||||
header->Get(pathName, str, ok);
|
header->Get(pathName, str, ok);
|
||||||
if (ok)
|
if (ok)
|
||||||
dataSet.SetName(str);
|
dataSet.SetName(str);
|
||||||
pathName = path + "Time Zero Bin";
|
pathName = path + "Time Zero Bin";
|
||||||
header->Get(pathName, dval, ok);
|
header->Get(pathName, dval, ok);
|
||||||
if (ok)
|
if (ok)
|
||||||
dataSet.SetTimeZeroBin(dval);
|
dataSet.SetTimeZeroBin(dval);
|
||||||
pathName = path + "First Good Bin";
|
pathName = path + "First Good Bin";
|
||||||
header->Get(pathName, ival, ok);
|
header->Get(pathName, ival, ok);
|
||||||
if (ok)
|
if (ok)
|
||||||
dataSet.SetFirstGoodBin(ival);
|
dataSet.SetFirstGoodBin(ival);
|
||||||
pathName = path + "Last Good Bin";
|
pathName = path + "Last Good Bin";
|
||||||
header->Get(pathName, ival, ok);
|
header->Get(pathName, ival, ok);
|
||||||
if (ok)
|
if (ok)
|
||||||
dataSet.SetLastGoodBin(ival);
|
dataSet.SetLastGoodBin(ival);
|
||||||
dataSet.SetTimeZeroBinEstimated(histo->GetMaximumBin());
|
dataSet.SetTimeZeroBinEstimated(histo->GetMaximumBin());
|
||||||
|
|
||||||
// fill data
|
// fill data
|
||||||
for (Int_t j=1; j<=histo->GetNbinsX(); j++) {
|
for (Int_t j=1; j<=histo->GetNbinsX(); j++) {
|
||||||
histoData.push_back(histo->GetBinContent(j));
|
histoData.push_back(histo->GetBinContent(j));
|
||||||
|
}
|
||||||
|
dataSet.SetData(histoData);
|
||||||
|
runData.SetDataSet(dataSet);
|
||||||
|
|
||||||
|
// clear histoData for the next histo
|
||||||
|
histoData.clear();
|
||||||
}
|
}
|
||||||
dataSet.SetData(histoData);
|
|
||||||
runData.SetDataSet(dataSet);
|
|
||||||
|
|
||||||
// clear histoData for the next histo
|
|
||||||
histoData.clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
@@ -270,9 +270,14 @@ int dump_header_root(const std::string fileName, const bool summary, const bool
|
|||||||
}
|
}
|
||||||
|
|
||||||
// summary as well?
|
// summary as well?
|
||||||
if (summary && (fileType == DH_MUSR_ROOT)) {
|
if (summary && ((fileType == DH_MUSR_ROOT) || (fileType == DH_MUSR_ROOT_DIR))) {
|
||||||
TObjArray *runSum=nullptr;
|
TObjArray *runSum=nullptr;
|
||||||
runSum = static_cast<TObjArray*>(folder->FindObject("RunSummary"));
|
|
||||||
|
if (fileType == DH_MUSR_ROOT) // TFolder
|
||||||
|
runSum = static_cast<TObjArray*>(folder->FindObject("RunSummary"));
|
||||||
|
else // TDirectory
|
||||||
|
f.GetObject("RunHeader/RunSummary", runSum);
|
||||||
|
|
||||||
if (!runSum) { // something is wrong!!
|
if (!runSum) { // something is wrong!!
|
||||||
std::cerr << std::endl << "**ERROR** Couldn't obtain RunSummary " << fileName << std::endl;
|
std::cerr << std::endl << "**ERROR** Couldn't obtain RunSummary " << fileName << std::endl;
|
||||||
f.Close();
|
f.Close();
|
||||||
|
|||||||
2
src/external/BMWtools/BMWStartupHandler.cpp
vendored
2
src/external/BMWtools/BMWStartupHandler.cpp
vendored
@@ -11,7 +11,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter, Bastian M. Wojek *
|
* Copyright (C) 2007-2026 by Andreas Suter, Bastian M. Wojek *
|
||||||
* *
|
* *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/BMWtools/BMWStartupHandler.h
vendored
2
src/external/BMWtools/BMWStartupHandler.h
vendored
@@ -11,7 +11,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter, Bastian M. Wojek *
|
* Copyright (C) 2007-2026 by Andreas Suter, Bastian M. Wojek *
|
||||||
* *
|
* *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/LF_GL/PGKT_LF.cpp
vendored
2
src/external/LF_GL/PGKT_LF.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/LF_GL/PGKT_LF.h
vendored
2
src/external/LF_GL/PGKT_LF.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/LF_GL/PLGKT_LF.cpp
vendored
2
src/external/LF_GL/PLGKT_LF.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/LF_GL/PLGKT_LF.h
vendored
2
src/external/LF_GL/PLGKT_LF.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/MagProximity/PMagProximity.h
vendored
2
src/external/MagProximity/PMagProximity.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2011-2025 by Andreas Suter *
|
* Copyright (C) 2011-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/MusrRoot/TMusrRunHeader.cpp
vendored
2
src/external/MusrRoot/TMusrRunHeader.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/MusrRoot/TMusrRunHeader.h
vendored
2
src/external/MusrRoot/TMusrRunHeader.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/Nonlocal/PNL_PippardFitter.cpp
vendored
2
src/external/Nonlocal/PNL_PippardFitter.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/Nonlocal/PNL_PippardFitter.h
vendored
2
src/external/Nonlocal/PNL_PippardFitter.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/Nonlocal/PNL_StartupHandler.cpp
vendored
2
src/external/Nonlocal/PNL_StartupHandler.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/Nonlocal/PNL_StartupHandler.h
vendored
2
src/external/Nonlocal/PNL_StartupHandler.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
5
src/external/Nonlocal/prog/CMakeLists.txt
vendored
5
src/external/Nonlocal/prog/CMakeLists.txt
vendored
@@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
cmake_minimum_required(VERSION 3.15)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
|
|
||||||
|
# cmake: use BoostConfig.cmake instead of FindBoost
|
||||||
|
if (CMAKE_VERSION GREATER_EQUAL "3.3")
|
||||||
|
cmake_policy(SET CMP0167 NEW)
|
||||||
|
endif()
|
||||||
|
|
||||||
project(dump_nonlocal_field VERSION 1.0.0 LANGUAGES C CXX)
|
project(dump_nonlocal_field VERSION 1.0.0 LANGUAGES C CXX)
|
||||||
|
|
||||||
#--- check for git ------------------------------------------------------------
|
#--- check for git ------------------------------------------------------------
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Andreas Suter *
|
* Copyright (C) 2009-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2008-2025 by Bastian M. Wojek, Andreas Suter *
|
* Copyright (C) 2008-2026 by Bastian M. Wojek, Andreas Suter *
|
||||||
* *
|
* *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/libGbGLF/PGbGLF.cpp
vendored
2
src/external/libGbGLF/PGbGLF.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/libGbGLF/PGbGLF.h
vendored
2
src/external/libGbGLF/PGbGLF.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/libGbGLF/PGbGLFLinkDef.h
vendored
2
src/external/libGbGLF/PGbGLFLinkDef.h
vendored
@@ -7,7 +7,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2016-2025 by Andreas Suter *
|
* Copyright (C) 2016-2026 by Andreas Suter *
|
||||||
* *
|
* *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2013-2025 by Andreas Suter *
|
* Copyright (C) 2013-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/nexus/PNeXus.cpp
vendored
2
src/external/nexus/PNeXus.cpp
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
2
src/external/nexus/PNeXus.h
vendored
2
src/external/nexus/PNeXus.h
vendored
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -1,13 +1,18 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Usage: git_revision.sh <output_dir>
|
||||||
|
# Generates git-revision.h in the specified output directory.
|
||||||
|
|
||||||
|
OUTPUT_DIR="${1:-.}"
|
||||||
|
|
||||||
echo "-- Generating header for git hash"
|
echo "-- Generating header for git hash"
|
||||||
GIT_HEADER="src/git-revision.h"
|
GIT_HEADER="${OUTPUT_DIR}/git-revision.h"
|
||||||
[ -d src ] || mkdir src
|
[ -d "${OUTPUT_DIR}" ] || mkdir -p "${OUTPUT_DIR}"
|
||||||
|
|
||||||
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
|
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
|
||||||
|
|
||||||
GIT_VERSION=`git log -n 1 --pretty=format:"%ad - %h"`
|
GIT_VERSION=`git log -n 1 --pretty=format:"%ad - %h"`
|
||||||
if [ "$(grep -ics "$GIT_VERSION" $GIT_HEADER)" = 1 ]
|
if [ -f "$GIT_HEADER" ] && [ "$(grep -cs "$GIT_VERSION" "$GIT_HEADER")" = 1 ]
|
||||||
then
|
then
|
||||||
echo "-- No need to generate new $GIT_HEADER - git hash is unchanged"
|
echo "-- No need to generate new $GIT_HEADER - git hash is unchanged"
|
||||||
exit 0;
|
exit 0;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2009-2025 by Bastian M. Wojek / Andreas Suter *
|
* Copyright (C) 2009-2026 by Bastian M. Wojek / Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Copyright (C) 2007-2025 by Andreas Suter *
|
* Copyright (C) 2007-2026 by Andreas Suter *
|
||||||
* andreas.suter@psi.ch *
|
* andreas.suter@psi.ch *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user