Merge pull request #22 from vlvovch/devel

Merge from devel
vlvovch · Jul 22, 2019 · 3855e6d · 3855e6d
2 parents 9d5ccda + 9caec62
commit 3855e6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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/src/library/HRGBase/ThermalModelBase.cpp b/src/library/HRGBase/ThermalModelBase.cpp
@@ -946,17 +946,17 @@ 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) {
               if (m_TPS->Particles()[kp].IsStable()) {
                 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];

diff --git 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)