Merge branch 'master' into fix_Thigh_start_true_vacuum

Build.py

@@ -20,16 +20,21 @@ def get_preset():
     return preset
 
 def build(preset):
-    cmd=f"cmake --preset {preset}".split()
+    cmd=f"cmake --preset {preset} --fresh".split()
     subprocess.check_call(cmd)
 
     cmd=f"cmake --build --preset {preset}".split()
     subprocess.check_call(cmd)
 
 
 def main():
+    opts = Setup.parse_arguments()
     Setup.setup_profiles()
-    Setup.conan_install_all(Setup.BuildMode.release,build_missing=True)
+    Setup.conan_install_all(Setup.BuildMode.release,
+                            opts.options if opts.options is not None else [],
+                            build_missing=True,
+                            custom_profile=opts.profile
+                            )
     build(get_preset())
 
 if __name__ == "__main__":

CMakeLists.txt

@@ -6,7 +6,7 @@
 cmake_minimum_required(VERSION 3.23)
 project(
   BSMPT
-  VERSION 3.0.9
+  VERSION 3.0.7
   LANGUAGES C CXX
   DESCRIPTION
     "BSMPT - Beyond the Standard Model Phase Transitions : A C++ package for the computation of the EWPT in BSM models"

README.md

@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas M
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
-Program: BSMPT version 3.0.9
+Program: BSMPT version 3.0.7
 
 Released by: Philipp Basler, Lisa Biermann, Margarete Mühlleitner, Jonas Müller, Rui Santos and João Viana
 

Setup.py

@@ -187,8 +187,7 @@ def __str__(self):
         return self.name
 
 
-if __name__ == "__main__":
-
+def parse_arguments():
     parser = ArgumentParser()
     parser.add_argument(
         "--mode",
@@ -202,6 +201,7 @@ def __str__(self):
         "--options",
         "-o",
         nargs="+",
+        action="extend",
         help="Options to pass through to conan. For the available options please look into the conanfile.",
     )
     parser.add_argument(
@@ -216,7 +216,12 @@ def __str__(self):
         default="",
     )
 
-    opts = parser.parse_args()
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+
+    opts = parse_arguments()
     setup_profiles()
     conan_install_all(
         opts.mode,

include/BSMPT/utility/const_velocity_spline.h

@@ -189,12 +189,12 @@ class cvspline
    * @param l
    * @return std::vector<double>
    */
-  std::vector<double> operator()(double l);
+  std::vector<double> operator()(double l) const;
   /**
    * @brief print the current knots of the spline
    *
    */
-  void print_path();
+  void print_path() const;
   /**
    * @brief save the knots of the splien into a file
    *

src/bounce_solution/bounce_solution.cpp

@@ -756,7 +756,7 @@ double BounceSolution::CalcTempAtFalseVacFraction(const double &false_vac_frac)
 
     while ((std::abs(T_up / T_down - 1) >
             RelativeTemperatureInCalcTempAtFalseVacFraction *
-                MarginOfCalcTempAtFalseVacFractionBeforeFailure) or
+                MarginOfCalcTempAtFalseVacFractionBeforeFailure) and
            (not almost_the_same(
                int_at_false_vac_frac,
                IatT,

src/utility/const_velocity_spline.cpp

@@ -266,7 +266,7 @@ std::vector<double> cvspline::d2l(double l)
 
   return rr;
 }
-std::vector<double> cvspline::operator()(double l)
+std::vector<double> cvspline::operator()(double l) const
 {
   // Calculates the VEV at the position l in spline length,
   l = l_to_x(l); // Convert from spline length to linear length.
@@ -278,7 +278,7 @@ std::vector<double> cvspline::operator()(double l)
   return r;
 }
 
-void cvspline::print_path()
+void cvspline::print_path() const
 {
   int wid = 15;
 

standalone/TunnelingPath.cpp

@@ -77,10 +77,10 @@ int main()
     bounce.CalculatePercolationTemp();
     if (bounce.GetPercolationTemp() == -1) continue;
     double errorTtoTp = 1e100;
-    BounceActionInt *ClosestBounceActionInt;
+    BounceActionInt const *ClosestBounceActionInt;
     std::cout << "Found a transitions with Tp =\t"
               << bounce.GetPercolationTemp() << " GeV.\n";
-    for (auto BAInt : bounce.SolutionList)
+    for (const auto &BAInt : bounce.SolutionList)
     {
       if (abs(BAInt.T - bounce.GetPercolationTemp()) < errorTtoTp)
       {