Skip to content

Commit

Permalink
fixed a bug that prevented 2HDECAY to compile when the program's path…
Browse files Browse the repository at this point in the history 
… contained whitespaces (relevant for all operating systems)
  • Loading branch information
Marcel Krause committed Oct 29, 2018
1 parent c5cc3c6 commit 34186d3
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 17 deletions.
13 changes: 7 additions & 6 deletions 2HDECAY.py
View file
Expand Up @@ -11,9 +11,9 @@
# Authors: Marcel Krause (marcel.krause@kit.edu) #
# Prof. Dr. M. Margarete Muehlleitner (margarete.muehlleitner@kit.edu) #
# Dr. Michael Spira (michael.spira@psi.ch) #
# Version: 1.0.0 #
# Date: 01.10.2018 #
# Copyright: Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner #
# Version: 1.0.1 #
# Date: 29.10.2018 #
# Copyright: Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira #
# License: GNU General Public License (GNU GPL-3.0-or-later) #
# #
# 2HDECAY is released under GNU General Public License (GNU GPL-3.0-or-later). #
Expand All @@ -28,7 +28,8 @@
# You have received a copy LICENSE.md of the GNU General Public License along with this program #
# in the 2HDECAY root directoy. #
# #
# Citation: When you use this program, please acknowledge our work by citing the following papers: #
# Citation: When you use this program, please acknowledge the work of our and other groups by citing the #
# following papers: #
# The manual for 2HDECAY: #
# - M. Krause, M. Muhlleitner, M. Spira, arXiv:1810.00768 #
# The manuals for HDECAY: #
Expand Down Expand Up @@ -75,7 +76,7 @@
print('''
+---------------------------------------+
| |
| 2HDECAY 1.0.0 |
| 2HDECAY 1.0.1 |
| |
| / |
| / |
Expand Down Expand Up @@ -113,7 +114,7 @@
You have received a copy LICENSE.md of the GNU General Public License along with this program in the 2HDECAY
root directoy.
Copyright 2018, Marcel Krause and Milada Margarete Muehlleitner.
Copyright 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira.
''')

# Get a list of all input files
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
View file
@@ -0,0 +1,4 @@
## [1.0.1] - 2018-10-29
### Changed
- Fixed a bug that would prevent the compilation of 2HDECAY when the path to 2HDECAY would contain whitespace characters (on all operating systems).
- Updated some copyright information.
2 changes: 1 addition & 1 deletion CommonFunctions.py
View file
Expand Up @@ -7,7 +7,7 @@
# CommonFunctions #
# #
# Purpose: Function library for 2HDMCalc. Contains often used functions. #
# Copyright: Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner #
# Copyright: Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira #
# License: GNU General Public License (GNU GPL-3.0-or-later) #
# #
# 2HDECAY is released under GNU General Public License (GNU GPL-3.0-or-later). #
Expand Down
2 changes: 1 addition & 1 deletion Config.py
View file
Expand Up @@ -8,7 +8,7 @@
# #
# Purpose: Main configuration file of 2HDECAY. Contains all configuration #
# settings needed to change the program. #
# Copyright: Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner #
# Copyright: Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira #
# License: GNU General Public License (GNU GPL-3.0-or-later) #
# #
# 2HDECAY is released under GNU General Public License (GNU GPL-3.0-or-later). #
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Expand Up @@ -4,13 +4,13 @@ A program for the Calculation of Electroweak One-Loop Corrections to Higgs Decay

## Program information

**Program** 2HDECAY 1.0.0
**Program** 2HDECAY 1.0.1

**Authors** [Marcel Krause](mailto:marcel.krause@kit.edu), [M. Margarete Mühlleitner](mailto:margarete.muehlleitner@kit.edu) and [Michael Spira](mailto:michael.spira@psi.ch)

**Manual** https://arxiv.org/abs/1810.00768

**Citations** When you use this program, please acknowledge our work by citing the following papers:
**Citations** When you use this program, please acknowledge the work of our and other groups by citing the following papers:
- The manual for 2HDECAY:
- M. Krause, M. Muhlleitner, M. Spira, arXiv:1810.00768
- The manuals for HDECAY:
Expand All @@ -26,7 +26,7 @@ A program for the Calculation of Electroweak One-Loop Corrections to Higgs Decay

**Changelog** For a documentation about the changes made in 2HDECAY, check the [Changelog.md](Changelog.md) file.

**Copyright** Copyright (C) 2018, Marcel Krause and Milada Margarete Mühlleitner
**Copyright** Copyright (C) 2018, Marcel Krause, Milada Margarete Mühlleitner and Michael Spira

**License** GNU General Public License (GNU GPL-3.0-or-later). 2HDECAY is released under GNU General Public License (GNU GPL-3.0-or-later). This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You have received a copy ([LICENSE.md](LICENSE.md)) of the GNU General Public License along with this program.

Expand Down
2 changes: 1 addition & 1 deletion constants.F90
View file
Expand Up @@ -2,7 +2,7 @@ module constants
implicit none
save

! Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner
! Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira

! License: GNU General Public License (GNU GPL-3.0-or-later)

Expand Down
2 changes: 1 addition & 1 deletion counterterms.F90
View file
Expand Up @@ -2,7 +2,7 @@ module counterterms
implicit none
save

! Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner
! Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira

! License: GNU General Public License (GNU GPL-3.0-or-later)

Expand Down
2 changes: 1 addition & 1 deletion getParameters.F90
View file
Expand Up @@ -15,7 +15,7 @@ subroutine getParameters(OStype)
integer m
double precision M11SqPot, M22SqPot, M12SqPot, tmpMass

! Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner
! Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira

! License: GNU General Public License (GNU GPL-3.0-or-later)

Expand Down
10 changes: 7 additions & 3 deletions setup.py
View file
Expand Up @@ -11,7 +11,7 @@
# Sets up 2HDECAY #
# Creates the makefile and electroweakCorrections.F90 #
# Makes 2HDECAY #
# Copyright: Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner #
# Copyright: Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira #
# License: GNU General Public License (GNU GPL-3.0-or-later) #
# #
# 2HDECAY is released under GNU General Public License (GNU GPL-3.0-or-later). #
Expand Down Expand Up @@ -55,6 +55,10 @@ def createMakefile(pathToMakefile, relativePathToLoopTools, relativePathToLoopTo
pathToProcesses = 'BuildingBlocks' + os.sep + 'Processes'
processDirList = os.listdir(pathToProcesses)

# Get 2HDECAY's working directory and escape all whitespaces
prompt = ['pwd']
workingDirectory = subprocess.check_output(prompt, stdin=None, stderr=None, shell=False).decode('utf-8').replace(' ', '\ ')

# Check whether the OS is Windows or not for giving the decayWidth application the correct file ending
applicationEnding = ''
if os.name == 'nt':
Expand All @@ -67,7 +71,7 @@ def createMakefile(pathToMakefile, relativePathToLoopTools, relativePathToLoopTo
makefile.write("###################################\n\n")
makefile.write("# Specify the path to the LoopTools library:\n")
if useRelativePath:
makefile.write("PWD=$(strip $(shell pwd))\n")
makefile.write("PWD=" + workingDirectory + "\n")
makefile.write("LT=$(PWD)/" + relativePathToLoopTools + "\n")
else:
makefile.write("LT=" + relativePathToLoopTools + "\n")
Expand Down Expand Up @@ -330,7 +334,7 @@ def createElectroweakCorrections():
electroweakCorrectionsFile.write("\tdouble precision inScaleDebug\n")
electroweakCorrectionsFile.write("\tinteger m, n, o, p, q, r, fileNameLength, point, statWrite\n\n")

electroweakCorrectionsFile.write("\t! Copyright (C) 2018, Marcel Krause and Milada Margarete Muehlleitner\n\n")
electroweakCorrectionsFile.write("\t! Copyright (C) 2018, Marcel Krause, Milada Margarete Muehlleitner and Michael Spira\n\n")

electroweakCorrectionsFile.write("\t! License: GNU General Public License (GNU GPL-3.0-or-later)\n\n")

Expand Down

0 comments on commit 34186d3

Please sign in to comment.