From 4cf291b329c7d028f1a11dc512cc9510e10e97bc Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Fri, 20 Dec 2013 16:18:12 +0100
Subject: [PATCH] * Starting to add matchstick cal to Hyball
---
NPLib/Tiara/TTiaraHyballPhysics.cxx | 12 ++++++++++++
NPLib/Tiara/TTiaraHyballPhysics.h | 2 ++
2 files changed, 14 insertions(+)
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index 42e165b9c..22572118d 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -527,11 +527,14 @@ void TTiaraHyballPhysics::AddParameterToCalibrationManager(){
for(int i = 0 ; i < m_NumberOfDetector ; ++i){
for( int j = 0 ; j < 24 ; ++j){
Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_MATCHSTICK") ;
+
Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 48 ; ++j){
Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_MATCHSTICK") ;
Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T") ;
}
}
@@ -675,6 +678,10 @@ namespace TiaraHyball_LOCAL{
return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingEStripNbr(i) ) + "_E",
m_EventData->GetRingEEnergy(i) );
}
+ double fStrip_Ring_Matchstick(const TTiaraHyballData* m_EventData , const int i){
+ return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingEStripNbr(i) ) + "_MATCHSTICK",
+ m_EventData->GetRingEEnergy(i) );
+ }
double fStrip_Ring_T(const TTiaraHyballData* m_EventData , const int i){
return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingTDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingTStripNbr(i) ) +"_T",
@@ -687,6 +694,11 @@ namespace TiaraHyball_LOCAL{
m_EventData->GetSectorEEnergy(i) );
}
+ double fStrip_Sector_Matchstick(const TTiaraHyballData* m_EventData , const int i){
+ return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetSectorTDetectorNbr(i) ) + "_STRIP_SECTOR" + itoa( m_EventData->GetSectorTStripNbr(i) ) +"_MATCHSTICK",
+ m_EventData->GetSectorEEnergy(i) );
+ }
+
double fStrip_Sector_T(const TTiaraHyballData* m_EventData , const int i){
return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetSectorTDetectorNbr(i) ) + "_STRIP_SECTOR" + itoa( m_EventData->GetSectorTStripNbr(i) ) +"_T",
m_EventData->GetRingTTime(i) );
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.h b/NPLib/Tiara/TTiaraHyballPhysics.h
index 7d79861ea..0a6022fb5 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.h
+++ b/NPLib/Tiara/TTiaraHyballPhysics.h
@@ -206,10 +206,12 @@ namespace TiaraHyball_LOCAL{
// DSSD
// Ring
double fStrip_Ring_E(const TTiaraHyballData* Data, const int i);
+ double fStrip_Ring_Matchstick(const TTiaraHyballData* Data, const int i);
double fStrip_Ring_T(const TTiaraHyballData* Data, const int i);
// Sector
double fStrip_Sector_E(const TTiaraHyballData* Data, const int i);
+ double fStrip_Sector_MatchStick(const TTiaraHyballData* Data, const int i);
double fStrip_Sector_T(const TTiaraHyballData* Data, const int i);
}
--
GitLab