From 4c3527ee19933dfb96f90958a79fa1f1b1cd5380 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Thu, 20 Apr 2017 10:10:29 -0400
Subject: [PATCH] Modify Makefile to be compatable with ROOT6 (#118)
Fix bug in kpp macro
---
onlineGUI/Macros/kpp_analysis.C | 2 +-
onlineGUI/onlineGUI_v1.2.1/Makefile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/onlineGUI/Macros/kpp_analysis.C b/onlineGUI/Macros/kpp_analysis.C
index 0dd9ab39..8a9057df 100644
--- a/onlineGUI/Macros/kpp_analysis.C
+++ b/onlineGUI/Macros/kpp_analysis.C
@@ -652,7 +652,7 @@ void UserScript() {
}
for (UInt_t itrack = 0; itrack < ntracks; itrack++)
- if (trk_pmag != 0.0 && ntracks == 1) h2_EdivP_vs_P->Fill(trk_pmag[0], (ppshwr_sum + pshwr_sum)/trk_pmag[0]);
+ if (trk_pmag[itrack] != 0 && ntracks == 1) h2_EdivP_vs_P->Fill(trk_pmag[0], (ppshwr_sum + pshwr_sum)/trk_pmag[0]);
// ==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==
diff --git a/onlineGUI/onlineGUI_v1.2.1/Makefile b/onlineGUI/onlineGUI_v1.2.1/Makefile
index 0fee22ee..e04baefa 100644
--- a/onlineGUI/onlineGUI_v1.2.1/Makefile
+++ b/onlineGUI/onlineGUI_v1.2.1/Makefile
@@ -10,12 +10,13 @@ ifdef INSURE
GLD=insure
endif
+ROOTCFLAGS := $(shell root-config --cflags)
ROOTMVERSION = $(shell root-config --version | cut -f1 -d.)
ROOTLIBS = $(shell root-config --libs)
ROOTGLIBS = $(shell root-config --glibs)
INCLUDES = -I$(ROOTSYS)/include
CXX = $(GCC)
-CXXFLAGS = -Wall -fno-exceptions -fPIC $(INCLUDES) -fpermissive
+CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) -Wall -fno-exceptions -fPIC -fpermissive
LD = $(GLD)
LDFLAGS =
SOFLAGS = -shared
--
GitLab