Skip to content
Snippets Groups Projects
Commit 5e230da8 authored by adrien-matta's avatar adrien-matta
Browse files

* Correct innapropriate Getter on TTiaraBarrel 

  - Getter was returning the whole vector instead of the single element
  - Not take a unsigned int as argument to specify the element to return
parent a7b1b763
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NPLib/Makefile.arch
+ 1
− 1
View file @ 5e230da8
......@@ -227,7 +227,7 @@ ifeq ($(ARCH),macosx64)
MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
MACOSXTARGET := MACOSX_DEPLOYMENT_TARGET=10.$(MACOSX_MINOR)
CXX = g++
CXXFLAGS = $(OPT2) -pipe -Wall -W -Woverloaded-virtual
CXXFLAGS = $(OPT2) -pipe -Wall -W -Woverloaded-virtual -march=native
LD = $(MACOSXTARGET) g++ -m64
LDFLAGS = $(OPT2) -bind_at_load -e start
# The SOFLAGS will be used to create the .dylib,
......
NPLib/Tiara/TTiaraBarrelData.h
+ 41
− 42
View file @ 5e230da8
......@@ -62,101 +62,100 @@ class TTiaraBarrelData : public TNamed {
void Dump() const;
///////////////////// FAST SETTERS ////////////////////////
inline void Set_Front_Upstream( const unsigned short& DetNbr ,
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
inline void Set_Front_Downstreamm( const unsigned short& DetNbr ,
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
inline void Set_Back( const unsigned short& DetNbr ,
const double& Energy ,
const double& Time);
const double& Energy ,
const double& Time);
inline void Set_Outer( const unsigned short& DetNbr ,
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
const unsigned short StripNbr ,
const double& Energy ,
const double& Time);
///////////////////// SETTERS ////////////////////////
inline void Set_Front_Upstream_DetectorNbr(const unsigned short& Front_Upstream_DetectorNbr)
{fTiaraBarrel_Front_Upstream_DetectorNbr.push_back(Front_Upstream_DetectorNbr);}
inline vector<unsigned short> Get_Front_Upstream_DetectorNbr()
{return fTiaraBarrel_Front_Upstream_DetectorNbr;}
inline unsigned short Get_Front_Upstream_DetectorNbr(unsigned int i)
{return fTiaraBarrel_Front_Upstream_DetectorNbr[i];}
inline void Set_Front_Upstream_StripNbr(const unsigned short& Front_Upstream_StripNbr)
{fTiaraBarrel_Front_Upstream_StripNbr.push_back(Front_Upstream_StripNbr);}
inline vector<unsigned short> Get_Front_Upstream_StripNbr()
{return fTiaraBarrel_Front_Upstream_StripNbr;}
inline unsigned short Get_Front_Upstream_StripNbr(unsigned int i)
{return fTiaraBarrel_Front_Upstream_StripNbr[i];}
inline void Set_Front_Upstream_Energy(const double& Front_Upstream_Energy)
{fTiaraBarrel_Front_Upstream_Energy.push_back(Front_Upstream_Energy);}
inline vector<double> Get_Front_Upstream_Energy()
{return fTiaraBarrel_Front_Upstream_Energy;}
inline double Get_Front_Upstream_Energy(unsigned int i)
{return fTiaraBarrel_Front_Upstream_Energy[i];}
inline void Set_Front_Upstream_Time(const double& Front_Upstream_Time)
{fTiaraBarrel_Front_Upstream_Time.push_back(Front_Upstream_Time);}
inline vector<double> Get_Front_Upstream_Time()
{return fTiaraBarrel_Front_Upstream_Time;}
inline double Get_Front_Upstream_Time(unsigned int i)
{return fTiaraBarrel_Front_Upstream_Time[i];}
inline void Set_Front_Downstream_DetectorNbr(const unsigned short& Front_Downstream_DetectorNbr)
{fTiaraBarrel_Front_Downstream_DetectorNbr.push_back(Front_Downstream_DetectorNbr);}
inline vector<unsigned short> Get_Front_Downstream_DetectorNbr()
{return fTiaraBarrel_Front_Downstream_DetectorNbr;}
inline unsigned short Get_Front_Downstream_DetectorNbr(unsigned int i)
{return fTiaraBarrel_Front_Downstream_DetectorNbr[i];}
inline void Set_Front_Downstream_StripNbr(const unsigned short& Front_Downstream_StripNbr)
{fTiaraBarrel_Front_Downstream_StripNbr.push_back(Front_Downstream_StripNbr);}
inline vector<unsigned short> Get_Front_Downstream_StripNbr()
{return fTiaraBarrel_Front_Downstream_StripNbr;}
inline unsigned short Get_Front_Downstream_StripNbr(unsigned int i)
{return fTiaraBarrel_Front_Downstream_StripNbr[i];}
inline void Set_Front_Downstream_Energy(const double& Front_Downstream_Energy)
{fTiaraBarrel_Front_Downstream_Energy.push_back(Front_Downstream_Energy);}
inline vector<double> Get_Front_Downstream_Energy()
{return fTiaraBarrel_Front_Downstream_Energy;}
inline double Get_Front_Downstream_Energy(unsigned int i)
{return fTiaraBarrel_Front_Downstream_Energy[i];}
inline void Set_Front_Downstream_Time(const double& Front_Downstream_Time)
{fTiaraBarrel_Front_Downstream_Time.push_back(Front_Downstream_Time);}
inline vector<double> Get_Front_Downstream_Time()
{return fTiaraBarrel_Front_Downstream_Time;}
inline double Get_Front_Downstream_Time(unsigned int i)
{return fTiaraBarrel_Front_Downstream_Time[i];}
inline void Set_Back_DetectorNbr(const unsigned short& Back_DetectorNbr)
{fTiaraBarrel_Back_DetectorNbr.push_back(Back_DetectorNbr);}
inline vector<unsigned short> Get_Back_DetectorNbr()
{return fTiaraBarrel_Back_DetectorNbr;}
inline unsigned short Get_Back_DetectorNbr(unsigned int i)
{return fTiaraBarrel_Back_DetectorNbr[i];}
inline void Set_Back_Energy(const double& Back_Energy)
{fTiaraBarrel_Back_Energy.push_back(Back_Energy);}
inline vector<double> Get_Back_Energy()
{return fTiaraBarrel_Back_Energy;}
inline double Get_Back_Energy(unsigned int i)
{return fTiaraBarrel_Back_Energy[i];}
inline void Set_Back_Time(const double& Back_Time)
{fTiaraBarrel_Back_Time.push_back(Back_Time);}
inline vector<double> Get_Back_Time()
{return fTiaraBarrel_Back_Time;}
inline double Get_Back_Time(unsigned int i)
{return fTiaraBarrel_Back_Time[i];}
inline void Set_Outer_DetectorNbr(const unsigned short& Outer_DetectorNbr)
{fTiaraBarrel_Outer_DetectorNbr.push_back(Outer_DetectorNbr);}
inline vector<unsigned short> Get_Outer_DetectorNbr()
{return fTiaraBarrel_Outer_DetectorNbr;}
inline unsigned short Get_Outer_DetectorNbr(unsigned int i)
{return fTiaraBarrel_Outer_DetectorNbr[i];}
inline void Set_Outer_StripNbr(const unsigned short& Outer_StripNbr)
{fTiaraBarrel_Outer_StripNbr.push_back(Outer_StripNbr);}
inline vector<unsigned short> Get_Outer_StripNbr()
{return fTiaraBarrel_Outer_StripNbr;}
inline unsigned short Get_Outer_StripNbr(unsigned int i)
{return fTiaraBarrel_Outer_StripNbr[i];}
inline void Set_Outer_Energy(const double& Outer_Energy)
{fTiaraBarrel_Outer_Energy.push_back(Outer_Energy);}
inline vector<double> Get_Outer_Energy()
{return fTiaraBarrel_Outer_Energy;}
inline double Get_Outer_Energy(unsigned int i)
{return fTiaraBarrel_Outer_Energy[i];}
inline void Set_Outer_Time(const double& Outer_Time)
{fTiaraBarrel_Outer_Time.push_back(Outer_Time);}
inline vector<double> Get_Outer_Time()
{return fTiaraBarrel_Outer_Time;}
inline double Get_Outer_Time(unsigned int i)
{return fTiaraBarrel_Outer_Time[i];}
ClassDef(TTiaraBarrelData,1) // TiaraData structure
};
......
NPLib/Tiara/libTiara.so
+ 0
− 0
View file @ 5e230da8
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment