74 waveform decoding sets sampling size to zero if below 1

packs/proc/processing_utils.py

@@ -445,7 +445,7 @@ def process_event_lazy_WD1(file_object  :  BinaryIO):
 
 def process_bin_WD1(file_path    :  str,
                     save_path    :  str,
-                    sample_size  :  int,
+                    sample_size  :  float,
                     overwrite    :  Optional[bool] = False,
                     print_mod    :  Optional[int] = -1):
 
@@ -467,7 +467,7 @@ def process_bin_WD1(file_path    :  str,
     ----------
         file_path    (str)   :  Path to binary file
         save_path    (str)   :  Path to saved file
-        sample_size  (int)   :  Size of each sample in an event (default 2 ns in the case of V1730B digitiser)
+        sample_size  (float)   :  Size of each sample in an event (default 2 ns in the case of V1730B digitiser)
         overwrite    (bool)  :  Boolean for overwriting pre-existing files
         print_mod    (int)   :  Readout frequency for number of events, -1 implies no readout
     Returns
@@ -478,6 +478,7 @@ def process_bin_WD1(file_path    :  str,
 
     # lets build it here first and break it up later
     # destroy the group within the file if you're overwriting
+    save_path = os.path.abspath(save_path)
     save_path = check_save_path(save_path, overwrite)
     print(save_path)
 

packs/tests/processing_test.py

@@ -241,8 +241,19 @@ def test_WD1_Lecroy_decode_produces_expected_output(config, inpt, output, compar
     run_pack = [sys.executable, MULE_dir + "/bin/mule", "proc", temp_config]
     subprocess.run(run_pack)
 
-    # the event info can be read out like a normal h5, the RWF cannot due to how they're structured
-    assert pd.read_hdf(save_path, 'RAW/event_info').equals(pd.read_hdf(comparison_path, 'RAW/event_info'))
+    # load event info from both files for comparison
+    saved_event_info      = pd.read_hdf(save_path, 'RAW/event_info')
+    comparison_event_info = pd.read_hdf(comparison_path, 'RAW/event_info')
+
+    # compare integer columns exactly
+    exact_cols = ['event_number', 'timestamp', 'samples', 'channels']
+    assert saved_event_info[exact_cols].equals(comparison_event_info[exact_cols])
+
+    # compare float columns with tolerance to account for floating point precision differences
+    np.testing.assert_allclose(saved_event_info['sampling_period'].values,
+                               comparison_event_info['sampling_period'].values,
+                               rtol=1e-10)
+
     assert [x for x in reader(save_path, 'RAW', 'rwf')] == [x for x in reader(comparison_path, 'RAW', 'rwf')]
 
 

packs/types/types.py

@@ -5,7 +5,7 @@
             ('event_number', np.uint32), 
             ('timestamp', np.uint64), 
             ('samples', np.uint32), 
-            ('sampling_period', np.uint64), 
+            ('sampling_period', np.float64), 
             ('channels', np.int32),
             ])