@@ -40,7 +40,7 @@ class GeometryParams final : public TNamed
4040 return sGeomParam ;
4141 }
4242
43- void GetModuleAngle (int module , float angle[3 ][2 ]) const
43+ void GetModuleAngle (int module , double angle[3 ][2 ]) const
4444 {
4545 for (int i = 0 ; i < 3 ; i++) {
4646 for (int ian = 0 ; ian < 2 ; ian++) {
@@ -49,9 +49,9 @@ class GeometryParams final : public TNamed
4949 }
5050 }
5151
52- float GetCPVAngle (Int_t index) const { return mCPVAngle [index - 1 ]; }
52+ double GetCPVAngle (Int_t index) const { return mCPVAngle [index - 1 ]; }
5353
54- void GetModuleCenter (int module , float * pos) const
54+ void GetModuleCenter (int module , double * pos) const
5555 {
5656 for (int i = 0 ; i < 3 ; i++) {
5757 pos[i] = mModuleCenter [module ][i];
@@ -61,18 +61,18 @@ class GeometryParams final : public TNamed
6161 int GetNModules () const { return mNModules ; }
6262 int GetNumberOfCPVPadsPhi () const { return mNumberOfCPVPadsPhi ; }
6363 int GetNumberOfCPVPadsZ () const { return mNumberOfCPVPadsZ ; }
64- float GetCPVPadSizePhi () const { return mCPVPadSizePhi ; }
65- float GetCPVPadSizeZ () const { return mCPVPadSizeZ ; }
66- float GetCPVBoxSize (int index) const { return mCPVBoxSize [index]; }
67- float GetCPVActiveSize (int index) const { return mCPVActiveSize [index]; }
64+ double GetCPVPadSizePhi () const { return mCPVPadSizePhi ; }
65+ double GetCPVPadSizeZ () const { return mCPVPadSizeZ ; }
66+ double GetCPVBoxSize (int index) const { return mCPVBoxSize [index]; }
67+ double GetCPVActiveSize (int index) const { return mCPVActiveSize [index]; }
6868 int GetNumberOfCPVChipsPhi () const { return mNumberOfCPVChipsPhi ; }
6969 int GetNumberOfCPVChipsZ () const { return mNumberOfCPVChipsZ ; }
70- float GetGassiplexChipSize (int index) const { return mGassiplexChipSize [index]; }
71- float GetCPVGasThickness () const { return mCPVGasThickness ; }
72- float GetCPVTextoliteThickness () const { return mCPVTextoliteThickness ; }
73- float GetCPVCuNiFoilThickness () const { return mCPVCuNiFoilThickness ; }
74- float GetFTPosition (int index) const { return mFTPosition [index]; }
75- float GetCPVFrameSize (int index) const { return mCPVFrameSize [index]; }
70+ double GetGassiplexChipSize (int index) const { return mGassiplexChipSize [index]; }
71+ double GetCPVGasThickness () const { return mCPVGasThickness ; }
72+ double GetCPVTextoliteThickness () const { return mCPVTextoliteThickness ; }
73+ double GetCPVCuNiFoilThickness () const { return mCPVCuNiFoilThickness ; }
74+ double GetFTPosition (int index) const { return mFTPosition [index]; }
75+ double GetCPVFrameSize (int index) const { return mCPVFrameSize [index]; }
7676
7777 private:
7878 // /
@@ -86,23 +86,23 @@ class GeometryParams final : public TNamed
8686 int mNModules ; // Number of CPV modules
8787 int mNumberOfCPVPadsPhi ; // Number of CPV pads in phi
8888 int mNumberOfCPVPadsZ ; // Number of CPV pads in z
89- float mCPVPadSizePhi ; // CPV pad size in phi
90- float mCPVPadSizeZ ; // CPV pad size in z
91- float mCPVBoxSize [3 ]; // Outer size of CPV box
92- float mCPVActiveSize [2 ]; // Active size of CPV box (x,z)
89+ double mCPVPadSizePhi ; // CPV pad size in phi
90+ double mCPVPadSizeZ ; // CPV pad size in z
91+ double mCPVBoxSize [3 ]; // Outer size of CPV box
92+ double mCPVActiveSize [2 ]; // Active size of CPV box (x,z)
9393 int mNumberOfCPVChipsPhi ; // Number of CPV Gassiplex chips in phi
9494 int mNumberOfCPVChipsZ ; // Number of CPV Gassiplex chips in z
95- float mGassiplexChipSize [3 ]; // Size of a Gassiplex chip (0 - in z, 1 - in phi, 2 - thickness (in ALICE radius))
96- float mCPVGasThickness ; // Thickness of CPV gas volume
97- float mCPVTextoliteThickness ; // Thickness of CPV textolite PCB (without moil)
98- float mCPVCuNiFoilThickness ; // Thickness of CPV Copper-Nickel moil of PCB
99- float mFTPosition [4 ]; // Positions of the 4 PCB vs the CPV box center
100- float mCPVFrameSize [3 ]; // CPV frame size (0 - in phi, 1 - in z, 2 - thickness (along ALICE radius))
101- float mIPtoCPVSurface ; // Distance from IP to CPV front cover
102- float mModuleAngle [5 ][3 ][2 ]; // Orientation angles of CPV modules
103- float mCPVAngle [5 ]; // Direction to the center of CPV modules in phi
104- float mModuleCenter [5 ][3 ]; // Coordunates of modules centra in ALICE system
105- ClassDefOverride (GeometryParams, 1 );
95+ double mGassiplexChipSize [3 ]; // Size of a Gassiplex chip (0 - in z, 1 - in phi, 2 - thickness (in ALICE radius))
96+ double mCPVGasThickness ; // Thickness of CPV gas volume
97+ double mCPVTextoliteThickness ; // Thickness of CPV textolite PCB (without moil)
98+ double mCPVCuNiFoilThickness ; // Thickness of CPV Copper-Nickel moil of PCB
99+ double mFTPosition [4 ]; // Positions of the 4 PCB vs the CPV box center
100+ double mCPVFrameSize [3 ]; // CPV frame size (0 - in phi, 1 - in z, 2 - thickness (along ALICE radius))
101+ double mIPtoCPVSurface ; // Distance from IP to CPV front cover
102+ double mModuleAngle [5 ][3 ][2 ]; // Orientation angles of CPV modules
103+ double mCPVAngle [5 ]; // Direction to the center of CPV modules in phi
104+ double mModuleCenter [5 ][3 ]; // Coordunates of modules centra in ALICE system
105+ ClassDefOverride (GeometryParams, 2 );
106106};
107107} // namespace cpv
108108} // namespace o2
0 commit comments