From ce81f9006692c4f000d0fc12fd328c0aaa7db619 Mon Sep 17 00:00:00 2001
From: Anna Maria CORSI SPhN <acorsi@irfulx168.(none)>
Date: Mon, 3 Mar 2014 00:18:55 +0100
Subject: [PATCH] Added Makefile for SiRes and temporarily fixed bug for SiLi
---
NPLib/SiLi/TSiLiData.h | 2 +-
NPLib/SiLi/TSiLiPhysics.cxx | 12 ++++-------
NPLib/SiLi/TSiLiPhysics.h | 3 +--
NPLib/SiRes/Makefile | 40 +++++++++++++++++++++++++++++++++++
NPLib/SiRes/TSiResPhysics.cxx | 2 +-
5 files changed, 47 insertions(+), 12 deletions(-)
create mode 100644 NPLib/SiRes/Makefile
diff --git a/NPLib/SiLi/TSiLiData.h b/NPLib/SiLi/TSiLiData.h
index e3d9e931b..f7f2eaff5 100644
--- a/NPLib/SiLi/TSiLiData.h
+++ b/NPLib/SiLi/TSiLiData.h
@@ -46,7 +46,7 @@ class TSiLiData : public TObject {
///////////////////// GETTERS ////////////////////////
// Energy
unsigned int GetEnergyMult() {return fSiLi_E_Number.size();}
- int GetENumber(int i) {return fSiLi_E_Number[i];}
+ int GetENumber(int i) {return fSiLi_E_Number[i];}
double GetEEnergy(int i) {return fSiLi_E_Energy[i];}
// Time
unsigned int GetTimeMult() {return fSiLi_T_Number.size();}
diff --git a/NPLib/SiLi/TSiLiPhysics.cxx b/NPLib/SiLi/TSiLiPhysics.cxx
index e8a72a093..28dac6b1e 100644
--- a/NPLib/SiLi/TSiLiPhysics.cxx
+++ b/NPLib/SiLi/TSiLiPhysics.cxx
@@ -60,8 +60,8 @@ TSiLiPhysics::~TSiLiPhysics()
///////////////////////////////////////////////////////////////////////////
void TSiLiPhysics::Clear()
{
- DetectorENumber.clear() ;
- DetectorTNumber.clear() ;
+
+ DetectorNumber.clear() ;
Energy.clear() ;
Time.clear() ;
}
@@ -287,13 +287,9 @@ void TSiLiPhysics::BuildSimplePhysicalEvent()
{
for(unsigned int i = 0 ; i < EventData->GetEnergyMult() ; i++)
{
- DetectorENumber.push_back( EventData->GetENumber(i) ) ;
+ DetectorNumber.push_back( EventData->GetENumber(i) ) ;
Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("SiLi/Detector" + itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i) ) );
- }
- for(unsigned int i = 0 ; i < EventData->GetTimeMult() ; i++)
- {
- DetectorTNumber.push_back( EventData->GetTNumber(i) ) ;
- Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "SiLi/Detector" + itoa( EventData->GetTNumber(i) ) +"_T",EventData->GetTTime(i) ) );
+ Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "SiLi/Detector" + itoa( EventData->GetTNumber(i) ) +"_T",EventData->GetTTime(i) ) );
}
}
diff --git a/NPLib/SiLi/TSiLiPhysics.h b/NPLib/SiLi/TSiLiPhysics.h
index 866b73635..b36233ddc 100644
--- a/NPLib/SiLi/TSiLiPhysics.h
+++ b/NPLib/SiLi/TSiLiPhysics.h
@@ -45,8 +45,7 @@ class TSiLiPhysics : public TObject, public NPA::VDetector
void Clear(const Option_t*) {};
public: // Calibrated Data
- vector<UShort_t> DetectorENumber ;
- vector<UShort_t> DetectorTNumber ;
+ vector<UShort_t> DetectorNumber ;
vector<Double_t> Energy;
vector<Double_t> Time;
diff --git a/NPLib/SiRes/Makefile b/NPLib/SiRes/Makefile
new file mode 100644
index 000000000..a58805605
--- /dev/null
+++ b/NPLib/SiRes/Makefile
@@ -0,0 +1,40 @@
+include ../Makefile.arch
+
+#------------------------------------------------------------------------------
+SHARELIB = libSiRes.so
+
+all: $(SHARELIB)
+#------------------------------------------------------------------------------
+############### Detector ##############
+
+## SiRes ##
+libSiRes.so: TSiResData.o TSiResDataDict.o TSiResPhysics.o TSiResPhysicsDict.o TSiResSpectra.o
+ $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
+
+TSiResDataDict.cxx: TSiResData.h
+ rootcint -f $@ -c $^
+
+TSiResPhysicsDict.cxx: TSiResPhysics.h
+ rootcint -f $@ -c $^
+
+# dependances
+TSiResData.o: TSiResData.cxx TSiResData.h
+TSiResPhysics.o: TSiResPhysics.cxx TSiResPhysics.h
+TSiResSpectra.o: TSiResSpectra.cxx TSiResSpectra.h
+#######################################
+
+############# Clean and More ##########
+clean:
+ @rm -f core *~ *.o *Dict*
+
+distclean:
+ make clean; rm -f *.so
+
+.SUFFIXES: .$(SrcSuf)
+
+###
+
+.$(SrcSuf).$(ObjSuf):
+ $(CXX) $(CXXFLAGS) $(INCLUDE) -c $<
+
+
diff --git a/NPLib/SiRes/TSiResPhysics.cxx b/NPLib/SiRes/TSiResPhysics.cxx
index 85c4c2855..d6b014e90 100644
--- a/NPLib/SiRes/TSiResPhysics.cxx
+++ b/NPLib/SiRes/TSiResPhysics.cxx
@@ -248,7 +248,7 @@ void TSiResPhysics::AddParameterToCalibrationManager()
for(int i = 0 ; i < NumberOfDetector ; i++)
{
- for( int j = 0 ; j < 16 ; j++)
+ for( int j = 0 ; j < 4 ; j++)
{
Cal->AddParameter("SiRes", "Detector"+itoa(i+1)+"_E","SiRes_Detector"+itoa(i+1)+"_E") ;
}
--
GitLab