diff --git a/defs/SMPS.py b/defs/SMPS.py index 4fdcf4d..10a5f00 100644 --- a/defs/SMPS.py +++ b/defs/SMPS.py @@ -419,7 +419,7 @@ class OFRAnalyser: while i < int(items[-1]): if j in self.smpl_number_list: - filter_flows.append(float(items[0]) * 6E-4) + filter_flows.append(float(items[0]) * (1E-3) / 60) i += 1 j += 1 diff --git a/main.py b/main.py index 0cd0331..20b0dd2 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ # Importing custom code -from defs.SMPS import OFRAnalyser +from defs.SMPS import OFRAnalyser, OFRSample from defs.OzoneMonitor import OzoneAnalyser from defs.Helper import DATFile @@ -8,18 +8,15 @@ import numpy as np from pathlib import Path import pandas as pd +# Running some test +sample = OFRSample(source_file=Path(r"Z:\Data\SMPS\processed\2026\09_September\20260902\20260902_aPinene_SOA.txt"), sample_number=20) +print(sample.Mass.integrate()) + # Specify the source file paths to for SMPS data for the different filters used smps_analyser = OFRAnalyser(data_source_file = Path(r"Z:\Data\SMPS\processed\2026\09_September\20260903\20260903_aPinene_SOA.txt"), flow_source_file = Path(r"Z:\People\David_Tschan\OFR_SMPS\flow_files\20260903_SET02_EXP14_flow_file.txt"), - smpl_number_list = range(1, 60), + smpl_number_list = [20], on_time_interval = [pd.Timestamp('2026-09-03 15:20:00'), pd.Timestamp('2026-09-03 16:20:00')]) -ozon_analyser = OzoneAnalyser(file = DATFile(file = Path(r"Z:\Data\API_O3\2026\09_September\2026-09-03_14.23.44_PC14750_API_O3.dat"), data_name = 'ozone'), - on_time_interval=[pd.Timestamp('2026-09-03 14:35:00'), pd.Timestamp('2026-09-03 16:50:00')]) - smps_analyser.GetData() -ozon_analyser.GetData() - -ozon_analyser.AverageWithSMPS(smps_analyser = smps_analyser, cut_edges = 2, subtract_baseline = ['yes', 5]) - -print(len(ozon_analyser.averaged_data)) +print(smps_analyser.data)