Fix for MacOS release mode not reading in values as short causing ELT to be bad

Author: Arthur Glowacki

src/io/file/netcdf_io.cpp

@@ -265,10 +265,14 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
             }
 
 
-            unsigned short i1 = _data_in[0][0][l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)];
-            unsigned short i2 = _data_in[0][0][l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)+1];
-            unsigned int ii = i1 | i2<<16;
+            unsigned int i1 = static_cast<unsigned int>(_data_in[0][0][l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)]);
+            unsigned int i2 = static_cast<unsigned int>(_data_in[0][0][l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)+1]);
+            i1 = (0x0000ffff & i1);
+            i2 = (i2 << 16) & 0xffff0000;
+            unsigned int ii = i1 | i2;
             elapsed_livetime = ((T_real)ii) * 320e-9f; // need to multiply by this value becuase of the way it is saved
+            logE<<_data_in[0][0][l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)]<<" :: "<<ii<<"\n";
+            logW<<"i1["<<l+ELAPSED_LIVETIME_OFFSET+(idx_detector*8)<<"] : "<<i1<<"    ::  ii2 : "<<i2<<"    ::     elt : "<<elapsed_livetime<<" ---- \n";
             if (ltype == E_load_type::LINE)
             {
                 if (elapsed_livetime == 0)
@@ -298,9 +302,11 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
                 callback_spectra->elapsed_livetime(elapsed_livetime);
             }
 
-            i1 = _data_in[0][0][l+ELAPSED_REALTIME_OFFSET+(idx_detector*8)];
-            i2 = _data_in[0][0][l+ELAPSED_REALTIME_OFFSET+(idx_detector*8)+1];
-            ii = i1 | i2<<16;
+            i1 = static_cast<unsigned int>(_data_in[0][0][l+ELAPSED_REALTIME_OFFSET+(idx_detector*8)]);
+            i2 = static_cast<unsigned int>(_data_in[0][0][l+ELAPSED_REALTIME_OFFSET+(idx_detector*8)+1]);
+            i1 = (0x0000ffff & i1);
+            i2 = (i2 << 16) & 0xffff0000;
+            ii = i1 | i2;
             elapsed_realtime = ((T_real)ii) * 320e-9f; // need to multiply by this value becuase of the way it is saved
             if (ltype == E_load_type::LINE)
             {
@@ -331,9 +337,11 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
                 callback_spectra->elapsed_realtime(elapsed_realtime);
             }
 
-            i1 = _data_in[0][0][l+INPUT_COUNTS_OFFSET+(idx_detector*8)];
-            i2 = _data_in[0][0][l+INPUT_COUNTS_OFFSET+(idx_detector*8)+1];
-            ii = i1 | i2<<16;
+            i1 = static_cast<unsigned int>(_data_in[0][0][l+INPUT_COUNTS_OFFSET+(idx_detector*8)]);
+            i2 = static_cast<unsigned int>(_data_in[0][0][l+INPUT_COUNTS_OFFSET+(idx_detector*8)+1]);
+            i1 = (0x0000ffff & i1);
+            i2 = (i2 << 16) & 0xffff0000;
+            ii = i1 | i2;
             input_counts = ((T_real)ii) / elapsed_livetime;
             if (ltype == E_load_type::LINE)
             {
@@ -365,9 +373,11 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
             }
 
 
-            i1 = _data_in[0][0][l+OUTPUT_COUNTS_OFFSET+(idx_detector*8)];
-            i2 = _data_in[0][0][l+OUTPUT_COUNTS_OFFSET+(idx_detector*8)+1];
-            ii = i1 | i2<<16;
+            i1 = static_cast<unsigned int>(_data_in[0][0][l+OUTPUT_COUNTS_OFFSET+(idx_detector*8)]);
+            i2 = static_cast<unsigned int>(_data_in[0][0][l+OUTPUT_COUNTS_OFFSET+(idx_detector*8)+1]);
+            i1 = (0x0000ffff & i1);
+            i2 = (i2 << 16) & 0xffff0000;
+            ii = i1 | i2;
             output_counts = ((T_real)ii) / elapsed_realtime;
             if (ltype == E_load_type::LINE)
             {