From edd1db61659b18242ace0dcd8976d58e5649dca1 Mon Sep 17 00:00:00 2001
From: "theodore.efremov" <theodore.efremov@cea.fr>
Date: Fri, 29 Nov 2024 11:15:35 +0100
Subject: [PATCH] Added variable to TTime and TICPhysics
---
NPLib/Detectors/PISTA/TICPhysics.cxx | 6 ++-
NPLib/Detectors/PISTA/TICPhysics.h | 3 ++
NPLib/Detectors/PISTA/TTimeData.cxx | 23 +++++----
NPLib/Detectors/PISTA/TTimeData.h | 57 ++++++++++++++-------
Projects/AlPhaPha/2024/Analysis.cxx | 4 ++
Projects/AlPhaPha/conversion/2024/convert.C | 12 +++--
6 files changed, 73 insertions(+), 32 deletions(-)
diff --git a/NPLib/Detectors/PISTA/TICPhysics.cxx b/NPLib/Detectors/PISTA/TICPhysics.cxx
index a4097a504..c905cf16a 100644
--- a/NPLib/Detectors/PISTA/TICPhysics.cxx
+++ b/NPLib/Detectors/PISTA/TICPhysics.cxx
@@ -96,7 +96,7 @@ void TICPhysics::BuildPhysicalEvent() {
fIC_raw[i] = m_PreTreatedData->GetIC_Charge(i);
fIC[i] = gain*m_PreTreatedData->GetIC_Charge(i);
fIC_Init[i] = GainInit * m_PreTreatedData->GetIC_Charge(i);
-
+ fIC_TS.push_back(m_PreTreatedData->GetIC_TS(i));
}
@@ -168,9 +168,11 @@ void TICPhysics::PreTreat() {
//cout << section << " " << gain << endl;
//double charge = gain*m_EventData->GetIC_Charge(i);
double charge = m_EventData->GetIC_Charge(i);
+ long TS = m_EventData->GetIC_TS(i);
m_PreTreatedData->SetIC_Charge(charge);
m_PreTreatedData->SetIC_Section(segment);
+ m_PreTreatedData->SetIC_TS(TS);
}
}
@@ -319,6 +321,8 @@ void TICPhysics::Clear() {
fIC_raw[i] = 0;
fIC_Init[i] = 0;
}
+
+ fIC_TS.clear();
}
diff --git a/NPLib/Detectors/PISTA/TICPhysics.h b/NPLib/Detectors/PISTA/TICPhysics.h
index 5866e24a4..c02c89ab1 100644
--- a/NPLib/Detectors/PISTA/TICPhysics.h
+++ b/NPLib/Detectors/PISTA/TICPhysics.h
@@ -66,6 +66,9 @@ class TICPhysics : public TObject, public NPL::VDetector {
double Etot;
double EtotInit;
double Chio_Z;
+
+ vector<long> fIC_TS;
+
double fIC[11];
double fIC_raw[11];
double fIC_Init[11];//!
diff --git a/NPLib/Detectors/PISTA/TTimeData.cxx b/NPLib/Detectors/PISTA/TTimeData.cxx
index d1aefa0fb..8334473af 100644
--- a/NPLib/Detectors/PISTA/TTimeData.cxx
+++ b/NPLib/Detectors/PISTA/TTimeData.cxx
@@ -44,10 +44,15 @@ TTimeData::~TTimeData() {
//////////////////////////////////////////////////////////////////////
void TTimeData::Clear() {
- fTimeMWPC13.clear();
- fTimeMWPC14.clear();
- fTimeMWPC23.clear();
- fTimeMWPC24.clear();
+ fTS_MWPC13.clear();
+ fTS_MWPC14.clear();
+ fTS_MWPC23.clear();
+ fTS_MWPC24.clear();
+
+ fTime_MWPC13.clear();
+ fTime_MWPC14.clear();
+ fTime_MWPC23.clear();
+ fTime_MWPC24.clear();
}
@@ -57,12 +62,12 @@ void TTimeData::Dump() const {
// This method is very useful for debuging and worth the dev.
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event [TTimeData::Dump()] XXXXXXXXXXXXXXXXX" << endl;
- size_t mysize = fTimeMWPC13.size();
+ size_t mysize = fTime_MWPC13.size();
cout << "MWPC_Mult: " << mysize << endl;
for(unsigned int i=0; i<mysize; i++){
- cout << "Time 13 mult " << i+1 << " / T= " << fTimeMWPC13[i] << endl;
- cout << "Time 14 mult " << i+1 << " / T= " << fTimeMWPC14[i] << endl;
- cout << "Time 23 mult " << i+1 << " / T= " << fTimeMWPC23[i] << endl;
- cout << "Time 24 mult " << i+1 << " / T= " << fTimeMWPC24[i] << endl;
+ cout << "Time 13 mult " << i+1 << " / T= " << fTime_MWPC13[i] << endl;
+ cout << "Time 14 mult " << i+1 << " / T= " << fTime_MWPC14[i] << endl;
+ cout << "Time 23 mult " << i+1 << " / T= " << fTime_MWPC23[i] << endl;
+ cout << "Time 24 mult " << i+1 << " / T= " << fTime_MWPC24[i] << endl;
}
}
diff --git a/NPLib/Detectors/PISTA/TTimeData.h b/NPLib/Detectors/PISTA/TTimeData.h
index 22e57c69d..58a200a4f 100644
--- a/NPLib/Detectors/PISTA/TTimeData.h
+++ b/NPLib/Detectors/PISTA/TTimeData.h
@@ -34,10 +34,16 @@ class TTimeData : public TObject {
// data members are hold into vectors in order
// to allow multiplicity treatment
private:
- vector<long> fTimeMWPC13;
- vector<long> fTimeMWPC14;
- vector<long> fTimeMWPC23;
- vector<long> fTimeMWPC24;
+ vector<long> fTS_MWPC13;
+ vector<long> fTS_MWPC14;
+ vector<long> fTS_MWPC23;
+ vector<long> fTS_MWPC24;
+
+ vector<float> fTime_MWPC13;
+ vector<float> fTime_MWPC14;
+ vector<float> fTime_MWPC23;
+ vector<float> fTime_MWPC24;
+
@@ -64,24 +70,39 @@ class TTimeData : public TObject {
public:
////////////////////// SETTERS ////////////////////////
// X setters
- inline void SetTime_MWPC13(long time ){fTimeMWPC13.push_back(time);};//!
- inline void SetTime_MWPC14(long time ){fTimeMWPC14.push_back(time);};//!
- inline void SetTime_MWPC23(long time ){fTimeMWPC23.push_back(time);};//!
- inline void SetTime_MWPC24(long time ){fTimeMWPC24.push_back(time);};//!
+ inline void SetTS_MWPC13(long time ){fTS_MWPC13.push_back(time);};//!
+ inline void SetTS_MWPC14(long time ){fTS_MWPC14.push_back(time);};//!
+ inline void SetTS_MWPC23(long time ){fTS_MWPC23.push_back(time);};//!
+ inline void SetTS_MWPC24(long time ){fTS_MWPC24.push_back(time);};//!
+
+ inline void SetTime_MWPC13(float time ){fTime_MWPC13.push_back(time);};//!
+ inline void SetTime_MWPC14(float time ){fTime_MWPC14.push_back(time);};//!
+ inline void SetTime_MWPC23(float time ){fTime_MWPC23.push_back(time);};//!
+ inline void SetTime_MWPC24(float time ){fTime_MWPC24.push_back(time);};//!
+
////////////////////// GETTERS ////////////////////////
- inline UShort_t GetTimeMWPC13(const unsigned int &i) const
- {return fTimeMWPC13.at(i) ;}//!
- inline UShort_t GetTimeMWPC14(const unsigned int &i) const
- {return fTimeMWPC14.at(i) ;}//!
- inline UShort_t GetTimeMWPC23(const unsigned int &i) const
- {return fTimeMWPC23.at(i) ;}//!
- inline UShort_t GetTimeMWPC24(const unsigned int &i) const
- {return fTimeMWPC24.at(i) ;}//!
-
+ inline UShort_t GetTS_MWPC13(const unsigned int &i) const
+ {return fTS_MWPC13.at(i) ;}//!
+ inline UShort_t GetTS_MWPC14(const unsigned int &i) const
+ {return fTS_MWPC14.at(i) ;}//!
+ inline UShort_t GetTS_MWPC23(const unsigned int &i) const
+ {return fTS_MWPC23.at(i) ;}//!
+ inline UShort_t GetTS_MWPC24(const unsigned int &i) const
+ {return fTS_MWPC24.at(i) ;}//!
+
+ inline UShort_t GetTime_MWPC13(const unsigned int &i) const
+ {return fTime_MWPC13.at(i) ;}//!
+ inline UShort_t GetTime_MWPC14(const unsigned int &i) const
+ {return fTime_MWPC14.at(i) ;}//!
+ inline UShort_t GetTime_MWPC23(const unsigned int &i) const
+ {return fTime_MWPC23.at(i) ;}//!
+ inline UShort_t GetTime_MWPC24(const unsigned int &i) const
+ {return fTime_MWPC24.at(i) ;}//!
+
inline UShort_t GetMWPCMult() const
- {return fTimeMWPC13.size();}
+ {return fTS_MWPC13.size();}
//////////////////////////////////////////////////////////////
// Required for ROOT dictionnary
ClassDef(TTimeData,1) // TimeData structure
diff --git a/Projects/AlPhaPha/2024/Analysis.cxx b/Projects/AlPhaPha/2024/Analysis.cxx
index 3fc32acb1..3ad4a5480 100644
--- a/Projects/AlPhaPha/2024/Analysis.cxx
+++ b/Projects/AlPhaPha/2024/Analysis.cxx
@@ -469,6 +469,8 @@ void Analysis::VamosAnalysis(){
IC->SetFPMWSection(FPMW_Section);
IC->BuildSimplePhysicalEvent();
double Theta = -1000;
+
+
if(FPMW->Xf!=-1000){
FF_DE = IC->DE;
@@ -477,6 +479,8 @@ void Analysis::VamosAnalysis(){
Tracking->CalculateReconstruction(FPMW->Xf, 1000*FPMW->Thetaf, m_Brho_ref, FF_Brho, Theta, FF_Path);
// FF_Path is in cm !
+// FF_DriftTime = 10*(IC->fIC)Time->GetTime_MWPC13(i)
+
FF_Y1 = FPMW->PositionY[0];
FF_Y3 = FPMW->PositionY[2];
diff --git a/Projects/AlPhaPha/conversion/2024/convert.C b/Projects/AlPhaPha/conversion/2024/convert.C
index c2a584e75..c80a96a84 100644
--- a/Projects/AlPhaPha/conversion/2024/convert.C
+++ b/Projects/AlPhaPha/conversion/2024/convert.C
@@ -86,18 +86,22 @@ void convert(int run=204){
// Time //
for (int i=0; i<MTOF_FP0_T0VM;i++){
- m_time->SetTime_MWPC13(MTOF_FP0_T0VTS[i]);
+ m_time->SetTS_MWPC13(MTOF_FP0_T0VTS[i]);
+ m_time->SetTime_MWPC13(MTOF_FP0_T0V[i]);
}
for (int i=0; i<MTOF_FP0_T1VM;i++){
- m_time->SetTime_MWPC14(MTOF_FP0_T1VTS[i]);
+ m_time->SetTS_MWPC14(MTOF_FP0_T1VTS[i]);
+ m_time->SetTime_MWPC14(MTOF_FP0_T1V[i]);
}
for (int i=0; i<MTOF_FP1_T0VM;i++){
- m_time->SetTime_MWPC23(MTOF_FP1_T0VTS[i]);
+ m_time->SetTS_MWPC23(MTOF_FP1_T0VTS[i]);
+ m_time->SetTime_MWPC23(MTOF_FP1_T0V[i]);
}
for (int i=0; i<MTOF_FP1_T1VM;i++){
- m_time->SetTime_MWPC24(MTOF_FP1_T1VTS[i]);
+ m_time->SetTS_MWPC24(MTOF_FP1_T1VTS[i]);
+ m_time->SetTime_MWPC24(MTOF_FP1_T1V[i]);
}
--
GitLab