Merge branch 'develop' into 509-eyes-observed-incorrectly-inherit-eye…

…-marker
bachlab · Aug 11, 2023 · 3905000 · 3905000
2 parents 1959871 + ea1efe5
commit 3905000
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/pspm_cfg/pspm_cfg_run_pp_heart_data.m b/src/pspm_cfg/pspm_cfg_run_pp_heart_data.m
@@ -49,7 +49,7 @@
                 opt.channel_action = channel_action;
 
                 % call function
-                [sts, winfo] = pspm_ecg2hb(fn, chan, opt);
+                [sts, winfo] = pspm_convert_ecg2hb(fn, chan, opt);
             case 'ecg2hb_amri'
                 opt = pp_field.opt;
                 opt.channel_action = channel_action;
@@ -77,7 +77,7 @@
                 opt.channel_action = channel_action;
 
                 % call ecg2hb
-                [sts, winfo] = pspm_ecg2hb(fn, chan, opt);
+                [sts, winfo] = pspm_convert_ecg2hb(fn, chan, opt);
 
                 if sts ~= -1
 

diff --git a/src/pspm_convert_gaze_distance.m b/src/pspm_convert_gaze_distance.m
@@ -122,7 +122,7 @@
 end
 sts = 1;
 return
-%% CODE SAME AS IN pspm_pixel2unit
+%% CODE SAME AS IN pspm_convert_pixel2unit
 function out = pixel_conversion(data, screen_length, interest_range)
 length_per_pixel = screen_length ./ (diff(interest_range) + 1);
 % baseline data in pixels wrt. the range (i.e. pixels of interest)

diff --git a/src/pspm_ecg_editor.m b/src/pspm_ecg_editor.m
@@ -6,7 +6,7 @@
 %   [sts, R] = pspm_ecg_editor(pt)
 %   [sts, R] = pspm_ecg_editor(fn, channel, options)
 % ● Arguments
-%         pt:  A struct() from pspm_ecg2hb detection.
+%         pt:  A struct() from pspm_convert_ecg2hb detection.
 %         fn:  A file to  data file containing the ecg channel to be edited
 %       channel:  Channel id of ecg channel in the data file
 % ┌──options:  A struct() of options

diff --git a/test/pspm_butter_test.m b/test/pspm_butter_test.m
@@ -1,7 +1,7 @@
 classdef pspm_butter_test < matlab.unittest.TestCase
   % ● Description
-  % unittest class for the pspm_hb2hp function
-  % ● Authorship
+  % unittest class for the pspm_butter function
+  % ● History
   % (C) 2019 Ivan Rojkov (University of Zurich)
   methods (Test)
     function invalid_input(this)
@@ -18,4 +18,4 @@ function invalid_input(this)
       this.verifyWarning(@() pspm_butter(1,1), 'ID:toolbox_missing');
     end
   end
-end
+end
diff --git a/test/pspm_convert_ecg2hb_amri_test.m b/test/pspm_convert_ecg2hb_amri_test.m
@@ -1,6 +1,6 @@
 classdef pspm_convert_ecg2hb_amri_test < pspm_testcase
-% PSPM_ECG2HB_AMRI_TEST
-% unittest class for the pspm_ecg2hb_amri function
+% PSPM_CONVERT_ECG2HB_AMRI_TEST
+% unittest class for the pspm_convert_ecg2hb_amri function
 %__________________________________________________________________________
 % PsPM TestEnvironment
 % (C) 2019 Eshref Yozdemir (University of Zurich)

diff --git a/test/pspm_filtfilt_test.m b/test/pspm_filtfilt_test.m
@@ -1,6 +1,6 @@
 classdef pspm_filtfilt_test < matlab.unittest.TestCase
   % ● Description
-  % unittest class for the pspm_hb2hp function
+  % unittest class for the pspm_filtfilt function
   % ● Authorship
   % (C) 2019 Ivan Rojkov (University of Zurich)
   methods (Test)
@@ -11,4 +11,4 @@ function invalid_input(this)
       this.verifyWarning(@() pspm_filtfilt([1:10],[1:20],[1:10]), 'ID:invalid_input');
     end
   end
-end
+end