From 84eb7c8ec3940d94e716027024b770a182fddc79 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 5 Jan 2023 11:05:54 +0100 Subject: [PATCH 1/3] updated the copyright info. --- doc/examples/UserFcn/PUserFcn.cpp | 2 +- src/external/libFitPofB/classes/TPofTCalc.cpp | 2 +- src/musredit_qt5/mupp/PmuppAdmin.cpp | 2 +- src/musredit_qt5/musrWiz/PAdmin.cpp | 2 +- src/musredit_qt6/mupp/PmuppAdmin.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/examples/UserFcn/PUserFcn.cpp b/doc/examples/UserFcn/PUserFcn.cpp index ed9a7894..b32b28cc 100644 --- a/doc/examples/UserFcn/PUserFcn.cpp +++ b/doc/examples/UserFcn/PUserFcn.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2007-2021 by Andreas Suter * + * Copyright (C) 2007-2023 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/external/libFitPofB/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp index 12a1eb05..12684e84 100644 --- a/src/external/libFitPofB/classes/TPofTCalc.cpp +++ b/src/external/libFitPofB/classes/TPofTCalc.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ /*************************************************************************** - * Copyright (C) 2008-2014 by Bastian M. Wojek, Andreas Suter * + * Copyright (C) 2008-2023 by Bastian M. Wojek, Andreas Suter * * * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/mupp/PmuppAdmin.cpp b/src/musredit_qt5/mupp/PmuppAdmin.cpp index f9a44a4f..a41e5194 100644 --- a/src/musredit_qt5/mupp/PmuppAdmin.cpp +++ b/src/musredit_qt5/mupp/PmuppAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2017 by Andreas Suter * + * Copyright (C) 2010-2023 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musrWiz/PAdmin.cpp b/src/musredit_qt5/musrWiz/PAdmin.cpp index af7001f4..f145db6c 100644 --- a/src/musredit_qt5/musrWiz/PAdmin.cpp +++ b/src/musredit_qt5/musrWiz/PAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2023 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt6/mupp/PmuppAdmin.cpp b/src/musredit_qt6/mupp/PmuppAdmin.cpp index 76dcbdfb..896dc27b 100644 --- a/src/musredit_qt6/mupp/PmuppAdmin.cpp +++ b/src/musredit_qt6/mupp/PmuppAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2017 by Andreas Suter * + * Copyright (C) 2010-2023 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * From 2db15b25511b89df0b64bbffc2929ab148b57bb8 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Mon, 9 Jan 2023 10:46:55 +0100 Subject: [PATCH 2/3] add OS tag for packages. --- cmake/CPackOptions.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CPackOptions.cmake.in b/cmake/CPackOptions.cmake.in index 4858f338..6d4fd97f 100644 --- a/cmake/CPackOptions.cmake.in +++ b/cmake/CPackOptions.cmake.in @@ -30,7 +30,7 @@ if (${CPACK_GENERATOR} STREQUAL "RPM") set (CPACK_RPM_FILE_NAME "RPM-DEFAULT") set (CPACK_RPM_PACKAGE_RELEASE "1") # next variable for RHEL, CentOS, Fedora - set (CPACK_RPM_PACKAGE_RELEASE_DIST "") + set (CPACK_RPM_PACKAGE_RELEASE_DIST "el8") set (CPACK_RPM_PACKAGE_LICENSE "GPLv2") set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM") set (CPACK_RPM_CHANGELOG_FILE "@PROJECT_SOURCE_DIR@/cmake/ChangeLogRPM") From 26d4fbda11aa6d0d116e0474735d90a7f7154013 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 10 Jan 2023 15:33:44 +0100 Subject: [PATCH 3/3] fix of an old copy/paste error! --- src/classes/PMsrHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index 4869cda4..2aad5f05 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -6171,7 +6171,7 @@ Bool_t PMsrHandler::CheckMaps() if (FilterNumber(str, "map", MSR_PARAM_MAP_OFFSET, no)) { mapVec.push_back(no); mapBlock.push_back(1); // 1 = theory-block - mapLineNo.push_back(fTheory[i].fLineNo); + mapLineNo.push_back(fFunctions[i].fLineNo); } } }