From 5f6d0b6c1f0921b80d045746ff60f3ee4da3759d Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 19 Dec 2013 00:10:38 +0100
Subject: [PATCH] * Adding Charrissa Spectra
---
NPLib/Charissa/TCharissaPhysics.cxx | 19 ++++++++++---------
NPLib/Charissa/TCharissaSpectra.cxx | 8 ++++----
NPLib/Tiara/TTiaraBarrelPhysics.cxx | 14 +++++++++++---
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/NPLib/Charissa/TCharissaPhysics.cxx b/NPLib/Charissa/TCharissaPhysics.cxx
index a4999dc51..f31af52d5 100755
--- a/NPLib/Charissa/TCharissaPhysics.cxx
+++ b/NPLib/Charissa/TCharissaPhysics.cxx
@@ -237,10 +237,10 @@ void TCharissaPhysics::PreTreat(){
m_Layer1_StripXTMult = m_EventData->GetCharissaLayer1StripXTMult();
m_Layer1_StripYTMult = m_EventData->GetCharissaLayer1StripYTMult();
- m_Layer2_StripXEMult = m_PreTreatedData->GetCharissaLayer2StripXEMult();
- m_Layer2_StripYEMult = m_PreTreatedData->GetCharissaLayer2StripYEMult();
- m_Layer2_StripXTMult = m_PreTreatedData->GetCharissaLayer2StripXTMult();
- m_Layer2_StripYTMult = m_PreTreatedData->GetCharissaLayer2StripYTMult();
+ m_Layer2_StripXEMult = m_EventData->GetCharissaLayer2StripXEMult();
+ m_Layer2_StripYEMult = m_EventData->GetCharissaLayer2StripYEMult();
+ m_Layer2_StripXTMult = m_EventData->GetCharissaLayer2StripXTMult();
+ m_Layer2_StripYTMult = m_EventData->GetCharissaLayer2StripYTMult();
m_CsIEMult = m_EventData->GetCharissaCsIEMult();
m_CsITMult = m_EventData->GetCharissaCsITMult();
@@ -248,7 +248,7 @@ void TCharissaPhysics::PreTreat(){
// X Layer1
// E
for(unsigned int i = 0 ; i < m_Layer1_StripXEMult ; ++i){
- if( m_EventData->GetCharissaLayer1StripXEEnergy(i)>m_Si_X_E_RAW_Threshold && IsValidChannel("X", m_EventData->GetCharissaLayer1StripXEDetectorNbr(i), m_EventData->GetCharissaLayer1StripXEStripNbr(i)) ){
+ if( m_EventData->GetCharissaLayer1StripXEEnergy(i)>m_Si_X_E_RAW_Threshold){
double Layer1_EX = fDE_X_E(m_EventData , i);
if( Layer1_EX > m_Si_X_E_Threshold ){
m_PreTreatedData->SetCharissaLayer1StripXEDetectorNbr( m_EventData->GetCharissaLayer1StripXEDetectorNbr(i) );
@@ -270,7 +270,7 @@ void TCharissaPhysics::PreTreat(){
// Y Layer1
// E
for(unsigned int i = 0 ; i < m_Layer1_StripYEMult ; ++i){
- if( m_EventData->GetCharissaLayer1StripYEEnergy(i)<m_Si_Y_E_RAW_Threshold && IsValidChannel("Y", m_EventData->GetCharissaLayer1StripYEDetectorNbr(i), m_EventData->GetCharissaLayer1StripYEStripNbr(i))){
+ if( m_EventData->GetCharissaLayer1StripYEEnergy(i)>m_Si_Y_E_RAW_Threshold){
double Layer1_EY = fDE_Y_E(m_EventData , i);
if( Layer1_EY >m_Si_Y_E_Threshold ){
m_PreTreatedData->SetCharissaLayer1StripYEDetectorNbr( m_EventData->GetCharissaLayer1StripYEDetectorNbr(i) );
@@ -293,9 +293,10 @@ void TCharissaPhysics::PreTreat(){
// X Layer2
// E
for(unsigned int i = 0 ; i < m_Layer2_StripXEMult ; ++i){
- if( m_EventData->GetCharissaLayer2StripXEEnergy(i)>m_Si_X_E_RAW_Threshold && IsValidChannel("X", m_EventData->GetCharissaLayer2StripXEDetectorNbr(i), m_EventData->GetCharissaLayer1StripXEStripNbr(i)) ){
+ if( m_EventData->GetCharissaLayer2StripXEEnergy(i)>m_Si_X_E_RAW_Threshold){
double Layer2_EX = fE_X_E(m_EventData , i);
- if( Layer2_EX > m_Si_X_E_Threshold ){
+ if( Layer2_EX > m_Si_X_E_Threshold ){
+
m_PreTreatedData->SetCharissaLayer2StripXEDetectorNbr( m_EventData->GetCharissaLayer2StripXEDetectorNbr(i) );
m_PreTreatedData->SetCharissaLayer2StripXEStripNbr( m_EventData->GetCharissaLayer2StripXEStripNbr(i) );
m_PreTreatedData->SetCharissaLayer2StripXEEnergy( Layer2_EX );
@@ -316,7 +317,7 @@ void TCharissaPhysics::PreTreat(){
// Y Layer2
// E
for(unsigned int i = 0 ; i < m_Layer2_StripYEMult ; ++i){
- if( m_EventData->GetCharissaLayer2StripYEEnergy(i)<m_Si_Y_E_RAW_Threshold && IsValidChannel("Y", m_EventData->GetCharissaLayer2StripYEDetectorNbr(i), m_EventData->GetCharissaLayer1StripYEStripNbr(i))){
+ if( m_EventData->GetCharissaLayer2StripYEEnergy(i)>m_Si_Y_E_RAW_Threshold){
double Layer2_EY = fE_Y_E(m_EventData , i);
if( Layer2_EY >m_Si_Y_E_Threshold ){
m_PreTreatedData->SetCharissaLayer2StripYEDetectorNbr( m_EventData->GetCharissaLayer2StripYEDetectorNbr(i) );
diff --git a/NPLib/Charissa/TCharissaSpectra.cxx b/NPLib/Charissa/TCharissaSpectra.cxx
index 2f7e6803e..21c920e43 100644
--- a/NPLib/Charissa/TCharissaSpectra.cxx
+++ b/NPLib/Charissa/TCharissaSpectra.cxx
@@ -134,19 +134,19 @@ void TCharissaSpectra::InitPreTreatedSpectra()
for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
// L1_STRX_E_CAL
name = Form("CHA%d_L1_STRX_E_CAL", i+1);
- AddHisto2D(name, name, fStripX, 1, fStripX+1, 1000, 0, 20000, "CHARISSA/CAL/STRXE");
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 1000, 0, 16000, "CHARISSA/CAL/STRXE");
// L1_STRY_E_CAL
name = Form("CHA%d_L1_STRY_E_CAL", i+1);
- AddHisto2D(name, name, fStripY, 1, fStripY+1, 1000, 0, 20000, "CHARISSA/CAL/STRYE");
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 1000, 0, 16000, "CHARISSA/CAL/STRYE");
// L2_STRX_E_CAL
name = Form("CHA%d_L2_STRX_E_CAL", i+1);
- AddHisto2D(name, name, fStripX, 1, fStripX+1, 1000, 0, 20000, "CHARISSA/CAL/STRXE");
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 1000, 0, 16000, "CHARISSA/CAL/STRXE");
// L2_STRY_E_CAL
name = Form("CHA%d_L2_STRY_E_CAL", i+1);
- AddHisto2D(name, name, fStripY, 1, fStripY+1, 1000, 0, 20000, "CHARISSA/CAL/STRYE");
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 1000, 0, 16000, "CHARISSA/CAL/STRYE");
// CSI_E_CAL
name = Form("CHA%d_CSI_E_CAL", i+1);
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index 6a469dcc9..996b98aa2 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -150,12 +150,20 @@ void TTiaraBarrelPhysics::PreTreat(){
&& m_EventData->GetFrontUpstreamEStripNbr(i)
== m_EventData->GetFrontDownstreamEStripNbr(j)){
- Strip_E.push_back(EU+ED);
- double POS =
+ //
+ double POS =
CalibrationManager::getInstance()->ApplyResistivePositionCalibration("TIARABARREL/B"+itoa(m_EventData->GetFrontUpstreamEDetectorNbr(i))+"_STRIP"+itoa(m_EventData->GetFrontUpstreamEStripNbr(i))+"_POS",(ED-EU)/(EU+ED));
Strip_Pos.push_back(POS);
Strip_N.push_back(m_EventData->GetFrontUpstreamEStripNbr(i));
DetectorNumber.push_back(m_EventData->GetFrontUpstreamEDetectorNbr(i));
+ double E =(EU+ED) / CalibrationManager::getInstance()
+ ->ApplyCalibration("TIARABARREL/BALLISTIC_B"
+ + itoa(m_EventData->GetFrontDownstreamEDetectorNbr(i))
+ + "_STRIP"
+ + itoa(m_EventData->GetFrontDownstreamEStripNbr(i)),
+ POS);
+
+ Strip_E.push_back(E);
}
}
}
@@ -494,7 +502,7 @@ void TTiaraBarrelPhysics::AddParameterToCalibrationManager(){
Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E") ;
Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E") ;
-
+ Cal->AddParameter("TIARABARREL","BALLISTIC_B"+itoa(i+1)+"_STRIP"+itoa(j+1),"TIARABARREL_BALLISTIC_B"+itoa(i+1)+"_STRIP"+itoa(j+1)) ;
Cal->AddParameter("TIARABARREL","B"+itoa(i+1)+"_STRIP"+itoa(j+1)+"_POS","TIARABARREL_B"+itoa(i+1)+"_STRIP"+itoa(j+1)+"_POS") ;
}
}
--
GitLab