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

AeroViz/rawDataReader/script/Minion.py

@@ -1,38 +1,78 @@
+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).copy())
+
         # 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()
+        return _df.resample('6h').apply(self.n_sigma_QC).resample(self.meta.get("freq")).mean()
 
     # 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 +80,68 @@ 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
+        # 將小於 MDL 值的數據替換為 nan or 5/6 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(lambda x: to_numeric(x, 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 +153,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 +170,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

@@ -67,4 +67,4 @@ class Reader(AbstractReader):
         _df = _df[(_df['BB'] < _df['B']) & (_df['BG'] < _df['G']) & (_df['BR'] < _df['R'])]
 
         # QC data in 1h
-        return _df.resample('1h').apply(self.basic_QC).resample(self.meta.get("freq")).mean()
+        return _df.resample('1h').apply(self.n_sigma_QC).resample(self.meta.get("freq")).mean()

AeroViz/rawDataReader/script/OCEC.py

@@ -51,7 +51,7 @@ class Reader(AbstractReader):
     def _QC(self, _df):
         import numpy as np
 
-        _df = _df.where(_df > 0)
+        _df = _df.mask((_df <= 0) | (_df > 100)).copy()
 
         thresholds = {
             'Thermal_OC': 0.3,

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

@@ -25,9 +25,9 @@ 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()]
 

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.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AeroViz
-Version: 0.1.6
+Version: 0.1.7
 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,63 @@ Requires-Dist: rich ~=13.7.1
 pip install AeroViz
 ```
 
-## <div align="center">Usage</div>
+## <div align="center">Quick Start</div>
 
 ```python
 import AeroViz
-
 from AeroViz import RawDataReader, DataProcess, plot
+
+# Read data from a supported instrument
+data = RawDataReader('NEPH', '/path/to/data', start='2024-01-01', end='2024-01-31')
+
+# 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]().
+
+## 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/RawDataReader_Usage_Guide.md) 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)**
+- 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 Supported Method</div>
 
 The AeroViz project currently supports the following processing methods:
 
-- **Chemistry**
+- **Chemistry**:
 - **Optical**
 - **SizeDistr**
 - **VOC**
@@ -103,7 +125,7 @@ For detailed documentation, please refer to the `docs` folder, which includes:
 
 | Documentation                              | Description                |
 |--------------------------------------------|----------------------------|
-| [User Guide](docs/user_guide.md)           | Basic usage instructions   |
+| [User Guide](docs/user_guide)              | 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 |
@@ -111,7 +133,7 @@ For detailed documentation, please refer to the `docs` folder, which includes:
 
 </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)

{AeroViz-0.1.6.dist-info → AeroViz-0.1.7.dist-info}/RECORD

@@ -6,7 +6,7 @@ AeroViz/dataProcess/Chemistry/__init__.py,sha256=fyyomjxkQcUNWDx4R5jPrHafAftN-v2
 AeroViz/dataProcess/Chemistry/_calculate.py,sha256=q7ojTFPok0vg8k_1PMECNdP5CPanR9NWQ4Rx5iTcHew,599
 AeroViz/dataProcess/Chemistry/_isoropia.py,sha256=3wp_FXdN230awlStMbctutwld4oot9WaAVXETGd6PSs,3255
 AeroViz/dataProcess/Chemistry/_mass_volume.py,sha256=0joH2BAx0NUwDFzyrLgG-v7WrGl46R7zWxwbajWBV8o,5378
-AeroViz/dataProcess/Chemistry/_ocec.py,sha256=gqDTs9rOyr0RXdN1Nrxv6Vgvh04IFgHwk4gAJUgZZGc,5437
+AeroViz/dataProcess/Chemistry/_ocec.py,sha256=FKvuh6iMhz6eFne9WJZFyaeo0FyV9a1KmaZ0nm4-67I,6031
 AeroViz/dataProcess/Chemistry/_partition.py,sha256=tKhb6BJns46UiUlEq6Zq7ahYnvUJ_whY3tWE54C3bqU,1023
 AeroViz/dataProcess/Chemistry/_teom.py,sha256=IiM-TrifWpQLTbKllG-4k4c3mvQulfcmjswWu6muCXA,486
 AeroViz/dataProcess/Chemistry/isrpia.cnf,sha256=iWXTqsOZFmNrJxAI9nYuilZ9h6ru1icdPFVim7YKc_k,566
@@ -32,29 +32,30 @@ AeroViz/dataProcess/VOC/__init__.py,sha256=8GNP0RMymTkJXK18pSgfLHqrKPWboN-3x1_Ke
 AeroViz/dataProcess/VOC/_potential_par.py,sha256=h3rVdvtBvC6xHa_ZG4Oq5eXezeSZtHNy6T6I40maIcM,3863
 AeroViz/dataProcess/VOC/support_voc.json,sha256=tMYp_NERqhSriVRE2NavXh33CQ5CnsbJHtmMFlE5q_E,6804
 AeroViz/dataProcess/core/__init__.py,sha256=FhGwqlP8ZwXZQS0LjH0YOz2g1Q2yJniUUhRZ_jDOQ6k,2707
-AeroViz/plot/__init__.py,sha256=BxoarxAeDHNdMHizS1bCTwV8NEuUCgeDB75GbSEsNWs,394
+AeroViz/plot/__init__.py,sha256=Cy42d1t58zeutxLYDkm8bFbRNGE0G1T8VpqGj1li1Cw,419
 AeroViz/plot/bar.py,sha256=cSPKJLWGifCzICCZVPcbZtrDrea_AStlwSli9-b-lsA,4246
 AeroViz/plot/box.py,sha256=8zDd8jYndSv5f0P1lFeX0m7VWYh9okYgJTClh2Lj7Dg,2115
-AeroViz/plot/pie.py,sha256=PVOqc_tAMlfjojTggP7HPL9Nk3ImigETo_EUFD6K2BY,7421
+AeroViz/plot/pie.py,sha256=POOiWcg1KbzUzn1dm4yVEL-1d2bTqUjSTkltHk5YYqU,7860
+AeroViz/plot/radar.py,sha256=QHXkLQlAZZQDWHcqVGJBeRsGiu45GYmy3lN6gwlh6xY,6965
 AeroViz/plot/regression.py,sha256=mTCNrCAYvH7QjIb_5WlltCR1Kqwer1anpGEsxmO2S3o,7292
-AeroViz/plot/scatter.py,sha256=2Q_Um7Ai-pym2nUiMk6tY_zEXwbKE-BpkgrDkMyNbYA,6293
+AeroViz/plot/scatter.py,sha256=sxk5QxgC1Jk9PuY18q9aRgR_Ipvg5dM1RkwYQxRkn1c,6787
 AeroViz/plot/violin.py,sha256=pU2Z2yTWocEtImmCAmbtn0WvXtUOrnCGOdDOrLxjooU,2689
 AeroViz/plot/distribution/__init__.py,sha256=nhbIegWczkuEfWsE7-2jfF0dnpmPDzJJzjq8Fuh6q5k,28
 AeroViz/plot/distribution/distribution.py,sha256=sAjqtqKavFwQqI8PGPFnpvZFSU-w2UKjcTTC5L91f4E,20595
 AeroViz/plot/meteorology/__init__.py,sha256=hhGfQE3IUzS3Eaju_nO7LomPPHJnd-zAAZZweXOXs2M,27
-AeroViz/plot/meteorology/meteorology.py,sha256=h5KiaReatt238FXZyGjP9CAMkzTF1aVjOaFAGq3CKRY,11197
+AeroViz/plot/meteorology/meteorology.py,sha256=6hk-5olgQTw2SB-GhEizLN19vRVBztgiXoruh8Q6Zns,11282
 AeroViz/plot/optical/__init__.py,sha256=5S2WPq8NouPYgc46c1XBveSL8Cxs3w8wNYN7vWIpB-s,23
-AeroViz/plot/optical/optical.py,sha256=xtuJuaonyM4OUS_BlkxKudLZKEteCS1u_-Svj3lQPco,13728
+AeroViz/plot/optical/optical.py,sha256=823dI0Y_x4_uceo9cLJvjjgl6rzFWEAYBkA4ocRVJb0,13725
 AeroViz/plot/templates/__init__.py,sha256=VXp73SqrSF1WR9WYhHpHtbhvFcb1CR4JeV1tPQvCEEI,227
 AeroViz/plot/templates/ammonium_rich.py,sha256=a46rfwhSZ3LIj71LxdOnklAFyy6Xe_VQ-kh1komnZ5g,1225
 AeroViz/plot/templates/contour.py,sha256=fAM6Wn_EmENQM1IW6KJpwmLva6D9P2dEAaK6cNQBtdQ,1678
 AeroViz/plot/templates/corr_matrix.py,sha256=VeiwBwmg_v6LYslJvhSqweiLBheR3vGfPYxrtHoqJRI,3507
 AeroViz/plot/templates/diurnal_pattern.py,sha256=Vp8nDzSe95ppZBCDkFXnpUEh1cb-19yDS3H0qftoPaw,1434
-AeroViz/plot/templates/koschmieder.py,sha256=XmsYn8x9lu2BgN1FXKHb0quZdRw7Etv1dT5LBjBB0ok,3199
+AeroViz/plot/templates/koschmieder.py,sha256=YMtok3T5VHlzLphnsrkchNRnw5UE3XSLYDne42Efofo,3343
 AeroViz/plot/templates/metal_heatmap.py,sha256=ngqJFiOPCoExPKv-lHvgB1XCSr9fF_jSKmx4VwjUUXQ,4961
 AeroViz/plot/timeseries/__init__.py,sha256=LQ_aE32pvp5ouC--BRa0NwSJ48DYO3rFaOt4AKGmn_s,50
 AeroViz/plot/timeseries/template.py,sha256=E9dxaH_Y5QxnkIHK4VH59IVShnf4i1-TT_QE4NqVqrQ,1460
-AeroViz/plot/timeseries/timeseries.py,sha256=EitNnjleHj3Qu1PBHClWNi9kCgJ8tULGZSicS3xhoZw,14626
+AeroViz/plot/timeseries/timeseries.py,sha256=9fVbhLQZUWzTX3LqFkVlo6eo-hDIjwV18CKnh_uQui0,14584
 AeroViz/plot/utils/__init__.py,sha256=sxp3nfUnyVIIXYd-F874gEHkhQiDnMPDE1nJ_Z98270,104
 AeroViz/plot/utils/_color.py,sha256=Vhjo-v4UWFME1JbbBR_Ro8FRj6dHB2O5Sud_9lpdu_U,2797
 AeroViz/plot/utils/_unit.py,sha256=Abum0WDnq08DzkSoxkKvBc0mYKo8izIDmgduPo9Q27A,1671
@@ -62,51 +63,34 @@ AeroViz/plot/utils/fRH.json,sha256=t-2ux4TLOYAB-4jJ72LSM4jv1jk9XkaxKYNMDepMHIg,6
 AeroViz/plot/utils/plt_utils.py,sha256=7Au3r2-7AZQmzrO2OfcyTFomJRLHgu1Npb7wxQqUvzY,3438
 AeroViz/plot/utils/sklearn_utils.py,sha256=hKFfkVkYLRxkIDKvO9COHXwhjD_UWqQigdT3mDToni4,2098
 AeroViz/plot/utils/units.json,sha256=JKcqvLA6dkc8REV_NhX85Jl9LA4iAZxzw9RJp6JTla0,2965
-AeroViz/process/__init__.py,sha256=vqXO0vhowU9yNW5tnVYNg3ceBxLt96PgBNkZ2KUxKXw,1309
-AeroViz/process/core/DataProc.py,sha256=6MBDcHyQmVU16Z0oDo0GItvhU5f7fWLXFMGqUyoW1eQ,419
-AeroViz/process/core/SizeDist.py,sha256=V6CpxTRfWjsZ8GwIEOqyKJ8_qcz7dO0ZmfHQvR6SgW4,2097
-AeroViz/process/core/__init__.py,sha256=WmVSFDx97urX0WPA8dtRVoQF04IDaU-IgxHK979-kM8,98
-AeroViz/process/method/PyMieScatt_update.py,sha256=g3vlzATjzYSYZd3LwmwxEmdkpo4cHJ3KY4rePY4jwZk,21065
-AeroViz/process/method/__init__.py,sha256=_yxoNAbbI82ORhrVsi-6x8vPnWQNHavjZUXy-ioZ2wg,123
-AeroViz/process/method/mie_theory.py,sha256=EC3SsUaq5G3SdQyPMQxcosbEokqAgJw-4Gz6moJiOsk,8666
-AeroViz/process/method/prop.py,sha256=7f18SOkkLgDiY_g1c1We8g-3WDJJIFcxkfR4F99jUgc,1845
-AeroViz/process/script/AbstractDistCalc.py,sha256=wXF7OA634m_i-Y79lU4THj0c0yZx5NUtLNvORH1FWZg,5351
-AeroViz/process/script/Chemical.py,sha256=jjBIdILe0fO5Rqidb4pg3CP6qmMLqFvst-ZSz8mbb7Q,6413
-AeroViz/process/script/IMPACT.py,sha256=Zz1GRQLJopNQGw5qUTdWl7Zxy_CBnFBsL1B-CCemaDQ,1520
-AeroViz/process/script/IMPROVE.py,sha256=5FNl33S_785J7CsSue_CvZP58TWevpwGr2ePQM6qScw,5709
-AeroViz/process/script/Others.py,sha256=TOtSKVZ9Z-zX1LFfE4p36H0hMjfmyyQw_Xaeq8HgMBk,2325
-AeroViz/process/script/PSD.py,sha256=unSvyHp1RqgQecY-Lab-wRFGP2u45blSO4NCNTaxcRQ,3721
-AeroViz/process/script/PSD_dry.py,sha256=P9rSQVA78jHXrY2bDiC1iQvG0w9Js8QiBNfooPOXzfY,3269
-AeroViz/process/script/__init__.py,sha256=QExUHHK79oiwZXvk8u00P8rLwWhGOc1fpZY2Fx8Vkxg,188
-AeroViz/process/script/retrieve_RI.py,sha256=9OQJU1w6VzVqKz00e9GdWswRAnaETe_1meAHp5N_s54,2711
-AeroViz/rawDataReader/__init__.py,sha256=jXLrf0A-Hxufw-IQp0-Nyci4PszWk5YU4SnpH4ob1RE,3862
+AeroViz/rawDataReader/__init__.py,sha256=TF8ntRdD2VWn238RO-bPMuWuW-qhnJO8GP7NmleEEWc,4824
 AeroViz/rawDataReader/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-AeroViz/rawDataReader/config/supported_instruments.py,sha256=iE2dqnAhXsHUeVfho5vYYcXL97fg_xt3VvvYcyxCU48,4408
-AeroViz/rawDataReader/core/__init__.py,sha256=W_RwJZmMCTjTwWiTSxcXFhkasO3cyQWEPSdA7-ymeqU,11058
-AeroViz/rawDataReader/script/AE33.py,sha256=Nv0u0w_V50sDjsLh17ZkNT6A75TjIo2A1O6GYc4zkJg,1107
-AeroViz/rawDataReader/script/AE43.py,sha256=Qq9MdiBKzDuKIEFPanmn7wUbkN5VeSTG6Dopw8i0W90,1056
+AeroViz/rawDataReader/config/supported_instruments.py,sha256=CGE34wsXyq-Za8IIYu2rt3JzoANrFBgrphqvl2FYTC0,5296
+AeroViz/rawDataReader/core/__init__.py,sha256=g_401UFSrkQcjyE89bHKLYnPoVRkMlKIKu34f1rOF6Q,12730
+AeroViz/rawDataReader/script/AE33.py,sha256=T5HnsZpJu500dvNq8d9g2JPnGDQxM5fcwEGp_4JYhNU,1109
+AeroViz/rawDataReader/script/AE43.py,sha256=BH1D9hkbfffpNsuEGH_c9fsjHrC8u-CnpSUnfirO2Hc,1058
 AeroViz/rawDataReader/script/APS_3321.py,sha256=x75G72Xl0vElr6Njbv8SlOcosAHNozseaJzAxVmfXyI,1697
-AeroViz/rawDataReader/script/Aurora.py,sha256=b0XPs2gc_2UJj4HnOHwW7o255zsCPp459goaDqeAJA8,1387
-AeroViz/rawDataReader/script/BC1054.py,sha256=QGU1SRDoE8e4yNXUX7RsdK5zh72fNd2Q0IpUy7iFzrg,1486
-AeroViz/rawDataReader/script/EPA_vertical.py,sha256=MpcbOzbigivsuldCxzn_B6POtQMzahGQhM_sWRDVP9s,1669
-AeroViz/rawDataReader/script/GRIMM.py,sha256=s2z3aNfpPOd_07Zl8jbHa7CxsR2EjrtoZw_HRjR5ykc,946
-AeroViz/rawDataReader/script/IGAC.py,sha256=BDhmsNy02EvLY0sd75NM6XvLGVTEJlxyQQbprhdFQmU,2948
-AeroViz/rawDataReader/script/MA350.py,sha256=YRY19R2V6nyHMpGMOLVZvK8_41OCCzdTcSnuZR-OJsU,1287
-AeroViz/rawDataReader/script/Minion.py,sha256=c128ZkkxakV6wq1k9NtEq0scdi1mh9Mn0jhQFqz_uVE,3940
-AeroViz/rawDataReader/script/NEPH.py,sha256=OSDtbJ4sujtnf3bzbENXoyJwA-RIeOkPXNCEJ6MvkPQ,2735
-AeroViz/rawDataReader/script/OCEC.py,sha256=t3N_bs5RishlfzFqxTSfMlemZBDIco6cKZ4mU0j9_6g,2315
-AeroViz/rawDataReader/script/SMPS.py,sha256=RnqysTWNaFautGnyPKZgMjdtPdauv9Mqu9IpuTEGpXs,2706
-AeroViz/rawDataReader/script/TEOM.py,sha256=Hx_DDnvGSfSl9cgIVmuf4VmphaFfNCY60mqPWoLmNvw,1796
-AeroViz/rawDataReader/script/Table.py,sha256=othBoQSFVcjfWX0_Q4y8BkjCBc5CihvC6LyrhyJWywk,800
+AeroViz/rawDataReader/script/Aurora.py,sha256=fcg5ij7sCWGXik34xDlhkR0ORRNiZ252mzK3rnHBK5o,1389
+AeroViz/rawDataReader/script/BC1054.py,sha256=HCoj4ntcbdNgkWw5Ugxb2KNNKR30vRRlQW4SDcT7KkU,1488
+AeroViz/rawDataReader/script/EPA.py,sha256=sjI6su0QeTNlVgRcxmz8_aOGh7T9B5ybHp6EQVvHQoQ,1608
+AeroViz/rawDataReader/script/GRIMM.py,sha256=zwXhKxqEE3_kppCY1fvMdSnKjC7D_dcuVN0MsKxAlx8,948
+AeroViz/rawDataReader/script/IGAC.py,sha256=ZdskNc65wVx2znmbjJp2J_rxVg5vuqxB1HWRoqxb7Ho,2364
+AeroViz/rawDataReader/script/MA350.py,sha256=6brRnuqr1t93bdww5VlyK5lnKxW0aSEK0jrFmd8e3qk,1289
+AeroViz/rawDataReader/script/Minion.py,sha256=mojPfHRZaCj6c_LHqDaSXoxCZ_IfaznKOdl-EtDy1j0,7324
+AeroViz/rawDataReader/script/NEPH.py,sha256=QeD-42GMCXrbJayTSzrxBZtDkHYqmafwJ8D67xh8mNA,2737
+AeroViz/rawDataReader/script/OCEC.py,sha256=Bni0B1OOCrp9lfEXSD7XY3J56ekIqmpXmCTQlL0dlOk,2338
+AeroViz/rawDataReader/script/SMPS.py,sha256=EtXmeukOIwqfMwMJqv99_STfVg0uPdVr96r-tfD95gk,2774
+AeroViz/rawDataReader/script/TEOM.py,sha256=_nSMv1pv2DaTAIz6csDwDnIkKdHBXsUiblMSantK_l4,1791
 AeroViz/rawDataReader/script/VOC.py,sha256=sUn3ba_iYQ8Uy8qKNI-6qb1YvHsKN4G6BosBnLLMctc,1269
-AeroViz/rawDataReader/script/__init__.py,sha256=EXLjVwKN-wr3pMi-ILjiPH86ojwfoIif5vG2Q__DGZc,225
+AeroViz/rawDataReader/script/XRF.py,sha256=SU1-D94GkwdkjlNXcyXbwQG1tOYCpeL6GTVkaLBHc-s,187
+AeroViz/rawDataReader/script/__init__.py,sha256=s3c797Q8EAGcJCxVRTA-KdHie-vHLNYbMxwa5c0qz-I,214
 AeroViz/tools/__init__.py,sha256=tPUmCI9Fi1LgE-QSVnzan5jRdYQBIENH9PRDXB_DhTw,109
 AeroViz/tools/database.py,sha256=05VzjJyhlRrhsZdhfFQ__7CxGm4MdFekLjz3_Is5h9U,3430
 AeroViz/tools/dataclassifier.py,sha256=_wpv0PlZ5EGkcNqHxfFtdEsYvHP5FVE8sMZXikhm_YE,4492
 AeroViz/tools/dataprinter.py,sha256=Jq2Yztpa9YCOeLDVTrRs7PhSdNIPhEAexVj1YSuJ7hY,2249
 AeroViz/tools/datareader.py,sha256=iTQ0U8hdNMjCdbiH7EiKW10UEoxzxXRHc4s5_1IikJo,1933
-AeroViz-0.1.6.dist-info/LICENSE,sha256=E-679GpGGkp3irmtuJXiT7R4cNUA4cmsH6Q7QUgPf5U,1069
-AeroViz-0.1.6.dist-info/METADATA,sha256=Fp-P1AKOfLLX0c46uZms4TfEQ5ImonxFHThq5oHFs4c,5434
-AeroViz-0.1.6.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-AeroViz-0.1.6.dist-info/top_level.txt,sha256=BYsmTst_o4FZOKRP1XIvIMlN6mMTTXNfnSToL2_nVbQ,8
-AeroViz-0.1.6.dist-info/RECORD,,
+AeroViz-0.1.7.dist-info/LICENSE,sha256=E-679GpGGkp3irmtuJXiT7R4cNUA4cmsH6Q7QUgPf5U,1069
+AeroViz-0.1.7.dist-info/METADATA,sha256=l_GNd7nsHbJ9I91tBNuSEEsdguQY_CrMO21dGL2ltso,6289
+AeroViz-0.1.7.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+AeroViz-0.1.7.dist-info/top_level.txt,sha256=BYsmTst_o4FZOKRP1XIvIMlN6mMTTXNfnSToL2_nVbQ,8
+AeroViz-0.1.7.dist-info/RECORD,,

AeroViz/process/__init__.py

@@ -1,31 +0,0 @@
-from pathlib import Path
-
-from pandas import read_csv, concat
-
-from AeroViz.process.script import (ImpactProc, ImproveProc, ChemicalProc, ParticleSizeDistProc,
-                                    ExtinctionDistProc, OthersProc)
-
-__all__ = ['DataProcessor', 'ImpactProc', 'ImproveProc', 'ChemicalProc', 'ParticleSizeDistProc', 'ExtinctionDistProc', ]
-
-
-class DataProcessor:
-    def __new__(cls, file_path, reset: bool = False, save_file: Path | str = 'All_data.csv'):
-        file_path = Path(file_path)
-
-        print(f'\t\t \033[96m --- Processing Data --- \033[0m')
-
-        if file_path.exists() and not reset:
-            return read_csv(file_path, parse_dates=['Time'], index_col='Time',
-                            na_values=('-', 'E', 'F'), low_memory=False)
-
-        processor = [ImpactProc, ChemicalProc, ImproveProc, ParticleSizeDistProc, ExtinctionDistProc, OthersProc]
-        reset = [False, False, False, False, False, False]
-        save_filename = ['IMPACT.csv', 'chemical.csv', 'revised_IMPROVE.csv', 'PSD.csv', 'PESD.csv', 'Others.csv']
-
-        _df = concat([processor().process_data(reset, save_filename) for processor, reset, save_filename in
-                      zip(processor, reset, save_filename)], axis=1)
-
-        # 7. save result
-        _df.to_csv(file_path)
-
-        return _df

AeroViz/process/core/DataProc.py

@@ -1,19 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-from pandas import DataFrame
-
-__all__ = ['DataProc']
-
-
-class DataProc(ABC):
-    def __init__(self):
-        pass
-
-    @abstractmethod
-    def process_data(self,
-                     reset: bool = False,
-                     save_filename: str | Path = None
-                     ) -> DataFrame:
-        """ Implementation of processing data """
-        pass

AeroViz/process/core/SizeDist.py

@@ -1,90 +0,0 @@
-from typing import Literal
-
-import numpy as np
-from pandas import DataFrame
-
-__all__ = ['SizeDist']
-
-
-class SizeDist:
-    """
-    Attributes
-    ----------
-
-    _data: DataFrame
-        The processed PSD data stored as a pandas DataFrame.
-
-    _dp: ndarray
-        The array of particle diameters from the PSD data.
-
-    _dlogdp: ndarray
-        The array of logarithmic particle diameter bin widths.
-
-    _index: DatetimeIndex
-        The index of the DataFrame representing time.
-
-    _state: str
-        The state of particle size distribution data.
-
-    Methods
-    -------
-    number()
-        Calculate number distribution properties.
-
-    surface(filename='PSSD_dSdlogdp.csv')
-        Calculate surface distribution properties.
-
-    volume(filename='PVSD_dVdlogdp.csv')
-        Calculate volume distribution properties.
-
-    """
-
-    def __init__(self,
-                 data: DataFrame,
-                 state: Literal['dN', 'ddp', 'dlogdp'] = 'dlogdp',
-                 weighting: Literal['n', 's', 'v', 'ext_in', 'ext_ex'] = 'n'
-                 ):
-        self._data = data
-        self._dp = np.array(self._data.columns, dtype=float)
-        self._dlogdp = np.full_like(self._dp, 0.014)
-        self._index = self._data.index.copy()
-        self._state = state
-        self._weighting = weighting
-
-    @property
-    def data(self) -> DataFrame:
-        return self._data
-
-    @property
-    def dp(self) -> np.ndarray:
-        return self._dp
-
-    @dp.setter
-    def dp(self, new_dp: np.ndarray):
-        self._dp = new_dp
-
-    @property
-    def dlogdp(self) -> np.ndarray:
-        return self._dlogdp
-
-    @dlogdp.setter
-    def dlogdp(self, new_dlogdp: np.ndarray):
-        self._dlogdp = new_dlogdp
-
-    @property
-    def index(self):
-        return self._index
-
-    @property
-    def state(self):
-        return self._state
-
-    @state.setter
-    def state(self, value):
-        if value not in ['dN', 'dlogdp', 'ddp']:
-            raise ValueError("state must be 'dlogdp' or 'ddp'")
-        self._state = value
-
-    @property
-    def weighting(self):
-        return self._weighting