Prefer data access methods, check if properly initialised before reading

Rich/RichFutureDAQ/include/RichFutureDAQ/RichPDMDBDecodeMapping.h

@@ -313,8 +313,8 @@ namespace Rich::Future::DAQ {
       PDMDBDecodeMapping( const Rich::Future::DAQ::PDMDBDecodeMapping& mapping )
           : m_pdmDataR( mapping.m_pdmDataR )
           , m_pdmDataH( mapping.m_pdmDataH )
-          , m_isInitialised( mapping.m_isInitialised )
-          , m_mappingVer( mapping.m_mappingVer ) {}
+          , m_isInitialised( mapping.isInitialised() )
+          , m_mappingVer( mapping.version() ) {}
     };
   } // namespace Allen
 

Rich/RichFutureDAQ/include/RichFutureDAQ/RichTel40CableMapping.h

@@ -365,23 +365,25 @@ namespace Rich::Future::DAQ {
       };
 
       Tel40CableMapping( const Rich::Future::DAQ::Tel40CableMapping& data )
-          : m_isInitialised( data.m_isInitialised ), m_mappingVer( data.m_mappingVer ) {
-
-        for ( unsigned int i = 0; i < m_tel40ModuleData.size(); ++i ) {
-          for ( unsigned int j = 0; j < m_tel40ModuleData[i].size(); ++j ) {
-            for ( unsigned int k = 0; k < m_tel40ModuleData[i][j].size(); ++k ) {
-              m_tel40ModuleData[i][j][k] = data.m_tel40ModuleData.at( i ).at( j ).at( k );
+        : m_isInitialised( data.isInitialised() ), m_mappingVer( data.version() ) {
+        if ( data.isInitialised() ) {
+          for ( unsigned int i = 0; i < m_tel40ModuleData.size(); ++i ) {
+            for ( unsigned int j = 0; j < m_tel40ModuleData[i].size(); ++j ) {
+              for ( unsigned int k = 0; k < m_tel40ModuleData[i][j].size(); ++k ) {
+                m_tel40ModuleData[i][j][k] = data.m_tel40ModuleData.at( i ).at( j ).at( k );
+              }
             }
           }
-        }
-
-        for ( unsigned int i = 0; i < m_tel40ConnData.size(); ++i ) {
-          for ( unsigned int j = 0; j < m_tel40ConnData[i].size(); ++j ) {
-            for ( unsigned int k = 0; k < m_tel40ConnData[i][j].size(); ++k ) {
-              const auto& link_data = data.m_tel40ConnData.at( i ).at( j ).at( k );
-              m_tel40ConnMeta[i][j][k] =
-                  Tel40MetaData{static_cast<uint32_t>( link_data.nActiveLinks ), link_data.hasInactiveLinks};
-              for ( unsigned int l = 0; l < link_data.size(); ++l ) { m_tel40ConnData[i][j][k][l] = link_data.at( l ); }
+          for ( unsigned int i = 0; i < m_tel40ConnData.size(); ++i ) {
+            for ( unsigned int j = 0; j < m_tel40ConnData[i].size(); ++j ) {
+              for ( unsigned int k = 0; k < m_tel40ConnData[i][j].size(); ++k ) {
+                const auto& link_data = data.m_tel40ConnData.at( i ).at( j ).at( k );
+                m_tel40ConnMeta[i][j][k] =
+                    Tel40MetaData{static_cast<uint32_t>( link_data.nActiveLinks ), link_data.hasInactiveLinks};
+                for ( unsigned int l = 0; l < link_data.size(); ++l ) {
+                  m_tel40ConnData[i][j][k][l] = link_data.at( l );
+                }
+              }
             }
           }
         }