From bbcc4bea36488206516b9c824dcf8238f1bd6270 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Tue, 22 Mar 2016 15:08:53 -0400
Subject: [PATCH] Add a .travis.yml file to automatically do test builds on
push
---
.travis.yml | 23 +++++++++++++++++++++++
src/THcDetectorMap.cxx | 2 +-
src/THcHodoscope.cxx | 2 +-
src/THcShowerArray.h | 4 ++--
4 files changed, 27 insertions(+), 4 deletions(-)
create mode 100644 .travis.yml
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..f6602f1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+os: linux
+compiler: gcc
+language: cpp
+git:
+ depth 5
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -y x11-common libx11-6 x11-utils gsl-bin libxpm4 libxft2 libpng3 libjpeg-turbo8 libjpeg8 libtiff4 libxml2 libldap-2.4-2 libkrb5-3 freeglut3 libfftw3-3 python libmysqlclient18 libgif4 libiodbc2 libxext6 libxmu6 libimlib2 gccxml wget libpopt-dev
+ - sudo apt-get autoremove
+install:
+ - wget http://root.cern.ch/download/root_v5.34.32.Linux-ubuntu12-x86_64-gcc4.6.tar.gz -O /tmp/root.tar.gz
+ - tar -xzf /tmp/root.tar.gz
+ - source ./root/bin/thisroot.sh
+ - source ./setup.sh
+script: scons
+branches:
+ only:
+ - develop
+notifications:
+ email:
+ recipients: saw@jlab.org
+ on_success: always
+ on_failure: always
diff --git a/src/THcDetectorMap.cxx b/src/THcDetectorMap.cxx
index 9247259..6245ba8 100644
--- a/src/THcDetectorMap.cxx
+++ b/src/THcDetectorMap.cxx
@@ -283,7 +283,7 @@ void THcDetectorMap::Load(const char *fname)
if((pos=line.find_first_of("=")) != string::npos) { // Setting parameter
strcpy(varname, (line.substr(0,pos)).c_str());
Int_t valuestartpos = pos+1;
- Int_t commapos = line.find_first_of(",");
+ UInt_t commapos = line.find_first_of(",");
Int_t value;
Int_t value2 = -1;
if(commapos != string::npos) {
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index 5be33ec..7beeb16 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -343,7 +343,7 @@ Int_t THcHodoscope::ReadDatabase( const TDatime& date )
{"track_eff_test_num_scin_planes", &fTrackEffTestNScinPlanes, kInt},
{"cer_npe", &fNCerNPE, kDouble, 0, 1},
{"normalized_energy_tot", &fNormETot, kDouble, 0, 1},
- {"hodo_slop", fHodoSlop, kDouble, fNPlanes},
+ {"hodo_slop", fHodoSlop, kDouble, (UInt_t) fNPlanes},
{"debugprintscinraw", &fdebugprintscinraw, kInt, 0,1},
{0}
};
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index 699793c..0b838f8 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -86,8 +86,8 @@ protected:
// Parameters
- Int_t fNRows;
- Int_t fNColumns;
+ UInt_t fNRows;
+ UInt_t fNColumns;
Double_t fXFront; // Front position X
Double_t fYFront; // Front position Y
Double_t fZFront; // Front position Z, from FP
--
GitLab