diff --git a/examples/write_csv_example.py b/examples/write_csv_example.py deleted file mode 100644 index 892e1c6..0000000 --- a/examples/write_csv_example.py +++ /dev/null @@ -1,27 +0,0 @@ -"""This script demonstrates writing an analog waveform to a CSV file.""" - -import os -import shutil - -import numpy as np - -from tm_data_types import AnalogWaveform, AnalogWaveformMetaInfo -from tm_data_types.files_and_formats.csv.data_formats.analog import WaveformFileCSVAnalog - -if __name__ == "__main__": - WAVEFORM_DIR = "example_waveforms" - if os.path.exists(os.path.join(os.getcwd(), WAVEFORM_DIR)): - shutil.rmtree(WAVEFORM_DIR) - os.mkdir(WAVEFORM_DIR) - - values = np.array([10, 11, 12, 32222, 32223, 32224, 55, 56, 57], dtype=np.int16) - analog_meta_info = AnalogWaveformMetaInfo() - waveform = AnalogWaveform() - waveform.meta_info = analog_meta_info - waveform.y_axis_values = values - waveform.y_axis_extent_magnitude = 1.0 - waveform.y_axis_offset = 0.1 - file_path = f"{os.getcwd()}\\{WAVEFORM_DIR}\\write_example_serial.csv" - - with WaveformFileCSVAnalog(file_path, "w") as fd: - fd.write_datum(waveform) diff --git a/examples/write_file.py b/examples/write_file.py deleted file mode 100644 index d0d3b35..0000000 --- a/examples/write_file.py +++ /dev/null @@ -1,45 +0,0 @@ -"""An example of how to read and write using the tm_data_types module.""" - -import os -import shutil - -import numpy as np - -from tm_data_types import ( - AnalogWaveform, - AnalogWaveformMetaInfo, - write_file, - write_files_in_parallel, -) - -if __name__ == "__main__": - WAVEFORM_DIR = "example_waveforms" - if os.path.exists(os.path.join(os.getcwd(), WAVEFORM_DIR)): - shutil.rmtree(WAVEFORM_DIR) - os.mkdir(WAVEFORM_DIR) - - values_1 = np.array([10, 11, 12, 32222, 32223, 32224, 55, 56, 57], dtype=np.int16) - analog_meta_info_1 = AnalogWaveformMetaInfo() - waveform_1 = AnalogWaveform() - waveform_1.meta_info = analog_meta_info_1 - waveform_1.y_axis_values = values_1 - waveform_1.y_axis_extent_magnitude = 1.0 - waveform_1.y_axis_offset = 0.1 - file_path_1 = f"{os.getcwd()}\\{WAVEFORM_DIR}\\write_example_serial.wfm" - - write_file(file_path_1, waveform_1) - - values_2 = np.array([15, 16, 17, -10000, -10001, -10002, 156, 157, 158], dtype=np.int16) - analog_meta_info_2 = AnalogWaveformMetaInfo() - waveform_2 = AnalogWaveform() - waveform_2.meta_info = analog_meta_info_2 - waveform_2.y_axis_values = values_2 - waveform_2.y_axis_extent_magnitude = 1.0 - waveform_2.y_axis_offset = 0.1 - file_path_2 = f"{os.getcwd()}\\{WAVEFORM_DIR}\\write_example_parallel_1.wfm" - file_path_3 = f"{os.getcwd()}\\{WAVEFORM_DIR}\\write_example_parallel_2.wfm" - - waveform_list = [waveform_1, waveform_2] - file_path_list = [file_path_2, file_path_3] - - write_files_in_parallel(file_path_list, waveform_list) diff --git a/src/tm_data_types/files_and_formats/mat/mat.py b/src/tm_data_types/files_and_formats/mat/mat.py index 2d9e76a..6770d27 100644 --- a/src/tm_data_types/files_and_formats/mat/mat.py +++ b/src/tm_data_types/files_and_formats/mat/mat.py @@ -63,12 +63,12 @@ class MATFile(AbstractedFile, Generic[DATUM_TYPE_VAR]): 14: Matrix, 16: String, } - +#wfm prop _WAVEFORM_PROPERTIES = bidict( { "source_name": "waveformSource", - "y_axis_units": "horizontalUnits", - "x_axis_units": "verticalUnits", + "y_axis_units": "verticalUnits", # FIXED: was 'horizontalUnits' + "x_axis_units": "horizontalUnits", # FIXED: was 'verticalUnits' "trigger_index": "zeroIndex", "x_axis_spacing": "sampleInterval", },