Merge branch 'feature/improve-memory-layout-of-arich-dataobjects' into 'main'

Improve memory layout of ARICH dataobjects.

See merge request belle2/software/basf2!4004

Author: Belle II Software

arich/dataobjects/include/ARICHThParam.h

@@ -24,7 +24,7 @@ namespace Belle2 {
   public:
 
     //! Default constructor for ROOT IO.
-    ARICHThParam() : m_index(-1), m_dth(-1), m_th0(0), m_nth(0)
+    ARICHThParam()
     {
       /*! does nothing */
     }
@@ -87,11 +87,11 @@ namespace Belle2 {
 
   private:
 
-    int m_index; /**< index */
-    double m_dth; /**< dth */
-    double m_th0; /**< th0 */
-    int m_nth; /**< nth */
-    ClassDef(ARICHThParam, 1); /**< the class title */
+    double m_dth = -1; /**< dth */
+    double m_th0 = 0; /**< th0 */
+    int m_index = -1; /**< index */
+    int m_nth = 0; /**< nth */
+    ClassDef(ARICHThParam, 2); /**< the class title */
 
   };
 

arich/dataobjects/include/ARICHTrack.h

@@ -189,6 +189,8 @@ namespace Belle2 {
 
   private:
 
+    std::vector<ARICHPhoton> m_photons; /**< collection of ARICHPhotons associated with the track */
+
     float m_x = 0;     /**< Reconstructed position.  */
     float m_y = 0;     /**< Reconstructed position.  */
     float m_z = 0;     /**< Reconstructed position.  */
@@ -197,14 +199,11 @@ namespace Belle2 {
     float m_dz = 0;   /**< Reconstructed direction. */
     float m_momentum;        /**< Reconstructed momentum. */
 
-    bool m_hitWin = 0;    /**< true if track hits HAPD window */
     float m_winX = 0;     /**< x position of track extrapolated to HAPD plane */
     float m_winY = 0;     /**< y position of track extrapolated to HAPD plane  */
+    bool m_hitWin = 0;    /**< true if track hits HAPD window */
 
-
-    std::vector<ARICHPhoton> m_photons; /**< collection of ARICHPhotons associated with the track */
-
-    ClassDef(ARICHTrack, 2); /**< the class title */
+    ClassDef(ARICHTrack, 3); /**< the class title */
 
   };
 } // namespace Belle2

arich/dataobjects/include/linkdef.h

@@ -9,11 +9,11 @@
 #pragma link C++ class Belle2::ARICHAeroHit+; // checksum=0x26572235, version=1
 #pragma link C++ class Belle2::ARICHDigit+; // checksum=0x3f0da20d, version=3
 #pragma link C++ class Belle2::ARICHLikelihood+; // checksum=0x1b86e8b5, version=3
-#pragma link C++ class Belle2::ARICHTrack+; // checksum=0xe97461b5, version=2
+#pragma link C++ class Belle2::ARICHTrack+; // checksum=0xa0de41fd, version=3
 #pragma link C++ class Belle2::ARICHHit+; // checksum=0xbd5a7d82, version=1
 #pragma link C++ class Belle2::ARICHPhoton+; // checksum=0xf6217c88, version=5
 #pragma link C++ class Belle2::ARICHRawDigit+; // checksum=0xbb397841, version=2
-#pragma link C++ class Belle2::ARICHThParam+; // checksum=0x3db70df8, version=1
+#pragma link C++ class Belle2::ARICHThParam+; // checksum=0x8f5562d0, version=2
 #pragma link C++ class Belle2::ARICHInfo+; // checksum=0x862f1d7c, version=4
 
 #endif