diff --git a/NPLib/Detectors/MDM/TMDMData.cxx b/NPLib/Detectors/MDM/TMDMData.cxx index b43984f745806780e502624907ddbdb90065eb0b..d7c097c815642a43c16bb7e722ed2aa79b5b61ec 100644 --- a/NPLib/Detectors/MDM/TMDMData.cxx +++ b/NPLib/Detectors/MDM/TMDMData.cxx @@ -49,6 +49,8 @@ void TMDMData::Clear() { fMDM_Xpos.clear(); // Y fMDM_Ypos.clear(); + // + fMDM_Kinetic_Energy.clear(); // ID fMDM_Particle_Mass.clear(); fMDM_Particle_Charge.clear(); @@ -69,6 +71,7 @@ void TMDMData::Dump() const { cout << "DetNbr: " << fMDM_DetectorNbr[i] << ", X position: " << fMDM_Xpos[i] << ", Y position: " << fMDM_Ypos[i] + << ", Kinetic Energy: " << fMDM_Kinetic_Energy[i] << ", Particle Mass: " << fMDM_Particle_Mass[i] << ", Particle Charge: " << fMDM_Particle_Charge[i] << endl; } diff --git a/NPLib/Detectors/MDM/TMDMData.h b/NPLib/Detectors/MDM/TMDMData.h index a3669fc829a9df1a853bb60c9f0ea5a0b37c14ee..e36338ecb9bc8a7a9c3c07b4ef0f9ac802731a95 100644 --- a/NPLib/Detectors/MDM/TMDMData.h +++ b/NPLib/Detectors/MDM/TMDMData.h @@ -43,6 +43,9 @@ class TMDMData : public TObject { // Y - position vector<Double_t> fMDM_Ypos; + // Kinetic Energy + vector<Double_t> fMDM_Kinetic_Energy; + // Particle ID vector<UShort_t> fMDM_Particle_Charge; vector<Double_t> fMDM_Particle_Mass; @@ -71,10 +74,11 @@ class TMDMData : public TObject { public: ////////////////////// SETTERS //////////////////////// // - inline void SetHit(UShort_t DetNbr, Double_t x, Double_t y, UShort_t charge, Double_t mass){ + inline void SetHit(UShort_t DetNbr, Double_t x, Double_t y, UShort_t charge, Double_t mass, Double_t eKin = 0){ fMDM_DetectorNbr.push_back(DetNbr); fMDM_Xpos.push_back(x); fMDM_Ypos.push_back(y); + fMDM_Kinetic_Energy.push_back(eKin); fMDM_Particle_Mass.push_back(mass); fMDM_Particle_Charge.push_back(charge); };//! @@ -91,6 +95,9 @@ class TMDMData : public TObject { // Y - position inline Double_t Get_Ypos(const unsigned int &i) const {return fMDM_Ypos[i];}//! + // Kinetic Energy + inline Double_t Get_Kinetic_Energy(const unsigned int &i) const + {return fMDM_Kinetic_Energy[i];}//! // Particle ID inline Double_t GetParticleMass(const unsigned int& i) const {return fMDM_Particle_Mass[i];}//! @@ -99,7 +106,7 @@ class TMDMData : public TObject { ////////////////////////////////////////////////////////////// // Required for ROOT dictionnary - ClassDef(TMDMData,2) // MDMData structure + ClassDef(TMDMData,3) // MDMData structure }; #endif diff --git a/NPLib/Detectors/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Detectors/Tiara/TTiaraBarrelPhysics.cxx index 733b2cced2409762cc232b6762d337e23a5a335e..be5452d94ca66805cff09379e419d1b19e311ef2 100644 --- a/NPLib/Detectors/Tiara/TTiaraBarrelPhysics.cxx +++ b/NPLib/Detectors/Tiara/TTiaraBarrelPhysics.cxx @@ -78,6 +78,7 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){ unsigned int sizeU = m_PreTreatedData->GetFrontUpstreamEMult(); unsigned int sizeO = m_PreTreatedData->GetOuterEMult(); + EventMultiplicity = sizeU; static string name; // token diff --git a/NPSimulation/Detectors/MDM/MDM.cc b/NPSimulation/Detectors/MDM/MDM.cc index 4019ea09c95f395b8e72ab5f1d497ee361628c9a..b3fd7c7852f2df9add78fc89c87a7d25f568e8cc 100644 --- a/NPSimulation/Detectors/MDM/MDM.cc +++ b/NPSimulation/Detectors/MDM/MDM.cc @@ -234,7 +234,7 @@ void MDM::ReadSensitive(const G4Event* event){ // Set X, Y positions in TMDMData class for(int i=0; i< 4; ++i) { - m_Event->SetHit(i, x[i], y[i], Charge, Mass/amu_c2); + m_Event->SetHit(i, x[i], y[i], Charge, Mass/amu_c2, Ekin/MeV); } ++indx;