diff --git a/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/get_info_data.m b/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/get_info_data.m index a06d4e8..95a540b 100644 --- a/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/get_info_data.m +++ b/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/get_info_data.m @@ -45,10 +45,10 @@ var_names = {'ChannelName','ChannelNumber','SamplingFreq','Begin','Stop','Samples',... 'IndexEntry','DiscountinuityEntry','SubjectEncryption',... 'SessionEncryption','DataEncryption','Version','Institution',... - 'SubjectID', 'AcquisitionSystem', 'CompressionAlgorithm', 'Continuity'}; + 'SubjectID', 'AcquisitionSystem', 'CompressionAlgorithm', 'Continuity', 'voltage_conversion_factor'}; var_types = {'string', 'int32','double', 'double', 'double', 'double', 'double',... 'double', 'logical', 'logical', 'logical', 'string', 'string', 'string',... - 'string', 'string', 'cell'}; + 'string', 'string', 'cell', 'double'}; chan_list = dir(fullfile(sess_path, '*.mef')); % assume all channel data in one dir if isempty(chan_list) @@ -89,9 +89,10 @@ sess_info.AcquisitionSystem(k) = header_k.acquisition_system; sess_info.CompressionAlgorithm(k) = header_k.compression_algorithm; sess_info.Continuity{k} = seg_cont_k; + sess_info.voltage_conversion_factor(k) = header_k.voltage_conversion_factor; end % for end % if end -% [EOF] \ No newline at end of file +% [EOF] diff --git a/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/import_sess.m b/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/import_sess.m index d107e70..5d0f820 100644 --- a/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/import_sess.m +++ b/mef_matlab/matlab/MEF_2p1/@MEFSession_2p1/import_sess.m @@ -61,7 +61,8 @@ 'SubjectPassword', pw.Subject, 'SessionPassword', pw.Session,... 'DataPassword', pw.Data); x_k = x_k(:).'; % make sure it is a horizontal vector - + % voltage scale adjustment + x_k = x_k*this.SessionInformation.voltage_conversion_factor(k); X = cat(1, X, x_k); end % for @@ -89,4 +90,4 @@ end % function -% [EOF] \ No newline at end of file +% [EOF]