Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #2

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9467167
Start updating particle list with pdg2018 (B.H.)
bhippoly Jun 6, 2018
0659eda
Start updating particle list with pdg2018 (B.H.)
bhippoly Jun 6, 2018
fb09575
Still updating particle list with pdg2018 (B.H.)
bhippoly Jun 9, 2018
fdc3b68
Still updating particle list with pdg2018 (B.H.)
bhippoly Jun 9, 2018
6ea40ef
Done with light flavour mesons (l.180) for pdg2018 (B.H.)
bhippoly Aug 9, 2018
f474c48
merged CMakeLists fix from master
bhippoly Aug 27, 2020
946ede7
addressing eventually comments sent by A.Maire
bhippoly Aug 27, 2020
035799c
yields of unstable hadrons in one step for ratios from V.Vovchenko (B…
bhippoly Sep 1, 2020
5ec99fd
Pushing latest updates for CMake 3.21 (B.H.)
bhippoly Jul 26, 2021
372b14c
rootlogon and basic scripts checked (B.H.)
bhippoly Jul 26, 2021
4220486
Start updating particle list with pdg2021 (B.H.)
bhippoly Sep 14, 2021
112e2e3
Updating particle list with pdg2021 and checks with root v6-24-06 (B.H.)
bhippoly Sep 14, 2021
b2d8312
Pushing updated decay files from N.Sharma (B.H.)
bhippoly Oct 5, 2022
d98b405
Compilation checked with root release v6-26-06 (B.H.)
bhippoly Oct 5, 2022
559e59a
Updated charm decays
natasha-alice Nov 8, 2022
a784b5d
Update THERMUSClassesLinkDef.h
natasha-alice Apr 11, 2023
f0e0e71
Create TThermalFitSQ.cxx
natasha-alice Apr 11, 2023
ea8894e
Create TThermalFitSQ.h
natasha-alice Apr 11, 2023
5331991
Delete TThermalFitSQ.cxx
natasha-alice Apr 11, 2023
42ea2b1
Delete TThermalFitSQ.h
natasha-alice Apr 11, 2023
ac29a95
Create TThermalFitSQ.h
natasha-alice Apr 11, 2023
a3eeeab
Create TThermalFitSQ.cxx
natasha-alice Apr 11, 2023
63ad609
Create TThermalModelSQ.cxx
natasha-alice Apr 11, 2023
dfc96c3
Create TThermalModelSQ.h
natasha-alice Apr 11, 2023
f4457ef
Create TThermalParticleSQ.cxx
natasha-alice Apr 11, 2023
95c1ef0
Create TThermalParticleSQ.h
natasha-alice Apr 11, 2023
a055c9c
Add files via upload
natasha-alice Apr 11, 2023
b7d9415
Create TTMParameterSetSQ.cxx
natasha-alice Apr 11, 2023
0e95405
Create TTMParameterSetSQ.h
natasha-alice Apr 11, 2023
acee8b6
Update TTMParticle.cxx
natasha-alice Apr 11, 2023
4e5f5fd
Update TTMParticle.h
natasha-alice Apr 11, 2023
1361bed
Add files via upload
natasha-alice Apr 11, 2023
342f5ca
Update TTMParticle.h
natasha-alice Apr 20, 2023
8b2b27a
Cmake producing now a single shared object library (B.H.)
Jul 24, 2023
803c7e2
Merge branch 'develop' of https://github.com/thermus-project/THERMUS …
Jul 24, 2023
1d301b2
Updating CmakeLists with last SQ files (B.H.)
Jul 24, 2023
d4f7557
Updating date and root (v6-28-04) tags (B.H.)
Jul 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.8 FATAL_ERROR)
project (Thermus)
# checked on 27/08/2020 with root-v6-22-02 (B.H.)
cmake_minimum_required (VERSION 3.21 FATAL_ERROR)
project (Thermus VERSION 4.0 DESCRIPTION "Thermus v4.0")
# checked on 24/07/2023 with root-v6-28-04 (B.H.)

# Find GSL
FIND_PACKAGE( GSL REQUIRED )
Expand Down Expand Up @@ -31,7 +31,11 @@ set(CMAKE_SHARED_LIBRARY_SUFFIX .so)
endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)

if(${CMAKE_SYSTEM} MATCHES Darwin)
set (CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -lm")
# building a dynamic library containing only one module: single_module
# specifying dynamic lookup for undefined symbols as private definitions:
#
set (CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -lm")
#set (CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup --verbose -lm")
endif(${CMAKE_SYSTEM} MATCHES Darwin)

message(STATUS "Customised the linking flags depending on the platform: ${CMAKE_SHARED_LINKER_FLAGS}")
Expand All @@ -51,5 +55,5 @@ message(STATUS "CMake platform: ${CMAKE_SYSTEM}")
message(STATUS "Build folder: ${Thermus_BINARY_DIR}")
message(STATUS "Shared Object Library folder: ${Thermus_BINARY_DIR}/lib")

add_subdirectory(functions)
#add_subdirectory(functions)
add_subdirectory(main)
3 changes: 2 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ Compiling THERMUS and running test programs

Configuration and compilation should be done using CMake: source cmakethermus.sh
(Please note that the provided makefiles are not recommended).

For using THERMUS, a ROOT version >= 6 compiled from source is necessary:
you can obtain the source via: git clone http://root.cern.ch/git/root.git root
please look at cmakeroot.sh as an example for properly building and installing root
Note that a rootlogon.C loading THERMUS Shared Object (.so) libraries is also provided.


A simple example script is available in the test directory
2 changes: 1 addition & 1 deletion cmakeroot.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash -e
# # checked 07/03/2018 with root-v6-12-06 (B.H.)
# checked on 24/07/2023 with root-v6-28-04 (B.H.)
export BASEDIR=$(pwd)
export ROOTDIR=$BASEDIR/root
cd $ROOTDIR
Expand Down
6 changes: 4 additions & 2 deletions cmakethermus.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash -e
# checked on 27/08/2020 with root-v6-22-02 (B.H.)
# checked on 24/07/2023 with root-v6-28-04 (B.H.)
echo $THERMUS
export BASEDIR=$(pwd)
#
Expand All @@ -11,7 +11,9 @@ cd $THERMUS
rm -rf build
mkdir build
cd build
cmake -Wdev -debug-output -DCMAKE_VERBOSE_MAKEFILE=ON ..
#cmake -Wdev -debug-output -DCMAKE_VERBOSE_MAKEFILE=ON ..
cmake -Wdev --debug-output -DCMAKE_VERBOSE_MAKEFILE=ON ..
#
cmake --build . -- -j10
cd $BASEDIR
#
Expand Down
7 changes: 0 additions & 7 deletions functions/CMakeLists.txt

This file was deleted.

3 changes: 2 additions & 1 deletion functions/Int_2_String.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
TString Int_2_String(Int_t x)
{
char name[20];
sprintf(name,"%010d",x);
// sprintf(name,"%010d",x);
snprintf(name,20,"%010d",x);
TString string(name);
return string;
}
219 changes: 0 additions & 219 deletions functions/makefile

This file was deleted.

Loading