Skip to content
Snippets Groups Projects
Commit e50112df authored by Jan de Cuveland's avatar Jan de Cuveland Committed by Florian Uhlig
Browse files

Revert the transition of Double32_t to double

parent f47b1eb4
No related branches found
No related tags found
No related merge requests found
Pipeline #14703 passed
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#define CBMMCEVENT_H 1 #define CBMMCEVENT_H 1
#include <Rtypes.h> #include <Rtypes.h>
#include <RtypesCore.h>
#include <TNamed.h> #include <TNamed.h>
#include <TVector3.h> #include <TVector3.h>
...@@ -81,12 +82,12 @@ public: ...@@ -81,12 +82,12 @@ public:
private: private:
uint32_t fRunId; // Run identifier uint32_t fRunId; // Run identifier
uint32_t fEventId; // Event identifier uint32_t fEventId; // Event identifier
double fX; // Primary vertex x [cm] Double32_t fX; // Primary vertex x [cm]
double fY; // Primary vertex y [cm] Double32_t fY; // Primary vertex y [cm]
double fZ; // Primary vertex z [cm] Double32_t fZ; // Primary vertex z [cm]
double fT; // Event time [s] Double32_t fT; // Event time [s]
double fB; // Impact parameter [fm] (if relevant) Double32_t fB; // Impact parameter [fm] (if relevant)
double fPhi; // Event plane angle [rad] (if relevant) Double32_t fPhi; // Event plane angle [rad] (if relevant)
int32_t fNPrim; // Number of input tracks int32_t fNPrim; // Number of input tracks
bool fIsSet; // Flag whether variables are filled bool fIsSet; // Flag whether variables are filled
... ...
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "CbmDefs.h" // for ECbmModuleId, ECbmModuleId::kMvd, ECbmModuleId::kPsd, ECbmModuleId::kSts #include "CbmDefs.h" // for ECbmModuleId, ECbmModuleId::kMvd, ECbmModuleId::kPsd, ECbmModuleId::kSts
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef #include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TLorentzVector.h> // for TLorentzVector #include <TLorentzVector.h> // for TLorentzVector
#include <TObject.h> // for TObject #include <TObject.h> // for TObject
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
...@@ -125,13 +126,13 @@ private: ...@@ -125,13 +126,13 @@ private:
int32_t fMotherId; int32_t fMotherId;
/** Momentum components at start vertex [GeV] **/ /** Momentum components at start vertex [GeV] **/
double fPx, fPy, fPz; Double32_t fPx, fPy, fPz;
/** energy at start vertex [GeV] **/ /** energy at start vertex [GeV] **/
double fE; Double32_t fE;
/** Coordinates of start vertex [cm, ns] **/ /** Coordinates of start vertex [cm, ns] **/
double fStartX, fStartY, fStartZ, fStartT; Double32_t fStartX, fStartY, fStartZ, fStartT;
/** Bitvector representing the number of MCPoints for this track in /** Bitvector representing the number of MCPoints for this track in
** each subdetector. The detectors are represented by ** each subdetector. The detectors are represented by
... ...
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <FairTrackParam.h> // for FairTrackParam #include <FairTrackParam.h> // for FairTrackParam
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef #include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TObject.h> // for TObject #include <TObject.h> // for TObject
#include <cstdint> #include <cstdint>
...@@ -104,7 +105,7 @@ protected: ...@@ -104,7 +105,7 @@ protected:
int32_t fFlag; int32_t fFlag;
/** Chi square and NDF of track fit **/ /** Chi square and NDF of track fit **/
double fChiSq; Double32_t fChiSq;
int32_t fNDF; int32_t fNDF;
/** Index of previous track segment **/ /** Index of previous track segment **/
... ...
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <FairTrackParam.h> // for FairTrackParam #include <FairTrackParam.h> // for FairTrackParam
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef #include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TObject.h> // for TObject #include <TObject.h> // for TObject
#include <cstdint> #include <cstdint>
...@@ -92,7 +93,7 @@ private: ...@@ -92,7 +93,7 @@ private:
int32_t fPidHypo; int32_t fPidHypo;
/** Chi2 of global track fit **/ /** Chi2 of global track fit **/
double fChi2; Double32_t fChi2;
/** NDF of global track fit **/ /** NDF of global track fit **/
int32_t fNDF; int32_t fNDF;
...@@ -101,7 +102,7 @@ private: ...@@ -101,7 +102,7 @@ private:
int32_t fFlag; int32_t fFlag;
/** Track length **/ /** Track length **/
double fLength; Double32_t fLength;
ClassDef(CbmGlobalTrack, 3); ClassDef(CbmGlobalTrack, 3);
... ...
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <FairTrackParam.h> // for FairTrackParam #include <FairTrackParam.h> // for FairTrackParam
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TObject.h> // for TObject #include <TObject.h> // for TObject
#include <cstdint> #include <cstdint>
...@@ -98,7 +99,7 @@ public: ...@@ -98,7 +99,7 @@ public:
void SetTrackParameter(const FairTrackParam* par) { fTrackPar = *par; } void SetTrackParameter(const FairTrackParam* par) { fTrackPar = *par; }
/** Set track length **/ /** Set track length **/
void SetTrackLength(double trackLength) { fTrackLength = trackLength; } void SetTrackLength(Double32_t trackLength) { fTrackLength = trackLength; }
/** Set PID hypothesis for track extrapolation to TOF **/ /** Set PID hypothesis for track extrapolation to TOF **/
void SetPidHypo(int32_t pid) { fPidHypo = pid; } void SetPidHypo(int32_t pid) { fPidHypo = pid; }
...@@ -112,11 +113,11 @@ public: ...@@ -112,11 +113,11 @@ public:
private: private:
int32_t fGlbTrack; ///< Index of global track int32_t fGlbTrack; ///< Index of global track
int32_t fTofHit; ///< Index of TofHit int32_t fTofHit; ///< Index of TofHit
double fTrackLength; ///< Track length from primary vertex to TOF [cm] Double32_t fTrackLength; ///< Track length from primary vertex to TOF [cm]
FairTrackParam fTrackPar; ///< Track parameters at z of TofHit FairTrackParam fTrackPar; ///< Track parameters at z of TofHit
int32_t fPidHypo; ///< PID hypothesis used for track extrapolation int32_t fPidHypo; ///< PID hypothesis used for track extrapolation
float fMass; ///< Mass from Tof float fMass; ///< Mass from Tof
double fDistance; ///< Normalized distance from hit to track Double32_t fDistance; ///< Normalized distance from hit to track
ClassDef(CbmTofTrack, 1); ClassDef(CbmTofTrack, 1);
... ...
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define CBMVERTEX_H 1 #define CBMVERTEX_H 1
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TMatrixFSymfwd.h> // for TMatrixFSym #include <TMatrixFSymfwd.h> // for TMatrixFSym
#include <TNamed.h> // for TNamed #include <TNamed.h> // for TNamed
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
...@@ -95,10 +96,10 @@ public: ...@@ -95,10 +96,10 @@ public:
private: private:
/** Position coordinates [cm] **/ /** Position coordinates [cm] **/
double fX, fY, fZ; Double32_t fX, fY, fZ;
/** Chi2 of vertex fit **/ /** Chi2 of vertex fit **/
double fChi2; Double32_t fChi2;
/** Number of degrees of freedom of vertex fit **/ /** Number of degrees of freedom of vertex fit **/
int32_t fNDF; int32_t fNDF;
...@@ -109,7 +110,7 @@ private: ...@@ -109,7 +110,7 @@ private:
/** Covariance matrix for x, y, and z stored in an array. The /** Covariance matrix for x, y, and z stored in an array. The
** sequence is a[0,0], a[0,1], a[0,2], a[1,1], a[1,2], a[2,2] ** sequence is a[0,0], a[0,1], a[0,2], a[1,1], a[1,2], a[2,2]
**/ **/
double fCovMatrix[6]; Double32_t fCovMatrix[6];
ClassDef(CbmVertex, 1); ClassDef(CbmVertex, 1);
... ...
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <FairMCPoint.h> // for FairMCPoint #include <FairMCPoint.h> // for FairMCPoint
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
#include <cstdint> #include <cstdint>
...@@ -89,8 +90,8 @@ public: ...@@ -89,8 +90,8 @@ public:
virtual void Print(const Option_t* opt) const; virtual void Print(const Option_t* opt) const;
protected: protected:
double fX_out, fY_out, fZ_out; Double32_t fX_out, fY_out, fZ_out;
double fPx_out, fPy_out, fPz_out; Double32_t fPx_out, fPy_out, fPz_out;
ClassDef(CbmMuchPoint, 1) ClassDef(CbmMuchPoint, 1)
}; };
... ...
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <FairMCPoint.h> // for FairMCPoint #include <FairMCPoint.h> // for FairMCPoint
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
#include <cstdint> #include <cstdint>
...@@ -95,8 +96,8 @@ public: ...@@ -95,8 +96,8 @@ public:
protected: protected:
double fX_out, fY_out, fZ_out; Double32_t fX_out, fY_out, fZ_out;
double fPx_out, fPy_out, fPz_out; Double32_t fPx_out, fPy_out, fPz_out;
int32_t fPdgCode; // index of the object in its TClonesArray. By default not filled => -1. int32_t fPdgCode; // index of the object in its TClonesArray. By default not filled => -1.
int32_t fPointId; // index of the object in its TClonesArray. By default not filled => -1. int32_t fPointId; // index of the object in its TClonesArray. By default not filled => -1.
int32_t fFrame; int32_t fFrame;
... ...
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <FairMCPoint.h> // for FairMCPoint #include <FairMCPoint.h> // for FairMCPoint
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef #include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
#include <cstdint> #include <cstdint>
...@@ -112,8 +113,8 @@ public: ...@@ -112,8 +113,8 @@ public:
protected: protected:
double fX_out, fY_out, fZ_out; Double32_t fX_out, fY_out, fZ_out;
double fPx_out, fPy_out, fPz_out; Double32_t fPx_out, fPy_out, fPz_out;
int32_t fPid; ///> Particle ID [PDG code] int32_t fPid; ///> Particle ID [PDG code]
int32_t fIndex; ///> Index of point in its TClonesArray int32_t fIndex; ///> Index of point in its TClonesArray
int16_t fFlag; ///> 1 or 3: track entry step; 2 or 3: track exit step int16_t fFlag; ///> 1 or 3: track entry step; 2 or 3: track exit step
... ...
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "CbmTrack.h" // for CbmTrack #include "CbmTrack.h" // for CbmTrack
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <cassert> // for assert #include <cassert> // for assert
#include <cstdint> #include <cstdint>
...@@ -132,7 +133,7 @@ private: ...@@ -132,7 +133,7 @@ private:
/** Impact parameter of track at target z, in units of its error **/ /** Impact parameter of track at target z, in units of its error **/
double fB; Double32_t fB;
/** median dE/dx [e/300µm] **/ /** median dE/dx [e/300µm] **/
float fELoss {-1.f}; float fELoss {-1.f};
... ...
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "CbmTrdAddress.h" // for CbmTrdAddress #include "CbmTrdAddress.h" // for CbmTrdAddress
#include <Rtypes.h> // for CLRBIT, SETBIT, TESTBIT, ClassDef #include <Rtypes.h> // for CLRBIT, SETBIT, TESTBIT, ClassDef
#include <RtypesCore.h> // for Double32_t
#include <cstdint> #include <cstdint>
#include <string> // for string #include <string> // for string
...@@ -96,7 +97,7 @@ public: ...@@ -96,7 +97,7 @@ public:
private: private:
uint8_t fDefine; // hit extra info uint8_t fDefine; // hit extra info
int32_t fNeighborId; // refId in case of row cross clusters int32_t fNeighborId; // refId in case of row cross clusters
double fELoss; // Energy deposit due to TR + dEdx Double32_t fELoss; // Energy deposit due to TR + dEdx
ClassDef(CbmTrdHit, 4); ClassDef(CbmTrdHit, 4);
}; };
... ...
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <FairMCPoint.h> // for FairMCPoint #include <FairMCPoint.h> // for FairMCPoint
#include <Rtypes.h> // for ClassDef #include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double32_t
#include <TVector3.h> // for TVector3 #include <TVector3.h> // for TVector3
#include <cstdint> #include <cstdint>
...@@ -77,8 +78,8 @@ public: ...@@ -77,8 +78,8 @@ public:
void MomentumOut(TVector3& mom) const { mom.SetXYZ(fPx_out, fPy_out, fPz_out); } void MomentumOut(TVector3& mom) const { mom.SetXYZ(fPx_out, fPy_out, fPz_out); }
private: private:
double fX_out, fY_out, fZ_out; Double32_t fX_out, fY_out, fZ_out;
double fPx_out, fPy_out, fPz_out; Double32_t fPx_out, fPy_out, fPz_out;
ClassDef(CbmTrdPoint, 3) ClassDef(CbmTrdPoint, 3)
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment