OpenCMT/uLib
1
0
Fork 0
mirror of https://github.com/OpenCMT/uLib.git synced 2025-12-06 15:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed macros.h and pimpl

Browse Source
This commit is contained in:
Paolo Andreetto
2019-05-10 13:22:00 +00:00
parent c00e4a6382
commit d02a095028
16 changed files with 363 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Detectors/HitMC.h
View File

@@ -28,7 +28,6 @@
#ifndef U_HITMC_H
#define U_HITMC_H
#include "Core/Macros.h"
#include "Math/Dense.h"
#include "Hit.h"
@@ -43,10 +42,10 @@ public:
DeltaRay
};
uLibConstRefMacro(Position,HPoint3f)
uLibGetMacro(Type, enum Type)
inline const HPoint3f & Position() const { return this->m_Position; }
inline enum Type GetType() const { return this->m_Type; }
private:
protected:
HPoint3f m_Position;
enum Type m_Type;
};
@@ -54,8 +53,8 @@ private:
class HitMC : public HitMCData {
public:
uLibRefMacro(Position,HPoint3f)
uLibSetMacro(Type, enum Type)
inline HPoint3f & Position() { return this->m_Position; }
inline void SetType(enum Type name) { this->m_Type = name; }
};

38
src/Detectors/LinearFit.h
View File

@@ -28,7 +28,6 @@
#ifndef U_LINEARFIT_H
#define U_LINEARFIT_H
#include "Core/Macros.h"
#include "Math/Dense.h"
#include "ChamberDetector.h"
@@ -37,32 +36,31 @@ namespace uLib {
class LinearFitData {
public:
uLibConstRefMacro(Position,Vector2f)
uLibConstRefMacro(Slope,Vector2f)
uLibConstRefMacro(PositionError,Vector2f)
uLibConstRefMacro(SlopeError,Vector2f)
uLibGetMacro(HitsNumber,int)
uLibGetMacro(Idv,ChamberDetector::ID)
inline const Vector2f & Position() const { return this->m_Position; }
inline const Vector2f & Slope() const { return this->m_Slope; }
inline const Vector2f & PositionError() const { return this->m_PositionError; }
inline const Vector2f & SlopeError() const { return this->m_SlopeError; }
inline int GetHitsNumber() const { return this->m_HitsNumber; }
inline ChamberDetector::ID GetIdv() const { return this->m_Idv; }
private:
friend class LinearFit;
Vector2f m_Position;
Vector2f m_Slope;
Vector2f m_PositionError;
Vector2f m_SlopeError;
int m_HitsNumber;
protected:
Vector2f m_Position;
Vector2f m_Slope;
Vector2f m_PositionError;
Vector2f m_SlopeError;
int m_HitsNumber;
DetectorChamber::ID m_Idv;
};
class LinearFit : public LinearFitData {
public:
uLibRefMacro(Position,Vector2f)
uLibRefMacro(Slope,Vector2f)
uLibRefMacro(PositionError,Vector2f)
uLibRefMacro(SlopeError,Vector2f)
uLibSetMacro(HitsNumber,int)
uLibSetMacro(Idv,ChamberDetector::ID)
inline Vector2f & Position() { return this->m_Position; }
inline Vector2f & Slope() { return this->m_Slope; }
inline Vector2f & PositionError() { return this->m_PositionError; }
inline Vector2f & SlopeError() { return this->m_SlopeError; }
inline void SetHitsNumber(int name) { this->m_HitsNumber = name; }
inline void SetIdv(ChamberDetector::ID name) { this->m_Idv = name; }
};

12
src/Detectors/MuonError.h
View File

@@ -28,18 +28,16 @@
#ifndef U_MUONERROR_H
#define U_MUONERROR_H
#include "Core/Macros.h"
#include "Math/Dense.h"
namespace uLib {
class MuonErrorData {
friend class MuonError;
public:
uLibConstRefMacro(Theta,Scalarf)
uLibConstRefMacro(Phi,Scalarf)
private:
inline const Scalarf & Theta() const { return this->m_Theta; }
inline const Scalarf & Phi() const { return this->m_Phi; }
protected:
Scalarf m_Theta;
Scalarf m_Phi;
};
@@ -47,8 +45,8 @@ private:
class MuonError : public MuonErrorData {
public:
uLibRefMacro(Theta,Scalarf)
uLibRefMacro(Phi,Scalarf)
inline Scalarf & Theta() { return this->m_Theta; }
inline Scalarf & Phi() { return this->m_Phi; }
};

16
src/Detectors/MuonEvent.h
View File

@@ -28,20 +28,18 @@
#ifndef U_MUONEVENT_H
#define U_MUONEVENT_H
#include "Core/Macros.h"
#include "Math/Dense.h"
namespace uLib {
class MuonEventData {
friend class MuonEvent;
public:
uLibConstRefMacro(LineIn,HLine3f)
uLibConstRefMacro(LineOut,HLine3f)
uLibGetMacro(Momentum,Scalarf)
inline const HLine3f & LineIn() const { return this->m_LineIn; }
inline const HLine3f & LineOut() const { return this->m_LineOut; }
inline Scalarf GetMomentum() const { return this->m_Momentum; }
private:
protected:
HLine3f m_LineIn;
HLine3f m_LineOut;
Scalarf m_Momentum;
@@ -50,9 +48,9 @@ private:
class MuonEvent : public MuonEventData {
public:
uLibRefMacro(LineIn,HLine3f)
uLibRefMacro(LineOut,HLine3f)
uLibRefMacro(Momentum,Scalarf)
inline HLine3f & LineIn() { return this->m_LineIn; }
inline HLine3f & LineOut() { return this->m_LineOut; }
inline Scalarf & Momentum() { return this->m_Momentum; }
};

26
src/Detectors/MuonScatter.h
View File

@@ -29,7 +29,6 @@
#ifndef U_MUONSCATTER_H
#define U_MUONSCATTER_H
#include "Core/Macros.h"
#include "Math/Dense.h"
namespace uLib {
@@ -37,20 +36,21 @@ namespace uLib {
class MuonScatter {
public:
uLibConstRefMacro(LineIn,HLine3f)
uLibConstRefMacro(ErrorIn,HError3f)
uLibConstRefMacro(LineOut,HLine3f)
uLibConstRefMacro(ErrorOut,HError3f)
inline const HLine3f & LineIn() const { return this->m_LineIn; }
inline const HError3f & ErrorIn() const { return this->m_ErrorIn; }
inline const HLine3f & LineOut() const { return this->m_LineOut; }
inline const HError3f & ErrorOut() const { return this->m_ErrorOut; }
uLibRefMacro(LineIn,HLine3f)
uLibRefMacro(ErrorIn,HError3f)
uLibRefMacro(LineOut,HLine3f)
uLibRefMacro(ErrorOut,HError3f)
uLibSetMacro(Momentum,Scalarf)
uLibSetMacro(MomentumPrime,Scalarf)
inline HLine3f & LineIn() { return this->m_LineIn; }
inline HError3f & ErrorIn() { return this->m_ErrorIn; }
inline HLine3f & LineOut() { return this->m_LineOut; }
inline HError3f & ErrorOut() { return this->m_ErrorOut; }
uLibGetMacro(Momentum,Scalarf)
uLibGetMacro(MomentumPrime,Scalarf)
inline void SetMomentum(Scalarf name) { this->m_Momentum = name; }
inline void SetMomentumPrime(Scalarf name) { this->m_MomentumPrime = name; }
inline Scalarf GetMomentum() const { return this->m_Momentum; }
inline Scalarf GetMomentumPrime() const { return this->m_MomentumPrime; }
protected:
HLine3f m_LineIn;