AeroViz 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

AeroViz/rawDataReader/script/IGAC.py

@@ -1,8 +1,7 @@
 # read meteorological data from google sheet
 
 
-import numpy as np
-from pandas import read_csv, concat, to_numeric
+from pandas import read_csv, to_numeric
 
 from AeroViz.rawDataReader.core import AbstractReader
 
@@ -35,24 +34,8 @@ class Reader(AbstractReader):
             'SO42-': 0.08,
         }
 
-        # _mdl.update(self._oth_set.get('mdl', {}))
-
-        def _se_le(_df_, _log=False):
-            _df_ = np.log10(_df_) if _log else _df_
-
-            _df_qua = _df_.quantile([.25, .75])
-            _df_q1, _df_q3 = _df_qua.loc[.25].copy(), _df_qua.loc[.75].copy()
-            _df_iqr = _df_q3 - _df_q1
-
-            _se = concat([_df_q1 - 1.5 * _df_iqr] * len(_df_), axis=1).T.set_index(_df_.index)
-            _le = concat([_df_q3 + 1.5 * _df_iqr] * len(_df_), axis=1).T.set_index(_df_.index)
-
-            if _log:
-                return 10 ** _se, 10 ** _le
-            return _se, _le
-
         _cation, _anion, _main = (['Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+'],
-                                  ['Cl-', 'NO2-', 'NO3-', 'SO42-', ],
+                                  ['Cl-', 'NO2-', 'NO3-', 'PO43-', 'SO42-', ],
                                   ['SO42-', 'NO3-', 'NH4+'])
 
         _df_salt = _df[_mdl.keys()].copy()
@@ -68,23 +51,23 @@ class Reader(AbstractReader):
 
         # calculate SE LE
         # salt < LE
-        _se, _le = _se_le(_df_salt, _log=True)
+        _se, _le = self.IQR_QC(_df_salt, log_dist=True)
         _df_salt = _df_salt.mask(_df_salt > _le).copy()
 
         # C/A, A/C
         _rat_CA = (_df_salt[_cation].sum(axis=1) / _df_salt[_anion].sum(axis=1)).to_frame()
         _rat_AC = (1 / _rat_CA).copy()
 
-        _se, _le = _se_le(_rat_CA, )
+        _se, _le = self.IQR_QC(_rat_CA, )
         _cond_CA = (_rat_CA < _le) & (_rat_CA > 0)
 
-        _se, _le = _se_le(_rat_AC, )
+        _se, _le = self.IQR_QC(_rat_AC, )
         _cond_AC = (_rat_AC < _le) & (_rat_AC > 0)
 
         _df_salt = _df_salt.where((_cond_CA * _cond_AC)[0]).copy()
 
         # conc. of main salt > SE
-        _se, _le = _se_le(_df_salt[_main], _log=True)
+        _se, _le = self.IQR_QC(_df_salt[_main], log_dist=True)
         _df_salt[_main] = _df_salt[_main].mask(_df_salt[_main] < _se).copy()
 
         return _df_salt.reindex(_df.index)

AeroViz/rawDataReader/script/MA350.py

@@ -1,4 +1,4 @@
-from pandas import read_csv
+from pandas import read_csv, to_numeric
 
 from AeroViz.rawDataReader.core import AbstractReader
 
@@ -7,7 +7,8 @@ class Reader(AbstractReader):
     nam = 'MA350'
 
     def _raw_reader(self, file):
-        _df = read_csv(file, parse_dates=['Date / time local'], index_col='Date / time local').rename_axis("Time")
+        _df = read_csv(file, parse_dates=['Date / time local'], index_col='Date / time local').rename_axis(
+            "Time").apply(to_numeric, errors='coerce')
 
         _df = _df.rename(columns={
             'UV BCc': 'BC1',
@@ -31,8 +32,14 @@ class Reader(AbstractReader):
 
     # QC data
     def _QC(self, _df):
+        _index = _df.index.copy()
+
         # remove negative value
-        _df = _df[['BC1', 'BC2', 'BC3', 'BC4', 'BC5', 'BB mass', 'FF mass', 'AAE', 'BB']].mask((_df < 0).copy())
+        _df = _df.mask(
+            (_df[['BC1', 'BC2', 'BC3', 'BC4', 'BC5']] <= 0) | (_df[['BC1', 'BC2', 'BC3', 'BC4', 'BC5']] > 20000))
+
+        # use IQR_QC
+        _df = self.time_aware_IQR_QC(_df, time_window='1h')
 
-        # QC data in 1h
-        return _df.resample('1h').apply(self.basic_QC).resample(self.meta.get("freq")).mean()
+        # make sure all columns have values, otherwise set to nan
+        return _df.dropna(how='any').reindex(_index)

AeroViz/rawDataReader/script/Minion.py

@@ -1,38 +1,80 @@
+from typing import Literal
+
 import numpy as np
-from pandas import read_csv, to_datetime, to_numeric
+import pandas
+from pandas import read_excel, to_numeric
 
 from AeroViz.rawDataReader.core import AbstractReader
 
+pandas.set_option("future.no_silent_downcasting", True)
+
+desired_order1 = ['SO2', 'NO', 'NOx', 'NO2', 'CO', 'O3', 'THC', 'NMHC',
+                  'CH4', 'PM10', 'PM2.5', 'WS', 'WD', 'AT', 'RH']
+
+desired_order2 = ['Benzene', 'Toluene', 'EthylBenzene', 'm/p-Xylene', 'o-Xylene']
+
+desired_order3 = ['Al', 'Si', 'P', 'S', 'Cl', 'K', 'Ca', 'Ti', 'V', 'Cr', 'Mn', 'Fe',
+                  'Co', 'Ni', 'Cu', 'Zn', 'Ga', 'Ge', 'As', 'Se', 'Br', 'Rb', 'Sr',
+                  'Y', 'Zr', 'Nb', 'Mo', 'Pd', 'Ag', 'Cd', 'In', 'Sn', 'Sb', 'Te',
+                  'Cs', 'Ba', 'La', 'Ce', 'W', 'Pt', 'Au', 'Hg', 'Tl', 'Pb', 'Bi']
+
+desired_order4 = ['NH3', 'HF', 'HCl', 'HNO2', 'HNO3', 'G-SO2',
+                  'Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+',
+                  'F-', 'Cl-', 'NO2-', 'NO3-', 'PO43-', 'SO42-']
+
 
 class Reader(AbstractReader):
     nam = 'Minion'
 
     def _raw_reader(self, file):
-        with file.open('r', encoding='utf-8-sig', errors='ignore') as f:
-            _df = read_csv(f, low_memory=False, index_col=0)
+        # 讀取 Excel 文件
+        df = read_excel(file, index_col=0, parse_dates=True)
+
+        # 重命名列，去除空白
+        df = df.rename(columns=lambda x: x.strip())
+
+        # 保存單位行並給它一個名稱
+        units = df.iloc[0].copy()
 
-            _df.index = to_datetime(_df.index, errors='coerce')
-            _df.index.name = 'time'
+        # 刪除原始數據中的單位行
+        df = df.iloc[1:]
 
-            _df.columns = _df.keys().str.strip(' ')
+        # 替換特定值
+        df = df.replace({'維護校正': '*', np.nan: '-', '0L': '_', 'Nodata': '-'}, inplace=False)
+        df = df.replace(to_replace=r'\d*[#]\b', value='#', regex=True)
+        df = df.replace(to_replace=r'\d*[L]\b', value='_', regex=True)
 
-        return _df.loc[~_df.index.duplicated() & _df.index.notna()]
+        # 處理除了'WD'列的 0 值
+        non_wd_columns = [col for col in df.columns if col != 'WD']
+        df.loc[:, non_wd_columns] = df.loc[:, non_wd_columns].replace({0: '_'})
+
+        # 重新排序列
+        df = self.reorder_dataframe_columns(df, [desired_order1, desired_order2, desired_order3, desired_order4])
+
+        # 將單位行添加回 DataFrame
+        # df = concat([units.to_frame().T, df])
+
+        df.index.name = 'Time'
+
+        return df.loc[~df.index.duplicated() & df.index.notna()]
 
     def _QC(self, _df):
+        # remove negative value
+        _df = _df.mask((_df < 0))
+
         # XRF QAQC
         _df = self.XRF_QAQC(_df)
 
         # ions balance
-        _df = self.ions_balance(_df)
-
-        # remove negative value
-        _df = _df.mask((_df < 0).copy())
+        _df = self.IGAC_QAQC(_df)
 
         # QC data in 6h
-        return _df.resample('6h').apply(self.basic_QC).resample(self.meta.get("freq")).mean()
+        _df = self.time_aware_IQR_QC(_df)
+
+        return _df
 
     # base on Xact 625i Minimum Decision Limit (MDL) for XRF in ng/m3, 60 min sample time
-    def XRF_QAQC(self, df):
+    def XRF_QAQC(self, df, MDL_replace: Literal['nan', '0.5 * MDL'] = 'nan'):
         MDL = {
             'Al': 100, 'Si': 18, 'P': 5.2, 'S': 3.2,
             'Cl': 1.7, 'K': 1.2, 'Ca': 0.3, 'Ti': 1.6,
@@ -40,34 +82,71 @@ class Reader(AbstractReader):
             'Co': 0.14, 'Ni': 0.096, 'Cu': 0.079, 'Zn': 0.067,
             'Ga': 0.059, 'Ge': 0.056, 'As': 0.063, 'Se': 0.081,
             'Br': 0.1, 'Rb': 0.19, 'Sr': 0.22, 'Y': 0.28,
-            'Zr': 0.33, 'Nb': 0.41, 'Mo': 0.48, 'Ag': 1.9,
-            'Cd': 2.5, 'In': 3.1, 'Sn': 4.1, 'Sb': 5.2,
-            'Te': 0.6, 'I': 0.49, 'Cs': 0.37, 'Ba': 0.39,
-            'La': 0.36, 'Ce': 0.3, 'Pt': 0.12, 'Au': 0.1,
-            'Hg': 0.12, 'Tl': 0.12, 'Pb': 0.13, 'Bi': 0.13
+            'Zr': 0.33, 'Nb': 0.41, 'Mo': 0.48, 'Pd': 2.2,
+            'Ag': 1.9, 'Cd': 2.5, 'In': 3.1, 'Sn': 4.1,
+            'Sb': 5.2, 'Te': 0.6, 'Cs': 0.37, 'Ba': 0.39,
+            'La': 0.36, 'Ce': 0.3, 'W': 0.0001, 'Pt': 0.12,
+            'Au': 0.1, 'Hg': 0.12, 'Tl': 0.12, 'Pb': 0.13,
+            'Bi': 0.13
         }
-        # 將小於 MDL 值的數據替換為 NaN
+
+        # Br Li internal standard
+
+        # 將小於 MDL 值的數據替換為 nan or 1/2 MDL
         for element, threshold in MDL.items():
             if element in df.columns:
-                df[element] = df[element].where(df[element] >= threshold, np.nan)
+                rep = np.nan if MDL_replace == 'nan' else 0.5 * threshold
+                df[element] = df[element].where(df[element] >= threshold, rep)
 
         self.logger.info(f"{'=' * 60}")
         self.logger.info(f"XRF QAQC summary:")
         self.logger.info("\t\ttransform values below MDL to NaN")
         self.logger.info(f"{'=' * 60}")
 
+        # 轉換單位 ng/m3 -> ug/m3
+        if df.Al.max() > 10 and df.Fe.max() > 10:
+            # 確保 MDL.keys() 中的所有列都存在於 _df 中
+            columns_to_convert = [col for col in MDL.keys() if col in df.columns]
+
+            df[columns_to_convert] = df[columns_to_convert].div(1000)
+
         return df
 
-    def ions_balance(self, df, tolerance=0.3):
+    def IGAC_QAQC(self, df, tolerance=1):
         """
         Calculate the balance of ions in the system
         """
+        # https://www.yangyao-env.com/web/product/product_in2.jsp?pd_id=PD1640151884502
+        MDL = {
+            'HF': 0.08, 'HCl': 0.05, 'HNO2': 0.01, 'HNO3': 0.05, 'G-SO2': 0.05, 'NH3': 0.1,
+            'Na+': 0.05, 'NH4+': 0.08, 'K+': 0.08, 'Mg2+': 0.05, 'Ca2+': 0.05,
+            'F-': 0.08, 'Cl-': 0.05, 'NO2-': 0.05, 'NO3-': 0.01, 'PO43-': None, 'SO42-': 0.05,
+        }
+
+        MR = {
+            'HF': 200, 'HCl': 200, 'HNO2': 200, 'HNO3': 200, 'G-SO2': 200, 'NH3': 300,
+            'Na+': 300, 'NH4+': 300, 'K+': 300, 'Mg2+': 300, 'Ca2+': 300,
+            'F-': 300, 'Cl-': 300, 'NO2-': 300, 'NO3-': 300, 'PO43-': None, 'SO42-': 300,
+        }
+
+        _cation, _anion, _main = (['Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+'],
+                                  ['Cl-', 'NO2-', 'NO3-', 'SO42-'],
+                                  ['SO42-', 'NO3-', 'NH4+'])
+        # QC: replace values below MDL with 0.5 * MDL -> ions balance -> PM2.5 > main salt
+        # mass tolerance = 0.3, ions balance tolerance = 0.3
+
+        # # conc. of main salt should be present at the same time (NH4+, SO42-, NO3-)
+        # _df_salt = df.mask(df.sum(axis=1, min_count=1) > df.PM25).dropna(subset=_main).copy()
+
         # Define the ions
-        item = ['Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+', 'F-', 'Cl-', 'NO2-', 'NO3-', 'PO43-', 'SO42-']
+        item = ['Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+', 'Cl-', 'NO2-', 'NO3-', 'SO42-']
 
         # Calculate the balance
-        _df = df[item].copy()
-        _df = _df.apply(lambda x: to_numeric(x, errors='coerce'))
+        _df = df[item].apply(to_numeric, errors='coerce')
+
+        # for (_key, _df_col) in _df.items():
+        #     _df[_key] = _df_col.mask(_df_col < MDL[_key], MDL[_key] / 2)
+
         _df['+_mole'] = _df[['Na+', 'NH4+', 'K+', 'Mg2+', 'Ca2+']].div([23, 18, 39, (24 / 2), (40 / 2)]).sum(axis=1,
                                                                                                              skipna=True)
         _df['-_mole'] = _df[['Cl-', 'NO2-', 'NO3-', 'SO42-']].div([35.5, 46, 62, (96 / 2)]).sum(axis=1, skipna=True)
@@ -79,12 +158,8 @@ class Reader(AbstractReader):
         lower_bound, upper_bound = 1 - tolerance, 1 + tolerance
 
         # 根据ratio决定是否保留原始数据
-        valid_mask = (
-                (_df['ratio'] <= upper_bound) &
-                (_df['ratio'] >= lower_bound) &
-                ~np.isnan(_df['+_mole']) &
-                ~np.isnan(_df['-_mole'])
-        )
+        valid_mask = ((_df['ratio'] <= upper_bound) & (_df['ratio'] >= lower_bound) &
+                      ~np.isnan(_df['+_mole']) & ~np.isnan(_df['-_mole']))
 
         # 保留数据或将不符合条件的行设为NaN
         df.loc[~valid_mask, item] = np.nan
@@ -100,4 +175,6 @@ class Reader(AbstractReader):
         if retained_percentage < 70:
             self.logger.warning("Warning: The percentage of retained data is less than 70%")
 
+        # print(f"\tretain {retained_percentage.__round__(0)}% data within tolerance {tolerance}")
+
         return df

AeroViz/rawDataReader/script/NEPH.py

@@ -58,13 +58,23 @@ class Reader(AbstractReader):
                 print(f'\n\t\t\t Length mismatch in {file} data. Returning an empty DataFrame.')
                 return _df_out
 
-    # QC data
     def _QC(self, _df):
+        MDL_sensitivity = {'B': .1, 'G': .1, 'R': .3}
+
+        _index = _df.index.copy()
+
         # remove negative value
-        _df = _df.mask((_df <= 5).copy())
+        _df = _df.mask((_df <= 0) | (_df > 2000))
 
         # total scattering is larger than back scattering
-        _df = _df[(_df['BB'] < _df['B']) & (_df['BG'] < _df['G']) & (_df['BR'] < _df['R'])]
+        _df = _df.loc[(_df['BB'] < _df['B']) & (_df['BG'] < _df['G']) & (_df['BR'] < _df['R'])]
+
+        # blue scattering is larger than green scattering, green scattering is larger than red scattering
+        # due to the nephelometer's Green PMT in FS is already aged, this QC may delete too many data
+        # _df = _df.loc[(_df['B'] > _df['G']) & (_df['G'] > _df['R'])]
+
+        # use IQR_QC
+        _df = self.time_aware_IQR_QC(_df)
 
-        # QC data in 1h
-        return _df.resample('1h').apply(self.basic_QC).resample(self.meta.get("freq")).mean()
+        # make sure all columns have values, otherwise set to nan
+        return _df.dropna(how='any').reindex(_index)

AeroViz/rawDataReader/script/OCEC.py

@@ -1,4 +1,5 @@
-from pandas import to_datetime, read_csv
+import numpy as np
+from pandas import to_datetime, read_csv, to_numeric
 
 from AeroViz.rawDataReader.core import AbstractReader
 
@@ -8,11 +9,18 @@ class Reader(AbstractReader):
 
     def _raw_reader(self, file):
         with open(file, 'r', encoding='utf-8', errors='ignore') as f:
-            _df = read_csv(f, skiprows=3, nrows=25)
+            _df = read_csv(f, skiprows=3).apply(to_numeric, errors='coerce')
 
             _df['Start Date/Time'] = _df['Start Date/Time'].str.strip()
             _df['time'] = to_datetime(_df['Start Date/Time'], format='%m/%d/%Y %I:%M:%S %p', errors='coerce')
+
+            if _df['time'].isna().any():
+                _df['time'] = to_datetime(_df['Start Date/Time'], format='%m/%d/%Y %H:%M:%S', errors='coerce')
+
             _df = _df.set_index('time')
+
+            _df = _df.loc[~_df.index.duplicated() & _df.index.notna()]
+
             _df.index = _df.index.round('1h')
 
             _df = _df.rename(columns={
@@ -34,6 +42,8 @@ class Reader(AbstractReader):
                 'OCPk2-ug C': 'OC2_raw',
                 'OCPk3-ug C': 'OC3_raw',
                 'OCPk4-ug C': 'OC4_raw',
+                'Pyrolized C ug': 'PC_raw',
+
                 'ECPk1-ug C': 'EC1_raw',
                 'ECPk2-ug C': 'EC2_raw',
                 'ECPk3-ug C': 'EC3_raw',
@@ -41,26 +51,40 @@ class Reader(AbstractReader):
                 'ECPk5-ug C': 'EC5_raw',
             })
 
+            _df['OC1'] = _df['OC1_raw'] / _df['Sample_Volume']
+            _df['OC2'] = _df['OC2_raw'] / _df['Sample_Volume']
+            _df['OC3'] = _df['OC3_raw'] / _df['Sample_Volume']
+            _df['OC4'] = _df['OC4_raw'] / _df['Sample_Volume']
+
+            _df['PC'] = _df['Thermal_OC'] - _df['OC1'] - _df['OC2'] - _df['OC3'] - _df['OC4']
+
+            # _df['EC1'] = _df['EC1_raw'] / _df['Sample_Volume']
+            # _df['EC2'] = _df['EC2_raw'] / _df['Sample_Volume']
+            # _df['EC3'] = _df['EC3_raw'] / _df['Sample_Volume']
+            # _df['EC4'] = _df['EC4_raw'] / _df['Sample_Volume']
+            # _df['EC5'] = _df['EC5_raw'] / _df['Sample_Volume']
+
             _df = _df[['Thermal_OC', 'Optical_OC', 'Thermal_EC', 'Optical_EC', 'TC', 'Sample_Volume',
-                       'OC1_raw', 'OC2_raw', 'OC3_raw', 'OC4_raw', 'EC1_raw', 'EC2_raw', 'EC3_raw', 'EC4_raw',
-                       'EC5_raw']]
+                       'OC1', 'OC2', 'OC3', 'OC4', 'PC']]
 
             return _df.loc[~_df.index.duplicated() & _df.index.notna()]
 
     # QC data
     def _QC(self, _df):
-        import numpy as np
+        MDL = {'Thermal_OC': 0.3,
+               'Optical_OC': 0.3,
+               'Thermal_EC': 0.015,
+               'Optical_EC': 0.015
+               }
+
+        _index = _df.index.copy()
 
-        _df = _df.where(_df > 0)
+        _df = _df.mask((_df <= -5) | (_df > 100))
 
-        thresholds = {
-            'Thermal_OC': 0.3,
-            'Optical_OC': 0.3,
-            'Thermal_EC': 0.015,
-            'Optical_EC': 0.015
-        }
+        for col, threshold in MDL.items():
+            _df.loc[_df[col] <= threshold, col] = np.nan
 
-        for col, thresh in thresholds.items():
-            _df.loc[_df[col] <= thresh, col] = np.nan
+        # use IQR_QC
+        _df = self.time_aware_IQR_QC(_df, time_window='1h')
 
-        return _df
+        return _df.dropna(subset=['Thermal_OC', 'Optical_OC']).reindex(_index)

AeroViz/rawDataReader/script/SMPS.py

@@ -54,6 +54,7 @@ class Reader(AbstractReader):
 
             _df_smps = _df[numeric_cols]
             _df_smps.columns = _df_smps.columns.astype(float)
+            _df_smps = _df_smps.loc[_df_smps.index.dropna().copy()]
 
             return _df_smps.apply(to_numeric, errors='coerce')
 

AeroViz/rawDataReader/script/TEOM.py

@@ -1,4 +1,4 @@
-from pandas import to_datetime, read_csv
+from pandas import to_datetime, read_csv, Timedelta, to_numeric
 
 from AeroViz.rawDataReader.core import AbstractReader
 
@@ -8,7 +8,7 @@ class Reader(AbstractReader):
 
     def _raw_reader(self, file):
         with open(file, 'r', encoding='utf-8', errors='ignore') as f:
-            _df = read_csv(f, skiprows=3, index_col=False)
+            _df = read_csv(f, skiprows=3, index_col=False).apply(to_numeric, errors='coerce')
 
             _df = _df.rename(columns={'Time Stamp': 'time',
                                       'System status': 'status',
@@ -25,24 +25,28 @@ class Reader(AbstractReader):
 
             _df = _df.set_index(to_datetime(_tm_idx, errors='coerce', format='%d - %m - %Y %X'))
 
-            _df = _df.where(_df['status'] < 1e-7)
+            _df = _df.where(_df['status'] < 1)
 
-        _df = _df[['PM_NV', 'PM_Total', 'noise', ]]
+        _df = _df[['PM_NV', 'PM_Total', 'noise']]
 
         return _df.loc[~_df.index.duplicated() & _df.index.notna()]
 
     # QC data
     def _QC(self, _df):
-
-        _df_idx = _df.index.copy()
+        _index = _df.index.copy()
 
         # remove negative value
-        _df = _df.where(_df.noise < 0.01)[['PM_NV', 'PM_Total']].mask((_df <= 0).copy())
+        _df = _df.where(_df.noise < 0.01)[['PM_NV', 'PM_Total']].mask((_df <= 0))
 
         # QC data in 1 hr
-        # remove data where size < 8 in 1-hr
+        # use time_aware_IQR_QC
+        _df = self.time_aware_IQR_QC(_df, time_window='1h')
+
+        # remove data where size < 50% in 1-hr
+        points_per_hour = Timedelta('1h') / Timedelta(self.meta['freq'])
         for _key in ['PM_Total', 'PM_NV']:
-            _size = _df[_key].dropna().resample('1h').size().reindex(_df_idx).ffill().copy()
-            _df[_key] = _df[_key].mask(_size < 8)
+            _size = _df[_key].dropna().resample('1h').size().reindex(_index).ffill()
+            _df[_key] = _df[_key].mask(_size < points_per_hour * 0.5)
 
-        return _df.reindex(_df_idx)
+        # make sure all columns have values, otherwise set to nan
+        return _df.dropna(how='any').reindex(_index)

AeroViz/rawDataReader/script/VOC.py

@@ -26,7 +26,7 @@ class Reader(AbstractReader):
             if valid_keys:
                 return _df[valid_keys].loc[~_df.index.duplicated() & _df.index.notna()]
             else:
-                self.logger.warning("沒有找到匹配的鍵。返回原始DataFrame並移除含NaN的行。")
+                self.logger.warning("沒有找到匹配的鍵。返回原始DataFrame。")
                 return _df.loc[~_df.index.duplicated() & _df.index.notna()]
 
     def _QC(self, _df):

AeroViz/rawDataReader/script/XRF.py

@@ -0,0 +1,11 @@
+from AeroViz.rawDataReader.core import AbstractReader
+
+
+class Reader(AbstractReader):
+    nam = 'XRF'
+
+    def _raw_reader(self, file):
+        pass
+
+    def _QC(self, _df):
+        pass

AeroViz/rawDataReader/script/__init__.py

@@ -11,8 +11,8 @@ __all__ = [
     'TEOM',
     'OCEC',
     'IGAC',
+    'XRF',
     'VOC',
-    'Table',
-    'EPA_vertical',
+    'EPA',
     'Minion'
 ]

{AeroViz-0.1.6.dist-info → AeroViz-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AeroViz
-Version: 0.1.6
+Version: 0.1.8
 Summary: Aerosol science
 Home-page: https://github.com/Alex870521/AeroViz
 Author: alex
@@ -28,7 +28,7 @@ Requires-Dist: rich ~=13.7.1
   <img alt="Static Badge" src="https://img.shields.io/badge/python-3.12-blue?logo=python">
   <img alt="Static Badge" src="https://img.shields.io/badge/License-MIT-yellow">
   <img alt="Static Badge" src="https://img.shields.io/badge/github-updating-red?logo=github">
-  <img src="https://img.shields.io/badge/testing-green?logo=Pytest&logoColor=blue">
+  <img alt="Static Badge" src="https://img.shields.io/badge/testing-green?logo=Pytest&logoColor=blue">
 
 </p>
 
@@ -56,41 +56,68 @@ Requires-Dist: rich ~=13.7.1
 pip install AeroViz
 ```
 
-## <div align="center">Usage</div>
+For Windows users: Run `install_windows.bat`
 
-```python
-import AeroViz
+For Linux and Mac users: Run `install_unix.bat`
+
+## <div align="center">Quick Start</div>
 
+```python
+from datetime import datetime
+from pathlib import Path
 from AeroViz import RawDataReader, DataProcess, plot
+
+# Read data from a supported instrument
+data = RawDataReader('NEPH', Path('/path/to/data'), start=datetime(2024, 2, 1), end=datetime(2024, 4, 30))
+
+# Create a visualization
+plot.timeseries(data, y='scattering_coefficient')
 ```
 
-## <div align="center">RawDataReader Supported Instruments</div>
+For more detailed usage instructions, please refer to our [User Guide]().
+
+## <div align="center"> RawDataReader
+
+RawDataReader supports a wide range of aerosol instruments, including NEPH, SMPS, AE33, and many more. It handles
+various file types and time resolutions, making data processing efficient and standardized.
+
+For a detailed list of supported instruments, file types, and data columns, please refer to
+our [RawDataReader Usage Guide](docs/user_guide/RawDataReader) in the `docs` folder.
+
+### Key Features:
+
+- Supports multiple aerosol instruments
+- Applies customizable quality control measures
+- Offers flexible data filtering and resampling options
+- Enables easy data export to CSV format
 
-> [!NOTE]\
-> We are continuously working to support more instruments. Please check back for updates or contribute to our project on
-> GitHub.
+### Supported Instruments
 
 The AeroViz project currently supports data from the following instruments:
 
-- **SMPS (Scanning Mobility Particle Sizer)**
-- **APS (Aerodynamic Particle Sizer)**
-- **GRIMM (GRIMM Aerosol Technik)**
-- **TEOM (Continuous Ambient Particulate Monitor)**
-- **NEPH (Nephelometer)**
-- **Aurora (Nephelometer)**
-- **AE33 (Aethalometer Model 33)**
-- **AE43 (Aethalometer Model 43)**
-- **BC1054 (Black Carbon Monitor 1054)**
-- **MA350 (MicroAeth MA350)**
-- **OCEC (Organic Carbon Elemental Carbon Analyzer)**
-- **IGAC (In-situ Gas and Aerosol Compositions monitor)**
-- **VOC (Volatile Organic Compounds Monitor)**
-
-## <div align="center">DataProcess Supported Method</div>
+- SMPS (Scanning Mobility Particle Sizer)
+- APS (Aerodynamic Particle Sizer)
+- GRIMM (GRIMM Aerosol Technik)
+- TEOM (Continuous Ambient Particulate Monitor)
+- NEPH (Nephelometer)
+- Aurora (Nephelometer)
+- AE33 (Aethalometer Model 33)
+- AE43 (Aethalometer Model 43)
+- BC1054 (Black Carbon Monitor 1054)
+- MA350 (MicroAeth MA350)
+- OCEC (Organic Carbon Elemental Carbon Analyzer)
+- IGAC (In-situ Gas and Aerosol Compositions monitor)
+- XRF (X-ray Fluorescence Spectrometer)
+- VOC (Volatile Organic Compounds Monitor)
+
+> **Note:** We are continuously working to support more instruments. Please check back for updates or contribute to our
+> project on GitHub.
+
+## <div align="center">DataProcess</div>
 
 The AeroViz project currently supports the following processing methods:
 
-- **Chemistry**
+- **Chemistry**:
 - **Optical**
 - **SizeDistr**
 - **VOC**
@@ -103,15 +130,12 @@ For detailed documentation, please refer to the `docs` folder, which includes:
 
 | Documentation                              | Description                |
 |--------------------------------------------|----------------------------|
-| [User Guide](docs/user_guide.md)           | Basic usage instructions   |
-| [Developer Guide](docs/developer_guide.md) | Developer guidelines       |
-| [API Reference](docs/api_reference.md)     | API documentation          |
-| [FAQ](docs/faq.md)                         | Frequently Asked Questions |
+| [User Guide](docs/user_guide)              | Basic usage instructions   |
 | [Changelog](docs/changelog.md)             | List of changes            |
 
 </div>
 
-## <div align="center">Related Dependencies</div>
+## <div align="center">Related Source</div>
 
 * #### [PyMieScatt](https://github.com/bsumlin/PyMieScatt.git)
 * #### [py-smps](https://github.com/quant-aq/py-smps.git)