Merge branch 'NeuralEnsemble:master' into master

Author: joschaschmiedt

.github/workflows/io-test.yml

@@ -37,7 +37,7 @@ jobs:
         # the key depend on the last commit repo https://gin.g-node.org/NeuralEnsemble/ephy_testing_data.git
         id: ephy_testing_data_hash
         run: |
-          echo "latest_hash=$(git ls-remote https://gin.g-node.org/NeuralEnsemble/ephy_testing_data.git HEAD | cut -f1)" >> GITHUB_OUTPUT
+          echo "latest_hash=$(git ls-remote https://gin.g-node.org/NeuralEnsemble/ephy_testing_data.git HEAD | cut -f1)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         # Loading cache of ephys_testing_dataset

neo/rawio/intanrawio.py

@@ -1,13 +1,13 @@
 """
 
-Support for intan tech rhd  and rhs files.
+Support for intan tech rhd and rhs files.
 
-This 2 formats are more or less the same but:
+These 2 formats are more or less the same but:
   * some variance in headers.
   * rhs amplifier is more complex because the optional DC channel
 
 RHS supported version 1.0
-RHD supported version  1.0 1.1 1.2 1.3 2.0
+RHD supported version  1.0 1.1 1.2 1.3 2.0 3.0, 3.1
 
 See:
   * http://intantech.com/files/Intan_RHD2000_data_file_formats.pdf
@@ -333,6 +333,11 @@ def read_rhs(filename):
         if len(channels_by_type[sig_type]) > 0:
             name = {5: 'DIGITAL-IN', 6: 'DIGITAL-OUT'}[sig_type]
             data_dtype += [(name, 'uint16', BLOCK_SIZE)]
+           
+    if bool(global_info['notch_filter_mode']) and global_info['major_version'] >= 3:
+        global_info['notch_filter_applied'] = True
+    else:
+        global_info['notch_filter_applied'] = False
 
     return global_info, ordered_channels, data_dtype, header_size, BLOCK_SIZE
 
@@ -346,7 +351,6 @@ def read_rhs(filename):
     ('minor_version', 'int16'),
 ]
 
-
 rhd_global_header_part1 = [
     ('sampling_rate', 'float32'),
 
@@ -360,7 +364,7 @@ def read_rhs(filename):
     ('desired_upper_bandwidth', 'float32'),
 
     ('notch_filter_mode', 'int16'),
-
+    
     ('desired_impedance_test_frequency', 'float32'),
     ('actual_impedance_test_frequency', 'float32'),
 
@@ -544,5 +548,10 @@ def read_rhd(filename):
         if len(channels_by_type[sig_type]) > 0:
             name = {4: 'DIGITAL-IN', 5: 'DIGITAL-OUT'}[sig_type]
             data_dtype += [(name, 'uint16', BLOCK_SIZE)]
-
+    
+    if bool(global_info['notch_filter_mode']) and version >= V('3.0'):
+        global_info['notch_filter_applied'] = True
+    else:
+        global_info['notch_filter_applied'] = False
+    
     return global_info, ordered_channels, data_dtype, header_size, BLOCK_SIZE