From ddf87570c7c8c5e70804e2574414fe546790160e Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Mon, 27 Jul 2015 19:30:35 +0100
Subject: [PATCH] * Fixing compilation error on older clang compiler * Fixing
warning on older root version
---
NPLib/CMakeLists.txt | 2 +-
NPLib/Calibration/NPSiliconCalibrator.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index 0e84a98c6..30011cd96 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -38,7 +38,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -Wno-undefined-bool-conversion -fcolor-diagnostics")
endif()
set(CMAKE_BINARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
diff --git a/NPLib/Calibration/NPSiliconCalibrator.h b/NPLib/Calibration/NPSiliconCalibrator.h
index 280bae49a..89a1a2831 100644
--- a/NPLib/Calibration/NPSiliconCalibrator.h
+++ b/NPLib/Calibration/NPSiliconCalibrator.h
@@ -30,8 +30,6 @@ namespace NPL{
// Return distance to pedestal. Use energies in Energies to perform fit and fill coeff with the results
double FitPoints(TGraphErrors* Graph, double* Energies , double* ErrEnergies, vector<double>& coeff , double pedestal = 0 );
- // return a canvas containning the results
- void DisplayResults();
//
TGraphErrors* FitSpectrum(TH1* histo);
};
--
GitLab