From 11c4509563a01b0740ecea3da57f0542ea189f8c Mon Sep 17 00:00:00 2001
From: matta adrien <matta@lpccaen.in2p3.fr>
Date: Wed, 23 Nov 2016 14:39:44 +0100
Subject: [PATCH] * Fixing npcompilation - nps compilation was done
before npl compilation
---
NPLib/Detectors/Tiara/TTiaraHyballSpectra.cxx | 4 ++--
NPLib/scripts/nptool-compilation.sh | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/NPLib/Detectors/Tiara/TTiaraHyballSpectra.cxx b/NPLib/Detectors/Tiara/TTiaraHyballSpectra.cxx
index 00249d0bc..a913151bb 100644
--- a/NPLib/Detectors/Tiara/TTiaraHyballSpectra.cxx
+++ b/NPLib/Detectors/Tiara/TTiaraHyballSpectra.cxx
@@ -75,11 +75,11 @@ void TTiaraHyballSpectra::InitRawSpectra(){
// RING_E_RAW
name = "HYB_RING_E_RAW";
- AddHisto2D(name, name, fWedgesNumber*fRingsNumber, 1, fWedgesNumber*fRingsNumber+1, 512, 0, 16384, "TIARA/HYBALL/RAW/ENERGY");
+ AddHisto2D(name, name, fWedgesNumber*fRingsNumber, 1, fWedgesNumber*fRingsNumber+1, 512, 0, 4096, "TIARA/HYBALL/RAW/ENERGY");
// SECTOR_E_RAW
name = "HYB_SECT_E_RAW";
- AddHisto2D(name, name, fWedgesNumber*fSectorsNumber, 1, fWedgesNumber*fSectorsNumber+1, 512, 0, 16384, "TIARA/HYBALL/RAW/ENERGY");
+ AddHisto2D(name, name, fWedgesNumber*fSectorsNumber, 1, fWedgesNumber*fSectorsNumber+1, 512, 0, 4096, "TIARA/HYBALL/RAW/ENERGY");
// MULT
for (unsigned int i = 0; i < fWedgesNumber; ++i) { // loop on number of wedges
diff --git a/NPLib/scripts/nptool-compilation.sh b/NPLib/scripts/nptool-compilation.sh
index 5ae02dbe3..c34c1d234 100755
--- a/NPLib/scripts/nptool-compilation.sh
+++ b/NPLib/scripts/nptool-compilation.sh
@@ -57,7 +57,7 @@ elif [ "$arg" = "-l" ]; then
# all
elif [ "$arg" = "-a" ]; then
- cd $NPTOOL/NPSimulation
+ cd $NPTOOL/NPLib
if [ -f "build.ninja" ]; then
ninja install
elif [ -f "Makefile" ]; then
@@ -67,7 +67,7 @@ elif [ "$arg" = "-a" ]; then
make install
fi
- cd $NPTOOL/NPLib
+ cd $NPTOOL/NPSimulation
if [ -f "build.ninja" ]; then
ninja install
elif [ -f "Makefile" ]; then
@@ -77,6 +77,7 @@ elif [ "$arg" = "-a" ]; then
make install
fi
+
# current folder
cd $FOLDER
if [ -f "build.ninja" ]; then
--
GitLab