Merge pull request #38 from phbasler/develop

Develop

.github/workflows/dev-ci.yml

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 name: develop CI
 
 on:

.github/workflows/dev-mac-ci.yml

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+name: develop Mac CI
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build-mac:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+          persist-credentials: false
+    - name: installPackages
+      run: brew install eigen && brew install gsl && brew install nlopt && brew install boost && brew install libomp
+    - name: cmake
+      run: mkdir build && cd build && cmake ..
+    - name: make
+      run: cd build && cmake --build . -j

.github/workflows/doc.yml

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 name: Doxygen Deploy
 
 on:
@@ -16,7 +20,7 @@ jobs:
      - name: installPackages
        run: sudo apt-get install --no-install-recommends --yes libgsl-dev libeigen3-dev libnlopt-cxx-dev libboost-all-dev doxygen
      - name: cmake
-       run: mkdir build && cd build && cmake -DUseLibCMAES=OFF .. && make doc
+       run: mkdir build && cd build && cmake -DUseLibCMAES=OFF .. && cmake --build . -j -t doc
      - name: Deploy
        uses: JamesIves/github-pages-deploy-action@releases/v3
        with:

.github/workflows/master-ci.yml

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 name: master CI
 
 on:

.github/workflows/master-mac-ci.yml

@@ -0,0 +1,30 @@
+
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+name: master mac CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    if: "!contains(github.event.head_commit.message, 'skip-ci')"
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+          persist-credentials: false
+    - name : installPackages
+      run : brew install eigen && brew install gsl && brew install nlopt && brew install boost && brew install libomp
+    - name: cmake
+      run: mkdir build && cd build && cmake .. 
+    - name: make
+      run: cd build && cmake --build . -j
+    - name: Test
+      run: cd build && ctest

.gitignore

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 build
 
 .vscode

CMakeLists.txt

@@ -1,7 +1,11 @@
+# SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 cmake_minimum_required(VERSION 3.13)
 project(
   BSMPT
-  VERSION 2.1.0
+  VERSION 2.2.0
   LANGUAGES C CXX)
 
 # -------------------------------- setup cmake --------------------------------
@@ -87,12 +91,6 @@ set(ExportList
   Utility
   )
 
-if(EXPORT_CMAES)
-  set(ExportList
-    ${ExportList}
-    cmaes
-    )
-endif(EXPORT_CMAES)
 
 if(Boost_FOUND)
 set(ExportList
@@ -103,12 +101,24 @@ set(ExportList
   )
 endif(Boost_FOUND)
 
+
 export(
   TARGETS ${ExportList}
   NAMESPACE BSMPT::
   FILE BSMPTTargets.cmake
   )
 
+if(EXPORT_CMAES)
+  export(
+  TARGETS cmaes
+  NAMESPACE libcmaes::
+  APPEND FILE BSMPTTargets.cmake
+  )
+endif(EXPORT_CMAES)
+
+
+
+
 configure_file(tools/cmake/BSMPTConfig.cmake.in BSMPTConfig.cmake @ONLY)
 
 if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)

Changelog.md

@@ -1,5 +1,26 @@
+<!--
+SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+
+SPDX-License-Identifier: GPL-3.0-or-later
+-->
+
 # Changelog
 
+# 2021/05/06: Release of v2.2 
+- Unit tests are provided for the models 'ch2dm', 'n2hdm' and 'r2hdm'
+- Fixed the renormalisation scheme for the C2HDM 
+- Added the option to turn off the multithreading in the minimization
+- Removed the following binaries: 'RenormScale' and 'EWBGRenormScale'
+
+# 2020/01/03: Release of v2.1
+- Changed to multithreading in the minimizer
+- Included a fix for deprecating cubic splines starting in boost 1.72
+- Fixed an out-of-bounds error which caused a crash on mac
+- Provided some first unit tests with the ctest environment
+- Updated the cmaes inclusion to their new cmake setup
+- Updated the NLopt inclusion to use their delivered FindCmake instead of our own
+
+
 # 2020/07/06: Release of v2.0
 
 ## New Physics

Contributing.md

@@ -1,3 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
+
+SPDX-License-Identifier: GPL-3.0-or-later
+-->
+
 To contribute to BSMPT follow the given procedure
 
  - Fork the BSMPT Repository

README.md

@@ -1,5 +1,10 @@
+<!--
+SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller
 
-Program: BSMPT version 2.1
+SPDX-License-Identifier: GPL-3.0-or-later
+-->
+
+Program: BSMPT version 2.2
 
 Released by: Philipp Basler and Margarete Mühlleitner and Jonas Müller
 
@@ -64,8 +69,8 @@ With the dependencies and options you can build the programm with
 
         mkdir build && cd build  
         cmake (OPTIONS from Dependencies) ..  
-        make -j  
-        make doc
+        cmake --build . -j  
+        cmake --build . -j -t doc
 
 
 The make doc will use doxygen to create the online help in build/html which can be opened locally.

example/C2HDM_Input.dat_BSMPT

@@ -1,2 +1,2 @@
-Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DT1	DT2	DT3	T_c	omega_c	omega_CB(T_c)	omega_1(T_c)	omega_2(T_c)	omega_CP(T_c)	omega_c/T_c
-1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	14.0769	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000288099	4.36557e-11	0.0021088	2.61168e-11	145.441	201.073	-2.76886e-06	-49.9873	-194.756	1.32253	1.38251
+Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DTCharged	DT1	DT2	DT3	Dim_L6	T_c	omega_c	omega_c/T_c	omega_CB(T_c)	omega_1(T_c)	omega_2(T_c)	omega_CP(T_c)
+1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	15.5189	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000750499	-0	1.74623e-10	-3.49246e-10	-2.12594e-11	-0.00107389	145.569	200.796	1.37939	-7.15314e-06	49.9295	194.485	-1.33913

example/C2HDM_Input.dat_CalcCT

@@ -1,2 +1,2 @@
-Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DT1	DT2	DT3
-1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	14.0769	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000288099	4.36557e-11	0.0021088	2.61168e-11
+Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DTCharged	DT1	DT2	DT3	Dim_L6
+1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	15.5189	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000750499	-0	1.74623e-10	-3.49246e-10	-2.12594e-11	-0.00107389

example/C2HDM_Input.dat_CalculateEWBG

@@ -0,0 +1,2 @@
+Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq_EWBG	Dm22sq_EWBG	Dim_m12sq_EWBG	Dre_m12sq_EWBG	DL1_EWBG	DL2_EWBG	DL3_EWBG	DL4_EWBG	Dre_L5_EWBG	Dim_L5_EWBG	DTCharged_EWBG	DT1_EWBG	DT2_EWBG	DT3_EWBG	Dim_L6_EWBG	T_c_EWBG	omega_c_EWBG	omega_c/T_c_EWBG	omega_CB(T_c)_EWBG	omega_1(T_c)_EWBG	omega_2(T_c)_EWBG	omega_CP(T_c)_EWBG	vw	L_W	top_sym_phase	top_brk_phase	bot_sym_phase	bot_brk_phase	tau_sym_phase	tau_brk_phase	eta_TopOnly	eta_TopBot	eta_TopBotTau	eta_PlasmaVelocities	eta_PlasmaVelocitiesReplaced
+1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	15.5189	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000750499	-0	1.74623e-10	-3.49246e-10	-2.12594e-11	-0.00107389	145.569	200.796	1.37939	-7.24069e-06	49.9295	194.485	-1.33913	0.1	0.0337941	0.0603537	0.00688542	-0.0603537	-0.00688542	-0.0603537	-0.00688542	-3.3343e-11	-3.34462e-11	-3.34458e-11	-4.54862e-13	-3.37482e-13

example/C2HDM_Input.dat_NLOVEV

@@ -1,2 +1,2 @@
-Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DT1	DT2	DT3	omega_CB	omega_1	omega_2	omega_CP	v_NLO
-1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	14.0769	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000288099	4.36557e-11	0.0021088	2.61168e-11	3.38612e-05	-51.8216	-240.704	-3.96283e-05	246.22
+Type	L1	L2	L3	L4	re_L5	im_L5	re_m12sq	p_tbeta	R_Hsm_1	R_Hsm_2	R_Hsm_3	R_Hl_1	R_Hl_2	R_Hl_3	R_Hh_1	R_Hh_2	R_Hh_3	p_mHsm	p_mHl	p_mHh	p_mHc	Dm11sq	Dm22sq	Dim_m12sq	Dre_m12sq	DL1	DL2	DL3	DL4	Dre_L5	Dim_L5	DTCharged	DT1	DT2	DT3	Dim_L6	omega_CB	omega_1	omega_2	omega_CP	v_NLO
+1	3.29771	0.274365	4.71019	-2.23056	-2.43487	0.124948	2706.86	4.64487	0.3563119057476795	0.9342588170315906	0.014222820437221563	-0.9339922148778901	0.3565588275701817	-0.022898581381184138	-0.02646447373272364	-0.005124966391123035	0.9996366171512224	125.09	148.857	401.086	393.16	13650.3	5790.99	15.5189	324.25	-0.816493	-0.231792	-0.31592	0	0.00597785	0.000750499	-0	1.74623e-10	-3.49246e-10	-2.12594e-11	-0.00107389	-1.9257e-06	51.8216	240.704	2.30233e-06	246.22