From 9aa6e921e3a20b9f49da215c3c64772f0cfb45b4 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Tue, 25 Feb 2014 12:47:45 +0000
Subject: [PATCH] * Fixing few issue with spectra class when histo are not
generated
---
NPLib/CATS/TCATSPhysics.cxx | 1 +
NPLib/Charissa/TCharissaPhysics.cxx | 8 ++++----
NPLib/Tiara/TTiaraBarrelPhysics.cxx | 1 +
NPLib/Tiara/TTiaraHyballPhysics.cxx | 1 +
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/NPLib/CATS/TCATSPhysics.cxx b/NPLib/CATS/TCATSPhysics.cxx
index a229129ef..af36a2a65 100644
--- a/NPLib/CATS/TCATSPhysics.cxx
+++ b/NPLib/CATS/TCATSPhysics.cxx
@@ -47,6 +47,7 @@ ClassImp(TCATSPhysics)
m_PreTreatedData = new TCATSData ;
m_EventPhysics = this ;
m_NumberOfCATS = 0 ;
+ m_Spectra = NULL ;
}
///////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Charissa/TCharissaPhysics.cxx b/NPLib/Charissa/TCharissaPhysics.cxx
index 46d3f3c14..cd5ec2f2e 100755
--- a/NPLib/Charissa/TCharissaPhysics.cxx
+++ b/NPLib/Charissa/TCharissaPhysics.cxx
@@ -149,7 +149,7 @@ void TCharissaPhysics::BuildPhysicalEvent(){
double tLayer2_Si_Y_T= -1000;
double tLayer2_Si_E= -1000;
double tLayer2_Si_T = -1000;
-
+
for(unsigned int ll = 0 ; ll < Layer2_couple.size() ; ++ll){
int Layer2_N = m_PreTreatedData->GetCharissaLayer2StripXEDetectorNbr(Layer2_couple[ll].X()) ;
// Same detector
@@ -195,18 +195,18 @@ void TCharissaPhysics::BuildPhysicalEvent(){
double CsIE = -1000;
int CsIN = -1000;
+
// Look for an associate CsI E
for(unsigned int t = 0 ; t < m_CsIEMult ; ++t ){
- if(m_PreTreatedData->GetCharissaLayer2StripXEDetectorNbr( Layer1_couple[i].X() ) == m_PreTreatedData->GetCharissaCsIEDetectorNbr(t)){
+ if(m_PreTreatedData->GetCharissaLayer1StripXEDetectorNbr( Layer1_couple[i].X() ) == m_PreTreatedData->GetCharissaCsIEDetectorNbr(t)){
CsIE = m_PreTreatedData->GetCharissaCsIEEnergy(t);
CsIN = m_PreTreatedData->GetCharissaCsIECristalNbr(t);
}
}
-
double CsIT = -1000;
// Look for an associate CsI T
for(unsigned int t = 0 ; t < m_CsITMult ; ++t ){
- if(m_PreTreatedData->GetCharissaLayer2StripXEDetectorNbr( Layer1_couple[i].X() ) == m_PreTreatedData->GetCharissaCsITDetectorNbr(t))
+ if(m_PreTreatedData->GetCharissaLayer1StripXEDetectorNbr( Layer1_couple[i].X() ) == m_PreTreatedData->GetCharissaCsITDetectorNbr(t))
CsIT = m_PreTreatedData->GetCharissaCsITTime(t);
}
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index d75250b70..07b4d2f56 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -57,6 +57,7 @@ ClassImp(TTiaraBarrelPhysics)
m_Back_E_Threshold = 0.40 ;
m_Maximum_FrontBack_Difference = 0.4;
m_OuterBack_E_Threshold =0;
+ m_Spectra = NULL ;
}
///////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index fd790053b..b948affd8 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -65,6 +65,7 @@ ClassImp(TTiaraHyballPhysics)
m_Take_E_Ring=false;
m_Take_T_Sector=true;
+ m_Spectra = NULL;
}
///////////////////////////////////////////////////////////////////////////
--
GitLab