Commit 980dc392 authored by Adrien Matta's avatar Adrien Matta
Browse files

* Cleaning up a few older detector Data class

parent 32eda42a
Pipeline #123430 passed with stages
in 3 minutes and 42 seconds
......@@ -24,18 +24,17 @@
#include <vector>
#include "TObject.h"
using namespace std ;
class TSSSDData : public TObject {
private:
// SSSD
// Energy
vector<UShort_t> fSSSD_StripE_DetectorNbr;
vector<UShort_t> fSSSD_StripE_StripNbr;
vector<Double_t> fSSSD_StripE_Energy;
std::vector<UShort_t> fSSSD_StripE_DetectorNbr;
std::vector<UShort_t> fSSSD_StripE_StripNbr;
std::vector<Double_t> fSSSD_StripE_Energy;
// Time
vector<UShort_t> fSSSD_StripT_DetectorNbr;
vector<UShort_t> fSSSD_StripT_StripNbr;
vector<Double_t> fSSSD_StripT_Time;
std::vector<UShort_t> fSSSD_StripT_DetectorNbr;
std::vector<UShort_t> fSSSD_StripT_StripNbr;
std::vector<Double_t> fSSSD_StripT_Time;
public:
......
......@@ -24,33 +24,32 @@
// STL
#include <vector>
using namespace std;
// ROOT
#include "TObject.h"
class TSconeData : public TObject {
//////////////////////////////////////////////////////////////
// data members are hold into vectors in order
// data members are hold into std::vectors in order
// to allow multiplicity treatment
private:
// Energy
vector<UShort_t> fScone_E_DetectorNbr;
vector<UShort_t> fScone_E_PlasticNbr;
vector<Double_t> fScone_Energy;
std::vector<UShort_t> fScone_E_DetectorNbr;
std::vector<UShort_t> fScone_E_PlasticNbr;
std::vector<Double_t> fScone_Energy;
// Time
vector<UShort_t> fScone_T_DetectorNbr;
vector<UShort_t> fScone_T_PlasticNbr;
vector<Double_t> fScone_Time;
std::vector<UShort_t> fScone_T_DetectorNbr;
std::vector<UShort_t> fScone_T_PlasticNbr;
std::vector<Double_t> fScone_Time;
// Flag for simulation
vector<UShort_t> fScone_HasCaptured; //=1 for neutron capture on H, 2 on Gd 0 otherwise
vector<double> fScone_CaptureTime;
vector<double> fScone_GammaEnergy;
vector<double> fScone_ProtonEnergy;
vector<double> fScone_ProtonTime;
vector<int> fScone_FCProcess;
std::vector<UShort_t> fScone_HasCaptured; //=1 for neutron capture on H, 2 on Gd 0 otherwise
std::vector<double> fScone_CaptureTime;
std::vector<double> fScone_GammaEnergy;
std::vector<double> fScone_ProtonEnergy;
std::vector<double> fScone_ProtonTime;
std::vector<int> fScone_FCProcess;
//////////////////////////////////////////////////////////////
// Constructor and destructor
public:
......
......@@ -23,10 +23,7 @@
*****************************************************************************/
// STL
#include <stdlib.h>
#include <vector>
#include <map>
using namespace std ;
// ROOT
#include "TNamed.h"
......@@ -35,25 +32,25 @@ class TSharcData : public TNamed {
private:
// Sharc
// Energy
vector<UShort_t> fSharc_StripFront_DetectorNbr;
vector<UShort_t> fSharc_StripFront_StripNbr;
vector<Double_t> fSharc_StripFront_Energy;
vector<Double_t> fSharc_StripFront_TimeCFD;
vector<Double_t> fSharc_StripFront_TimeLED;
vector<Double_t> fSharc_StripFront_Time;
std::vector<UShort_t> fSharc_StripFront_DetectorNbr;
std::vector<UShort_t> fSharc_StripFront_StripNbr;
std::vector<Double_t> fSharc_StripFront_Energy;
std::vector<Double_t> fSharc_StripFront_TimeCFD;
std::vector<Double_t> fSharc_StripFront_TimeLED;
std::vector<Double_t> fSharc_StripFront_Time;
vector<UShort_t> fSharc_StripBack_DetectorNbr;
vector<UShort_t> fSharc_StripBack_StripNbr;
vector<Double_t> fSharc_StripBack_Energy;
vector<Double_t> fSharc_StripBack_TimeCFD;
vector<Double_t> fSharc_StripBack_TimeLED;
vector<Double_t> fSharc_StripBack_Time;
vector<UShort_t> fSharc_PAD_DetectorNbr;
vector<Double_t> fSharc_PAD_Energy;
vector<Double_t> fSharc_PAD_TimeCFD;
vector<Double_t> fSharc_PAD_TimeLED;
vector<Double_t> fSharc_PAD_Time;
std::vector<UShort_t> fSharc_StripBack_DetectorNbr;
std::vector<UShort_t> fSharc_StripBack_StripNbr;
std::vector<Double_t> fSharc_StripBack_Energy;
std::vector<Double_t> fSharc_StripBack_TimeCFD;
std::vector<Double_t> fSharc_StripBack_TimeLED;
std::vector<Double_t> fSharc_StripBack_Time;
std::vector<UShort_t> fSharc_PAD_DetectorNbr;
std::vector<Double_t> fSharc_PAD_Energy;
std::vector<Double_t> fSharc_PAD_TimeCFD;
std::vector<Double_t> fSharc_PAD_TimeLED;
std::vector<Double_t> fSharc_PAD_Time;
public:
TSharcData();
......
......@@ -20,7 +20,7 @@
*****************************************************************************/
#include <iostream>
#include "TSiLiData.h"
using namespace std;
ClassImp(TSiLiData)
......
......@@ -23,17 +23,16 @@
#include <vector>
#include "TObject.h"
using namespace std ;
class TSiLiData : public TObject {
private:
// Energy
vector<short> fSiLi_E_Number;
vector<double> fSiLi_E_Energy;
std::vector<short> fSiLi_E_Number;
std::vector<double> fSiLi_E_Energy;
// Time
vector<short> fSiLi_T_Number;
vector<double> fSiLi_T_Time;
std::vector<short> fSiLi_T_Number;
std::vector<double> fSiLi_T_Time;
public:
TSiLiData();
......
......@@ -20,7 +20,7 @@
*****************************************************************************/
#include <iostream>
#include "TSiResData.h"
using namespace std;
ClassImp(TSiResData)
......
......@@ -24,20 +24,19 @@
#include <iostream>
#include "TObject.h"
using namespace std ;
class TSiResData : public TObject {
private:
// Energy
vector<int> fSiRes_E_Number;
vector<int> fSiRes_E_Channel;
vector<double> fSiRes_E_Energy;
std::vector<int> fSiRes_E_Number;
std::vector<int> fSiRes_E_Channel;
std::vector<double> fSiRes_E_Energy;
// Time
vector<int> fSiRes_T_Number;
vector<double> fSiRes_T_Time;
vector<int> fSiRes_E_EnergyBack_Number;
vector<double> fSiRes_E_EnergyBack;
std::vector<int> fSiRes_T_Number;
std::vector<double> fSiRes_T_Time;
std::vector<int> fSiRes_E_EnergyBack_Number;
std::vector<double> fSiRes_E_EnergyBack;
public:
TSiResData();
......
......@@ -25,7 +25,6 @@
#include "TObject.h"
#include <vector>
using namespace std;
......@@ -38,8 +37,8 @@ class TSplitPoleData : public TObject
Double_t fPlasticP;
Double_t fPlasticG;
Double_t fTick; // data from scaler
vector<Double_t> fTime1; // ch 117
vector<Double_t> fTime2; // ch 126
std::vector<Double_t> fTime1; // ch 117
std::vector<Double_t> fTime2; // ch 126
public:
......
Markdown is supported
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