Skip to content
Snippets Groups Projects
Commit 8cee694f authored by moukaddam's avatar moukaddam
Browse files

change the Data vector structure for Plastic and Awire

parent a918fe9e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NPLib/Detectors/FPDTamu/TFPDTamuData.cxx
+ 18
− 18
View file @ 8cee694f
......@@ -54,11 +54,11 @@ void TFPDTamuData::Clear() {
fFPDTamu_Delta_Time.clear();
fFPDTamu_AWire_E_DetectorNbr.clear();
fFPDTamu_AWire_Energy_Left.clear();
fFPDTamu_AWire_Energy_Right.clear();
fFPDTamu_AWire_E_DetectorSide.clear();
fFPDTamu_AWire_Energy.clear();
fFPDTamu_AWire_T_DetectorNbr.clear();
fFPDTamu_AWire_Time_Left.clear();
fFPDTamu_AWire_Time_Right.clear();
fFPDTamu_AWire_T_DetectorSide.clear();
fFPDTamu_AWire_Time.clear();
fFPDTamu_Micro_E_RowNbr.clear();
fFPDTamu_Micro_E_ColNbr.clear();
......@@ -67,10 +67,10 @@ void TFPDTamuData::Clear() {
fFPDTamu_Micro_T_ColNbr.clear();
fFPDTamu_Micro_Time.clear();
fFPDTamu_Plast_Energy_Left.clear();
fFPDTamu_Plast_Energy_Right.clear();
fFPDTamu_Plast_Time_Left.clear();
fFPDTamu_Plast_Time_Right.clear();
fFPDTamu_Plast_E_DetectorSide.clear();
fFPDTamu_Plast_Energy.clear();
fFPDTamu_Plast_T_DetectorSide.clear();
fFPDTamu_Plast_Time.clear();
}
......@@ -107,8 +107,8 @@ void TFPDTamuData::Dump() const {
cout << "Energy Mult: " << mysize << endl;
for (size_t i = 0 ; i < mysize ; i++){
cout << "DetNbr: " << fFPDTamu_AWire_E_DetectorNbr[i]
<< " EnergyLeft: " << fFPDTamu_AWire_Energy_Left[i]
<< " EnergyRight: " << fFPDTamu_AWire_Energy_Right[i]
<< " Side(L-0 R-1): " << fFPDTamu_AWire_E_DetectorSide[i]
<< " Energy: " << fFPDTamu_AWire_Energy[i]
<<endl;
}
// Time
......@@ -116,8 +116,8 @@ void TFPDTamuData::Dump() const {
cout << "Time Mult: " << mysize << endl;
for (size_t i = 0 ; i < mysize ; i++){
cout << "DetNbr: " << fFPDTamu_AWire_T_DetectorNbr[i]
<< " TimeLeft: " << fFPDTamu_AWire_Time_Left[i]
<< " TimeRight: " << fFPDTamu_AWire_Time_Right[i]
<< " Side(L-0 R-1): " << fFPDTamu_AWire_T_DetectorNbr[i]
<< " Time: " << fFPDTamu_AWire_Time[i]
<<endl;
}
......@@ -147,19 +147,19 @@ void TFPDTamuData::Dump() const {
cout << " ...oooOOOooo... Plastic Scintillator ...oooOOOooo... " << endl;
// Energy
mysize = fFPDTamu_Plast_Energy_Left.size();
mysize = fFPDTamu_Plast_E_DetectorSide.size();
cout << "Energy Mult: " << mysize << endl;
for (size_t i = 0 ; i < mysize ; i++){
cout << "EnergyLeft: " << fFPDTamu_Plast_Energy_Left[i]
<< " EnergyRight: " << fFPDTamu_Plast_Energy_Right[i]
cout << "Side(L-0 R-1): " << fFPDTamu_Plast_E_DetectorSide[i]
<< " Energy: " << fFPDTamu_Plast_Energy[i]
<< endl;
}
// Time
mysize = fFPDTamu_Plast_Time_Left.size();
mysize = fFPDTamu_Plast_T_DetectorSide.size();
cout << "Energy Mult: " << mysize << endl;
for (size_t i = 0 ; i < mysize ; i++){
cout << "TimeLeft: " << fFPDTamu_Plast_Time_Left[i]
<< " TimeRight: " << fFPDTamu_Plast_Time_Right[i]
cout << "Side(L-0 R-1): " << fFPDTamu_Plast_T_DetectorSide[i]
<< " Time: " << fFPDTamu_Plast_Time[i]
<< endl;
}
......
NPLib/Detectors/FPDTamu/TFPDTamuData.h
+ 54
− 55
View file @ 8cee694f
......@@ -50,12 +50,12 @@ class TFPDTamuData : public TObject {
// Avalanche Resistive Wire, Resistive: reading on both ends
// Energy
vector<UShort_t> fFPDTamu_AWire_E_DetectorNbr;
vector<Double_t> fFPDTamu_AWire_Energy_Left;
vector<Double_t> fFPDTamu_AWire_Energy_Right;
vector<Double_t> fFPDTamu_AWire_E_DetectorSide; // 0 Left, 1 Right
vector<Double_t> fFPDTamu_AWire_Energy;
// Time
vector<UShort_t> fFPDTamu_AWire_T_DetectorNbr;
vector<Double_t> fFPDTamu_AWire_Time_Left;
vector<Double_t> fFPDTamu_AWire_Time_Right;
vector<Double_t> fFPDTamu_AWire_T_DetectorSide; // 0 Left, 1 Right
vector<Double_t> fFPDTamu_AWire_Time;
// MicroMega Plate
// Energy
......@@ -69,11 +69,11 @@ class TFPDTamuData : public TObject {
// Plastic Scintillator, Left and Right PMTs
// Energy
vector<Double_t> fFPDTamu_Plast_Energy_Left;
vector<Double_t> fFPDTamu_Plast_Energy_Right;
vector<Double_t> fFPDTamu_Plast_E_DetectorSide; // 0 Left, 1 Right
vector<Double_t> fFPDTamu_Plast_Energy;
// Time
vector<Double_t> fFPDTamu_Plast_Time_Left;
vector<Double_t> fFPDTamu_Plast_Time_Right;
vector<Double_t> fFPDTamu_Plast_T_DetectorSide; // 0 Left, 1 Right
vector<Double_t> fFPDTamu_Plast_Time;
//////////////////////////////////////////////////////////////
// Constructor and destructor
......@@ -123,26 +123,26 @@ class TFPDTamuData : public TObject {
// Energy
inline void Set_AWire_E_DetectorNbr(const UShort_t& DetNbr)
{fFPDTamu_AWire_E_DetectorNbr.push_back(DetNbr);} //!
inline void Set_AWire_Energy_Left(const Double_t& Energy)
{fFPDTamu_AWire_Energy_Left.push_back(Energy);}//!
inline void Set_AWire_Energy_Right(const Double_t& Energy)
{fFPDTamu_AWire_Energy_Right.push_back(Energy);}//!
inline void Set_AWire_E(const UShort_t& DetNbr,const Double_t& EnergyLeft, const Double_t& EnergyRight) {
inline void Set_AWire_E_DetectorSide(const UShort_t& DetSide) // 0 Left, 1 Right
{fFPDTamu_AWire_E_DetectorSide.push_back(DetSide);} //!
inline void Set_AWire_Energy(const Double_t& Energy)
{fFPDTamu_AWire_Energy.push_back(Energy);}//!
inline void Set_AWire_E(const UShort_t& DetNbr,const UShort_t& DetSide, const Double_t& Energy) {
Set_AWire_E_DetectorNbr(DetNbr);
Set_AWire_Energy_Left(EnergyLeft);
Set_AWire_Energy_Right(EnergyRight);
Set_AWire_E_DetectorSide(DetSide);
Set_AWire_Energy(Energy);
};//!
// Time
inline void Set_AWire_T_DetectorNbr(const UShort_t& DetNbr)
{fFPDTamu_AWire_T_DetectorNbr.push_back(DetNbr);} //!
inline void Set_AWire_Time_Left(const Double_t& Time)
{fFPDTamu_AWire_Time_Left.push_back(Time);}//!
inline void Set_AWire_Time_Right(const Double_t& Time)
{fFPDTamu_AWire_Time_Right.push_back(Time);}//!
inline void Set_AWire_T(const UShort_t& DetNbr,const Double_t& TimeLeft, const Double_t& TimeRight) {
inline void Set_AWire_T_DetectorSide(const UShort_t& DetSide) // 0 Left, 1 Right
{fFPDTamu_AWire_T_DetectorSide.push_back(DetSide);} //!
inline void Set_AWire_Time(const Double_t& Time)
{fFPDTamu_AWire_Time.push_back(Time);}//!
inline void Set_AWire_T(const UShort_t& DetNbr,const UShort_t& DetSide, const Double_t& Time) {
Set_AWire_T_DetectorNbr(DetNbr);
Set_AWire_Time_Left(TimeLeft);
Set_AWire_Time_Right(TimeRight);
Set_AWire_T_DetectorSide(DetSide);
Set_AWire_Time(Time);
};//!
// MicroMega Plate
......@@ -173,25 +173,24 @@ class TFPDTamuData : public TObject {
// Plastic Scintillator
// Energy
inline void Set_Plast_Energy_Left(const Double_t& Energy)
{fFPDTamu_Plast_Energy_Left.push_back(Energy);}//!
inline void Set_Plast_Energy_Right(const Double_t& Energy)
{fFPDTamu_Plast_Energy_Right.push_back(Energy);}//!
inline void Set_Plast_E(const Double_t& EnergyLeft, const Double_t& EnergyRight) {
Set_Plast_Energy_Left(EnergyLeft);
Set_Plast_Energy_Right(EnergyRight);
inline void Set_Plast_E_DetectorSide(const UShort_t& DetSide) // 0 Left, 1 Right
{fFPDTamu_Plast_E_DetectorSide.push_back(DetSide);} //!
inline void Set_Plast_Energy(const Double_t& Energy)
{fFPDTamu_Plast_Energy.push_back(Energy);}//!
inline void Set_Plast_E(const UShort_t& DetSide, const Double_t& Energy) {
Set_Plast_E_DetectorSide(DetSide);
Set_Plast_Energy(Energy);
};//!
// Time
inline void Set_Plast_Time_Left(const Double_t& Time)
{fFPDTamu_Plast_Time_Left.push_back(Time);}//!
inline void Set_Plast_Time_Right(const Double_t& Time)
{fFPDTamu_Plast_Time_Right.push_back(Time);}//!
inline void Set_Plast_T(const Double_t& TimeLeft, const Double_t& TimeRight) {
Set_Plast_Time_Left(TimeLeft);
Set_Plast_Time_Right(TimeRight);
inline void Set_Plast_T_DetectorSide(const UShort_t& DetSide) // 0 Left, 1 Right
{fFPDTamu_Plast_T_DetectorSide.push_back(DetSide);} //!
inline void Set_Plast_Time(const Double_t& Time)
{fFPDTamu_Plast_Time.push_back(Time);}//!
inline void Set_Plast_T(const UShort_t& DetSide, const Double_t& Time) {
Set_Plast_T_DetectorSide(DetSide);
Set_Plast_Time(Time);
};//!
////////////////////// GETTERS ////////////////////////
//DeltaE ionisation chamber
// Energy
......@@ -215,19 +214,19 @@ class TFPDTamuData : public TObject {
{return fFPDTamu_AWire_E_DetectorNbr.size();}
inline UShort_t Get_AWire_E_DetectorNbr(const unsigned int &i) const
{return fFPDTamu_AWire_E_DetectorNbr[i];} //!
inline Double_t Get_AWire_Energy_Left(const unsigned int &i) const
{return fFPDTamu_AWire_Energy_Left[i];}//!
inline Double_t Get_AWire_Energy_Right(const unsigned int &i) const
{return fFPDTamu_AWire_Energy_Right[i];}//!
inline UShort_t Get_AWire_E_DetectorSide(const unsigned int &i) const
{return fFPDTamu_AWire_E_DetectorSide[i];}//!
inline Double_t Get_AWire_Energy(const unsigned int &i) const
{return fFPDTamu_AWire_Energy[i];}//!
// Time
inline UShort_t Get_AWire_Time_Mult() const
{return fFPDTamu_AWire_T_DetectorNbr.size();}
inline UShort_t Get_AWire_T_DetectorNbr(const unsigned int &i) const
{return fFPDTamu_AWire_T_DetectorNbr[i];} //!
inline Double_t Get_AWire_Time_Left(const unsigned int &i) const
{return fFPDTamu_AWire_Time_Left[i];}//!
inline Double_t Get_AWire_Time_Right(const unsigned int &i) const
{return fFPDTamu_AWire_Time_Right[i];}//!
inline UShort_t Get_AWire_T_DetectorSide(const unsigned int &i) const
{return fFPDTamu_AWire_T_DetectorSide[i];}//!
inline Double_t Get_AWire_Time(const unsigned int &i) const
{return fFPDTamu_AWire_Time[i];}//!
// MicroMega Plate
// Energy
......@@ -252,18 +251,18 @@ class TFPDTamuData : public TObject {
// Plastic Scintillator
// Energy
inline UShort_t Get_Plast_Energy_Mult() const
{return fFPDTamu_Plast_Energy_Left.size();}
inline Double_t Get_Plast_Energy_Left(const unsigned int &i) const
{return fFPDTamu_Plast_Energy_Left[i];} //!
inline Double_t Get_Plast_Energy_Right(const unsigned int &i) const
{return fFPDTamu_Plast_Energy_Right[i];} //!
{return fFPDTamu_Plast_E_DetectorSide.size();}
inline UShort_t Get_Plast_E_DetectorSide(const unsigned int &i) const
{return fFPDTamu_Plast_E_DetectorSide[i];} //!
inline Double_t Get_Plast_Energy(const unsigned int &i) const
{return fFPDTamu_Plast_Energy[i];} //!
// Time
inline UShort_t Get_Plast_Time_Mult() const
{return fFPDTamu_Plast_Time_Left.size();}
inline Double_t Get_Plast_Time_Left(const unsigned int &i) const
{return fFPDTamu_Plast_Time_Left[i];} //!
inline Double_t Get_Plast_Time_Right(const unsigned int &i) const
{return fFPDTamu_Plast_Time_Right[i];} //!
{return fFPDTamu_Plast_T_DetectorSide.size();}
inline UShort_t Get_Plast_T_DetectorSide(const unsigned int &i) const
{return fFPDTamu_Plast_T_DetectorSide[i];} //!
inline Double_t Get_Plast_Time(const unsigned int &i) const
{return fFPDTamu_Plast_Time[i];} //!
//////////////////////////////////////////////////////////////
// Required for ROOT dictionnary
......
NPLib/Detectors/FPDTamu/TFPDTamuSpectra.cxx
+ 43
− 25
View file @ 8cee694f
......@@ -110,6 +110,7 @@ void TFPDTamuSpectra::InitPhysicsSpectra() {
////////////////////////////////////////////////////////////////////////////////
void TFPDTamuSpectra::FillRawSpectra(TFPDTamuData* RawData) {
static string name;
static int side; // Left 0 or Right 1
static string family;
//DeltaE ionisation chamber
......@@ -136,18 +137,22 @@ void TFPDTamuSpectra::FillRawSpectra(TFPDTamuData* RawData) {
for (unsigned int i = 0; i < sizeE; i++) {
name = "FPDTamu"+NPL::itoa(RawData->Get_AWire_E_DetectorNbr(i))+"_ENERGY_RAW";
family = "FPDTamu/AWire/RAW";
GetHisto(family,name+"_Left") -> Fill(RawData->Get_AWire_Energy_Left(i));
GetHisto(family,name+"_Right") -> Fill(RawData->Get_AWire_Energy_Right(i));
side = RawData->Get_AWire_E_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(RawData->Get_AWire_Energy(i));
else
GetHisto(family,name+"_Right") -> Fill(RawData->Get_AWire_Energy(i));
}
// Time
sizeT = RawData->Get_AWire_Time_Mult();
for (unsigned int i = 0; i < sizeT; i++) {
name = "FPDTamu"+NPL::itoa(RawData->Get_AWire_T_DetectorNbr(i))+"_TIME_RAW";
family = "FPDTamu/AWire/RAW";
GetHisto(family,name+"_Left") -> Fill(RawData->Get_AWire_Time_Left(i));
GetHisto(family,name+"_Right") -> Fill(RawData->Get_AWire_Time_Right(i));
side = RawData->Get_AWire_T_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(RawData->Get_AWire_Time(i));
else
GetHisto(family,name+"_Right") -> Fill(RawData->Get_AWire_Time(i));
}
// MicroMega Plate
......@@ -176,18 +181,22 @@ void TFPDTamuSpectra::FillRawSpectra(TFPDTamuData* RawData) {
for (unsigned int i = 0; i < sizeE; i++) {
name = "FPDTamu_ENERGY_RAW";
family = "FPDTamu/Plast/RAW";
GetHisto(family,name+"_Left") -> Fill(RawData->Get_Plast_Energy_Left(i));
GetHisto(family,name+"_Right") -> Fill(RawData->Get_Plast_Energy_Right(i));
side = RawData->Get_Plast_E_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(RawData->Get_Plast_Energy(i));
else
GetHisto(family,name+"_Right") -> Fill(RawData->Get_Plast_Energy(i));
}
// Time
sizeT = RawData->Get_Plast_Time_Mult();
for (unsigned int i = 0; i < sizeT; i++) {
name = "FPDTamu_TIME_RAW";
family = "FPDTamu/Plast/RAW";
GetHisto(family,name+"_Left") -> Fill(RawData->Get_Plast_Time_Left(i));
GetHisto(family,name+"_Right") -> Fill(RawData->Get_Plast_Time_Right(i));
side = RawData->Get_Plast_T_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(RawData->Get_Plast_Time(i));
else
GetHisto(family,name+"_Right") -> Fill(RawData->Get_Plast_Time(i));
}
......@@ -199,6 +208,7 @@ void TFPDTamuSpectra::FillRawSpectra(TFPDTamuData* RawData) {
void TFPDTamuSpectra::FillPreTreatedSpectra(TFPDTamuData* PreTreatedData) {
static string name;
static string family;
static int side; // Left 0 or Right 1
//DeltaE ionisation chamber
// Energy
......@@ -223,19 +233,23 @@ void TFPDTamuSpectra::FillPreTreatedSpectra(TFPDTamuData* PreTreatedData) {
sizeE = PreTreatedData->Get_AWire_Energy_Mult();
for (unsigned int i = 0; i < sizeE; i++) {
name = "FPDTamu"+NPL::itoa(PreTreatedData->Get_AWire_E_DetectorNbr(i))+"_ENERGY_CAL";
family = "FPDTamu/AWire/CAL";
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_AWire_Energy_Left(i));
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_AWire_Energy_Right(i));
family = "FPDTamu/AWire/CAL";
side = PreTreatedData->Get_AWire_E_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_AWire_Energy(i));
else
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_AWire_Energy(i));
}
// Time
sizeT = PreTreatedData->Get_AWire_Time_Mult();
for (unsigned int i = 0; i < sizeT; i++) {
name = "FPDTamu"+NPL::itoa(PreTreatedData->Get_AWire_T_DetectorNbr(i))+"_TIME_CAL";
family = "FPDTamu/AWire/CAL";
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_AWire_Time_Left(i));
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_AWire_Time_Right(i));
side = PreTreatedData->Get_AWire_T_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_AWire_Time(i));
else
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_AWire_Time(i));
}
// MicroMega Plate
......@@ -264,18 +278,22 @@ void TFPDTamuSpectra::FillPreTreatedSpectra(TFPDTamuData* PreTreatedData) {
for (unsigned int i = 0; i < sizeE; i++) {
name = "FPDTamu_ENERGY_CAL";
family = "FPDTamu/Plast/CAL";
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_Plast_Energy_Left(i));
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_Plast_Energy_Right(i));
side = PreTreatedData->Get_Plast_E_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_Plast_Energy(i));
else
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_Plast_Energy(i));
}
// Time
sizeT = PreTreatedData->Get_Plast_Time_Mult();
for (unsigned int i = 0; i < sizeT; i++) {
name = "FPDTamu_TIME_CAL";
family = "FPDTamu/Plast/CAL";
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_Plast_Time_Left(i));
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_Plast_Time_Right(i));
side = PreTreatedData->Get_Plast_T_DetectorSide(i);
if (side==0)
GetHisto(family,name+"_Left") -> Fill(PreTreatedData->Get_Plast_Time(i));
else
GetHisto(family,name+"_Right") -> Fill(PreTreatedData->Get_Plast_Time(i));
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment