LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2023-01-10 16:39:45 +01:00
commit 401ff9ead6
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/CPackOptions.cmake.in
View File

@ -30,7 +30,7 @@ if (${CPACK_GENERATOR} STREQUAL "RPM")
set (CPACK_RPM_FILE_NAME "RPM-DEFAULT") set (CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set (CPACK_RPM_PACKAGE_RELEASE "1") set (CPACK_RPM_PACKAGE_RELEASE "1")
# next variable for RHEL, CentOS, Fedora # 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_LICENSE "GPLv2")
set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM") set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM")
set (CPACK_RPM_CHANGELOG_FILE "@PROJECT_SOURCE_DIR@/cmake/ChangeLogRPM") set (CPACK_RPM_CHANGELOG_FILE "@PROJECT_SOURCE_DIR@/cmake/ChangeLogRPM")

2
doc/examples/UserFcn/PUserFcn.cpp
View File

@ -8,7 +8,7 @@
***************************************************************************/ ***************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2007-2021 by Andreas Suter * * Copyright (C) 2007-2023 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/classes/PMsrHandler.cpp
View File

@ -6171,7 +6171,7 @@ Bool_t PMsrHandler::CheckMaps()
if (FilterNumber(str, "map", MSR_PARAM_MAP_OFFSET, no)) { if (FilterNumber(str, "map", MSR_PARAM_MAP_OFFSET, no)) {
mapVec.push_back(no); mapVec.push_back(no);
mapBlock.push_back(1); // 1 = theory-block mapBlock.push_back(1); // 1 = theory-block
mapLineNo.push_back(fTheory[i].fLineNo); mapLineNo.push_back(fFunctions[i].fLineNo);
} }
} }
} }

2
src/external/libFitPofB/classes/TPofTCalc.cpp vendored
View File

@ -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 * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/mupp/PmuppAdmin.cpp
View File

@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2017 by Andreas Suter * * Copyright (C) 2010-2023 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/musredit_qt5/musrWiz/PAdmin.cpp
View File

@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2016 by Andreas Suter * * Copyright (C) 2010-2023 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/musredit_qt6/mupp/PmuppAdmin.cpp
View File

@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2017 by Andreas Suter * * Copyright (C) 2010-2023 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 *