From 9a3761ff09a18335d224d0e9962630e798e6f1f1 Mon Sep 17 00:00:00 2001 From: Volodymyr Vovchenko Date: Sat, 13 Jul 2019 21:54:20 +0200 Subject: [PATCH 1/2] Proxy electric charge susceptibility back to electric charge from net-pion, needed to preserve correct cpc4 result --- src/library/HRGBase/ThermalModelBase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/library/HRGBase/ThermalModelBase.cpp b/src/library/HRGBase/ThermalModelBase.cpp index 5ddee0d..6160552 100644 --- a/src/library/HRGBase/ThermalModelBase.cpp +++ b/src/library/HRGBase/ThermalModelBase.cpp @@ -946,8 +946,8 @@ namespace thermalfist { int c1 = 0; //if (i == 0) c1 = m_TPS->Particles()[k].BaryonCharge(); if (i == 0) c1 = 1 * (m_TPS->Particles()[k].PdgId() == 2212) - 1 * (m_TPS->Particles()[k].PdgId() == -2212); - //if (i == 1) c1 = m_TPS->Particles()[k].ElectricCharge(); - if (i == 1) c1 = 1 * (m_TPS->Particles()[k].PdgId() == 211) - 1 * (m_TPS->Particles()[k].PdgId() == -211); + if (i == 1) c1 = m_TPS->Particles()[k].ElectricCharge(); + //if (i == 1) c1 = 1 * (m_TPS->Particles()[k].PdgId() == 211) - 1 * (m_TPS->Particles()[k].PdgId() == -211); if (i == 2) c1 = 1 * (m_TPS->Particles()[k].PdgId() == 321) - 1 * (m_TPS->Particles()[k].PdgId() == -321); if (i == 3) c1 = m_TPS->Particles()[k].Charm(); for (size_t kp = 0; kp < m_TotalCorrel.size(); ++kp) { @@ -955,8 +955,8 @@ namespace thermalfist { int c2 = 0; //if (j == 0) c2 = m_TPS->Particles()[kp].BaryonCharge(); if (j == 0) c2 = 1 * (m_TPS->Particles()[kp].PdgId() == 2212) - 1 * (m_TPS->Particles()[kp].PdgId() == -2212); - //if (j == 1) c2 = m_TPS->Particles()[kp].ElectricCharge(); - if (j == 1) c2 = 1 * (m_TPS->Particles()[kp].PdgId() == 211) - 1 * (m_TPS->Particles()[kp].PdgId() == -211); + if (j == 1) c2 = m_TPS->Particles()[kp].ElectricCharge(); + //if (j == 1) c2 = 1 * (m_TPS->Particles()[kp].PdgId() == 211) - 1 * (m_TPS->Particles()[kp].PdgId() == -211); if (j == 2) c2 = 1 * (m_TPS->Particles()[kp].PdgId() == 321) - 1 * (m_TPS->Particles()[kp].PdgId() == -321); if (j == 3) c2 = m_TPS->Particles()[kp].Charm(); m_ProxySusc[i][j] += c1 * c2 * m_TotalCorrel[k][kp]; From 9caec622516ab0332d0a52290f6c38692b9cdd17 Mon Sep 17 00:00:00 2001 From: Volodymyr Vovchenko Date: Thu, 18 Jul 2019 22:49:30 +0200 Subject: [PATCH 2/2] Fixed for shared library mode --- src/library/CMakeLists.txt | 6 +++--- thirdparty/Minuit2/CMakeLists.txt | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt index a1f82df..e1cc1c0 100644 --- a/src/library/CMakeLists.txt +++ b/src/library/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") - +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # Properties->C/C++->General->Additional Include Directories include_directories ("${PROJECT_SOURCE_DIR}/include" @@ -154,7 +154,7 @@ target_include_directories(ThermalFIST PUBLIC "${PROJECT_BINARY_DIR}/include" "${PROJECT_SOURCE_DIR}/thirdparty/MersenneTwister") -install (TARGETS ThermalFIST - ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) +#install (TARGETS ThermalFIST +# ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) diff --git a/thirdparty/Minuit2/CMakeLists.txt b/thirdparty/Minuit2/CMakeLists.txt index 230cc85..5409eeb 100644 --- a/thirdparty/Minuit2/CMakeLists.txt +++ b/thirdparty/Minuit2/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # Minuit2 headers file (GLOB HEADERS_MINUIT @@ -18,7 +19,7 @@ target_include_directories(Minuit2 PUBLIC "Minuit/include") set_property(TARGET Minuit2 PROPERTY FOLDER "libraries") -install (TARGETS Minuit2 - ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) +#install (TARGETS Minuit2 +# ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib)