disdrodb 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

disdrodb/l0/readers/PARSIVEL2/{NASA/GCPEX.py → NORWAY/UIB.py}

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -----------------------------------------------------------------------------.
 # Copyright (c) 2021-2023 DISDRODB developers
 #
@@ -15,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
-"""This reader allows to read raw data from NASA GCPEX, OLYMPEX and IPHEX campaigns."""
+"""DISDRODB reader for University of Bergen OTT Parsivel 2 raw data."""
+
 import pandas as pd
 
 from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
@@ -30,34 +30,44 @@ def reader(
     """Reader."""
     ##------------------------------------------------------------------------.
     #### Define column names
-    column_names = ["time", "TO_BE_SPLITTED"]
+    column_names = ["TO_PARSE"]
 
     ##------------------------------------------------------------------------.
     #### Define reader options
     reader_kwargs = {}
+
     # - Define delimiter
-    reader_kwargs["delimiter"] = ";"
+    reader_kwargs["delimiter"] = "\\n"
+
     # - Skip first row as columns names
     reader_kwargs["header"] = None
+
+    # - Skip header
     reader_kwargs["skiprows"] = 0
-    # - Skip file with encoding errors
-    reader_kwargs["encoding_errors"] = "ignore"
+
+    # - Define encoding
+    reader_kwargs["encoding"] = "ISO-8859-1"
+
     # - Avoid first column to become df index !!!
     reader_kwargs["index_col"] = False
+
     # - Define behaviour when encountering bad lines
     reader_kwargs["on_bad_lines"] = "skip"
+
     # - Define reader engine
     #   - C engine is faster
     #   - Python engine is more feature-complete
     reader_kwargs["engine"] = "python"
+
     # - Define on-the-fly decompression of on-disk data
     #   - Available: gzip, bz2, zip
-    reader_kwargs["compression"] = "infer"
+    # reader_kwargs['compression'] = 'xz'
+
     # - Strings to recognize as NA/NaN and replace with standard NA flags
     #   - Already included: '#N/A', '#N/A N/A', '#NA', '-1.#IND', '-1.#QNAN',
     #                       '-NaN', '-nan', '1.#IND', '1.#QNAN', '<NA>', 'N/A',
     #                       'NA', 'NULL', 'NaN', 'n/a', 'nan', 'null'
-    reader_kwargs["na_values"] = ["na", "", "error", "NA", "-.-"]
+    reader_kwargs["na_values"] = ["na", "error", "-.-", " NA"]
 
     ##------------------------------------------------------------------------.
     #### Read the data
@@ -70,37 +80,52 @@ def reader(
 
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
-    # Convert time column to datetime
-    df_time = pd.to_datetime(df["time"], format="%Y%m%d%H%M%S", errors="coerce")
+    # Remove corrupted rows
+    df = df[df["TO_PARSE"].str.count(";") == 1101]
 
-    # Split the 'TO_BE_SPLITTED' column
-    df = df["TO_BE_SPLITTED"].str.split(",", n=9, expand=True)
+    # Split into columns
+    df = df["TO_PARSE"].str.split(";", expand=True, n=13)
 
-    # Assign column names
+    # Assign columns names
     names = [
-        "station_name",
-        "sensor_status",
-        "sensor_temperature",
-        "number_particles",
+        "date",
+        "time",
         "rainfall_rate_32bit",
-        "reflectivity_16bit",
-        "mor_visibility",
+        "rainfall_accumulated_32bit",
+        "snowfall_rate",
         "weather_code_synop_4680",
-        "weather_code_synop_4677",
-        "raw_drop_number",
+        "reflectivity_32bit",
+        "mor_visibility",
+        "rain_kinetic_energy",
+        "sensor_temperature",
+        "laser_amplitude",
+        "number_particles",
+        "sensor_battery_voltage",
+        "TO_SPLIT",
     ]
     df.columns = names
 
-    # Add the time column
-    df["time"] = df_time
+    # Sanitize date
+    date = pd.to_datetime(df["date"], format="%d.%m.%Y", errors="coerce")
+    date = date.ffill().bfill()
 
-    # Drop columns not agreeing with DISDRODB L0 standards
-    df = df.drop(columns=["station_name"])
+    # Add datetime time column
+    time_str = date.astype(str) + "T" + df["time"]
+    df["time"] = pd.to_datetime(time_str, format="%Y-%m-%dT%H:%M:%S", errors="coerce")
+    df = df.drop(columns=["date"])
+
+    # Derive raw drop arrays
+    df_split = df["TO_SPLIT"].str.split(";", expand=True)
+    df["raw_drop_concentration"] = df_split.iloc[:, :32].agg(";".join, axis=1)
+    df["raw_drop_average_velocity"] = df_split.iloc[:, 32:64].agg(";".join, axis=1)
+    df["raw_drop_number"] = df_split.iloc[:, 64:].agg(";".join, axis=1)
+    del df_split
 
-    # Drop rows with invalid values
-    # --> Ensure that weather_code_synop_4677 has length 2
-    # --> If a previous column is missing it will have 000
-    df = df[df["weather_code_synop_4677"].str.len() == 2]
+    # Drop columns not agreeing with DISDRODB L0 standards
+    columns_to_drop = [
+        "TO_SPLIT",
+    ]
+    df = df.drop(columns=columns_to_drop)
 
     # Return the dataframe adhering to DISDRODB L0 standards
     return df

disdrodb/l0/readers/PARSIVEL2/PHILIPPINES/PAGASA.py

@@ -154,9 +154,12 @@ def read_txt_file(file, filename, logger):
     df["time"] = pd.to_datetime(time_str, format="%Y%m%d%H%M%S", errors="coerce")
 
     # Keep only rows with valid raw_drop_number
-    df = df[df["raw_drop_number"].str.count(";") == 1024]
-    if len(df) == 0:
-        raise ValueError("Invalid raw drop number field.")
+    invalid_data = df["raw_drop_number"].str.count(";") != 1024
+    df.loc[invalid_data, "raw_drop_number"] = "NaN"  # TODO: if number_particles = 0, could be set to "0".
+
+    # df = df[df["raw_drop_number"].str.count(";") == 1024]
+    # if len(df) == 0:
+    #     raise ValueError("Invalid raw drop number field.")
 
     # Drop columns not agreeing with DISDRODB L0 standards
     # columns_to_drop = [

disdrodb/l0/readers/{PARSIVEL/NASA/PIERS.py → PARSIVEL2/USA/CSU.py}

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -----------------------------------------------------------------------------.
 # Copyright (c) 2021-2023 DISDRODB developers
 #
@@ -15,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
+"""DISDRODB reader for Colorado State University OTT Parsivel 2 raw data."""
+
 import pandas as pd
 
 from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
@@ -29,34 +30,44 @@ def reader(
     """Reader."""
     ##------------------------------------------------------------------------.
     #### Define column names
-    column_names = ["time", "TO_BE_SPLITTED"]
+    column_names = ["TO_PARSE"]
 
     ##------------------------------------------------------------------------.
     #### Define reader options
     reader_kwargs = {}
+
     # - Define delimiter
-    reader_kwargs["delimiter"] = ";"
+    reader_kwargs["delimiter"] = "\\n"
+
     # - Skip first row as columns names
     reader_kwargs["header"] = None
+
+    # - Skip header
     reader_kwargs["skiprows"] = 0
-    # - Skip file with encoding errors
-    reader_kwargs["encoding_errors"] = "ignore"
+
+    # - Define encoding
+    reader_kwargs["encoding"] = "ISO-8859-1"
+
     # - Avoid first column to become df index !!!
     reader_kwargs["index_col"] = False
+
     # - Define behaviour when encountering bad lines
     reader_kwargs["on_bad_lines"] = "skip"
+
     # - Define reader engine
     #   - C engine is faster
     #   - Python engine is more feature-complete
     reader_kwargs["engine"] = "python"
+
     # - Define on-the-fly decompression of on-disk data
     #   - Available: gzip, bz2, zip
-    reader_kwargs["compression"] = "infer"
+    # reader_kwargs['compression'] = 'xz'
+
     # - Strings to recognize as NA/NaN and replace with standard NA flags
     #   - Already included: '#N/A', '#N/A N/A', '#NA', '-1.#IND', '-1.#QNAN',
     #                       '-NaN', '-nan', '1.#IND', '1.#QNAN', '<NA>', 'N/A',
     #                       'NA', 'NULL', 'NaN', 'n/a', 'nan', 'null'
-    reader_kwargs["na_values"] = ["na", "", "error", "NA", "-.-"]
+    reader_kwargs["na_values"] = ["na", "error", "-.-", " NA"]
 
     ##------------------------------------------------------------------------.
     #### Read the data
@@ -69,37 +80,59 @@ def reader(
 
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
-    # Convert time column to datetime
-    df_time = pd.to_datetime(df["time"], format="%Y%m%d%H%M%S", errors="coerce")
+    # Remove corrupted rows
+    df = df[df["TO_PARSE"].str.count(",").isin([15, 1040])]
 
-    # Split the 'TO_BE_SPLITTED' column
-    df = df["TO_BE_SPLITTED"].str.split(",", expand=True, n=9)
+    # Split into columns
+    df["TO_PARSE"] = df["TO_PARSE"] + ",0"
+    df = df["TO_PARSE"].str.split(",", expand=True, n=16)
 
-    # Assign column names
-    columns_names = [
-        "station_name",
-        "sensor_status",
-        "sensor_temperature",
-        "number_particles",
+    # Assign columns names
+    names = [
+        "date",
+        "time",
         "rainfall_rate_32bit",
-        "reflectivity_16bit",
-        "mor_visibility",
+        "rainfall_accumulated_32bit",
         "weather_code_synop_4680",
-        "weather_code_synop_4677",
+        "weather_code_metar_4678",
+        "weather_code_nws",
+        "reflectivity_32bit",
+        "mor_visibility",
+        "laser_amplitude",
+        "number_particles",
+        "sensor_temperature",
+        "sensor_heating_current",
+        "sensor_battery_voltage",
+        "rain_kinetic_energy",
+        "snowfall_rate",
         "raw_drop_number",
     ]
-    df.columns = columns_names
+    df.columns = names
 
-    # Add the time column
-    df["time"] = df_time
+    # Add datetime time column
+    time_str = df["date"] + "-" + df["time"]
+    df["time"] = pd.to_datetime(time_str, format="%d.%m.%Y-%H:%M:%S", errors="coerce")
 
-    # Drop columns not agreeing with DISDRODB L0 standards
-    df = df.drop(columns=["station_name"])
+    # Derive the raw spectrum
+    # - When no drops detected, None
+    # - After conversion to string, becomes NaN
+    df["raw_drop_number"] = df["raw_drop_number"].astype("string")
+    df["raw_drop_number"] = df["raw_drop_number"].str.strip()
+
+    # Remove <SPECTRUM> and </SPECTRUM> prefix and suffix from the raw_drop_number field
+    df["raw_drop_number"] = df["raw_drop_number"].str.replace("<SPECTRUM>", "")
+    df["raw_drop_number"] = df["raw_drop_number"].str.replace("</SPECTRUM>,0", "")
+
+    # Preprocess the raw spectrum and raw_drop_average_velocity
+    # - Add 0 before every ; if ; not preceded by a digit
+    # - Example: ';;1;;' --> '0;0;1;0;'
+    df["raw_drop_number"] = df["raw_drop_number"].str.replace(r"(?<!\d),", "0,", regex=True)
 
-    # Drop rows with invalid values
-    # --> Ensure that weather_code_synop_4677 has length 2
-    # --> If a previous column is missing it will have 000
-    df = df[df["weather_code_synop_4677"].str.len() == 2]
+    # Drop columns not agreeing with DISDRODB L0 standards
+    columns_to_drop = [
+        "date",
+    ]
+    df = df.drop(columns=columns_to_drop)
 
     # Return the dataframe adhering to DISDRODB L0 standards
     return df

disdrodb/l0/readers/PARSIVEL2/USA/CW3E.py

@@ -70,31 +70,58 @@ def reader(
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
     # Remove rows with invalid number of separators
-    df = df[df["TO_PARSE"].str.count(";") == 1105]
+    df = df[df["TO_PARSE"].str.count(";").isin([1104, 1105])]
+    if len(df) == 0:
+        raise ValueError(f"No valid data in {filepath}")
+
+    n_delimiters = int(df["TO_PARSE"].str.count(";").iloc[0])
+    if n_delimiters == 1104:
+        names = [
+            "sensor_serial_number",
+            "sensor_status",
+            "laser_amplitude",
+            "sensor_heating_current",
+            "sensor_battery_voltage",
+            "dummy_date",
+            "sensor_time",
+            "sensor_date",
+            # "sensor_temperature",
+            "number_particles",
+            "rainfall_rate_32bit",
+            "reflectivity_32bit",
+            "rainfall_accumulated_16bit",
+            "mor_visibility",
+            "weather_code_synop_4680",
+            "weather_code_synop_4677",
+            "TO_SPLIT",
+        ]
+        n = 15
+    else:
+        names = [
+            "sensor_serial_number",
+            "sensor_status",
+            "laser_amplitude",
+            "sensor_heating_current",
+            "sensor_battery_voltage",
+            "dummy_date",
+            "sensor_time",
+            "sensor_date",
+            "sensor_temperature",
+            "number_particles",
+            "rainfall_rate_32bit",
+            "reflectivity_32bit",
+            "rainfall_accumulated_16bit",
+            "mor_visibility",
+            "weather_code_synop_4680",
+            "weather_code_synop_4677",
+            "TO_SPLIT",
+        ]
+        n = 16
 
     # Split the columns
-    df = df["TO_PARSE"].str.split(";", n=16, expand=True)
+    df = df["TO_PARSE"].str.split(";", n=n, expand=True)
 
     # Assign column names
-    names = [
-        "sensor_serial_number",
-        "sensor_status",
-        "laser_amplitude",
-        "sensor_heating_current",
-        "sensor_battery_voltage",
-        "dummy_date",
-        "sensor_time",
-        "sensor_date",
-        "sensor_temperature",
-        "number_particles",
-        "rainfall_rate_32bit",
-        "reflectivity_32bit",
-        "rainfall_accumulated_16bit",
-        "mor_visibility",
-        "weather_code_synop_4680",
-        "weather_code_synop_4677",
-        "TO_SPLIT",
-    ]
     df.columns = names
 
     # Derive raw arrays

disdrodb/l0/readers/{PARSIVEL/NASA/IFLOODS.py → RD80/BRAZIL/ATTO_RD80.py}

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # -----------------------------------------------------------------------------.
 # Copyright (c) 2021-2023 DISDRODB developers
 #
@@ -29,17 +30,47 @@ def reader(
     """Reader."""
     ##------------------------------------------------------------------------.
     #### Define column names
-    column_names = ["time", "TO_BE_SPLITTED"]
+    column_names = [
+        "date",
+        "time",
+        "sensor_status",
+        "sample_interval",
+        "n1",
+        "n2",
+        "n3",
+        "n4",
+        "n5",
+        "n6",
+        "n7",
+        "n8",
+        "n9",
+        "n10",
+        "n11",
+        "n12",
+        "n13",
+        "n14",
+        "n15",
+        "n16",
+        "n17",
+        "n18",
+        "n19",
+        "n20",
+        "RI",
+        "RA",
+        "RAT",
+    ]
 
     ##------------------------------------------------------------------------.
     #### Define reader options
     reader_kwargs = {}
     # - Define delimiter
-    reader_kwargs["delimiter"] = ";"
-    # - Skip first row as columns names
+    reader_kwargs["delimiter"] = "\\t"
+    # Skip header
     reader_kwargs["header"] = None
-    # - Skip file with encoding errors
-    reader_kwargs["encoding_errors"] = "ignore"
+    # Skip first row as columns names
+    reader_kwargs["skiprows"] = 1
+    # - Define encoding
+    reader_kwargs["encoding"] = "ISO-8859-1"
     # - Avoid first column to become df index !!!
     reader_kwargs["index_col"] = False
     # - Define behaviour when encountering bad lines
@@ -55,7 +86,7 @@ def reader(
     #   - Already included: '#N/A', '#N/A N/A', '#NA', '-1.#IND', '-1.#QNAN',
     #                       '-NaN', '-nan', '1.#IND', '1.#QNAN', '<NA>', 'N/A',
     #                       'NA', 'NULL', 'NaN', 'n/a', 'nan', 'null'
-    reader_kwargs["na_values"] = ["na", "", "error", "NA", "-.-"]
+    reader_kwargs["na_values"] = ["na", "", "error"]
 
     ##------------------------------------------------------------------------.
     #### Read the data
@@ -68,37 +99,22 @@ def reader(
 
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
-    # Convert time column to datetime
-    df_time = pd.to_datetime(df["time"], format="%Y%m%d%H%M%S", errors="coerce")
-
-    # Split the 'TO_BE_SPLITTED' column
-    df = df["TO_BE_SPLITTED"].str.split(",", expand=True, n=9)
-
-    # Assign column names
-    columns_names = [
-        "station_name",
-        "sensor_status",
-        "sensor_temperature",
-        "number_particles",
-        "rainfall_rate_32bit",
-        "reflectivity_16bit",
-        "mor_visibility",
-        "weather_code_synop_4680",
-        "weather_code_synop_4677",
-        "raw_drop_number",
-    ]
-    df.columns = columns_names
+    # Replace 'status' NaN with 0
+    df["sensor_status"] = df["sensor_status"].astype(float).fillna(value=0).astype(int)
 
-    # Add the time column
-    df["time"] = df_time
+    # Define 'time' datetime column
+    df["time"] = df["date"].astype(str) + " " + df["time"].astype(str)
+    df["time"] = pd.to_datetime(df["time"], format="%Y-%m-%d %H:%M:%S", errors="coerce")
+    df = df.drop(columns=["date"])
 
-    # Drop columns not agreeing with DISDRODB L0 standards
-    df = df.drop(columns=["station_name"])
+    # Create raw_drop_number column
+    bin_columns = ["n" + str(i) for i in range(1, 21)]
+    df_arr = df[bin_columns]
+    df_raw_drop_number = df_arr.agg(";".join, axis=1)
+    df["raw_drop_number"] = df_raw_drop_number
 
-    # Drop rows with invalid values
-    # --> Ensure that weather_code_synop_4677 has length 2
-    # --> If a previous column is missing it will have 000
-    df = df[df["weather_code_synop_4677"].str.len() == 2]
+    # Remove bins columns
+    df = df.drop(columns=bin_columns)
 
     # Return the dataframe adhering to DISDRODB L0 standards
     return df

disdrodb/l0/readers/{SW250 → SWS250}/BELGIUM/KMI.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
-"""DISDRODB reader for KMI Biral SW250 sensors."""
+"""DISDRODB reader for KMI Biral SWS250 sensors."""
 import pandas as pd
 
 from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring

disdrodb/l1/beard_model.py

@@ -385,6 +385,49 @@ def get_water_density(temperature, air_pressure, sea_level_air_pressure=101_325)
     return get_pure_water_density(temperature) * np.exp(-1 * water_compressibility * delta_pressure)
 
 
+####---------------------------------------------------------------------------.
+#### Wrappers
+def retrieve_air_pressure(ds_env):
+    """Retrieve air pressure."""
+    if "air_pressure" in ds_env:
+        return ds_env["air_pressure"]
+    air_pressure = get_air_pressure_at_height(
+        altitude=ds_env["altitude"],
+        latitude=ds_env["latitude"],
+        temperature=ds_env["temperature"],
+        sea_level_air_pressure=ds_env["sea_level_air_pressure"],
+        lapse_rate=ds_env["lapse_rate"],
+    )
+    return air_pressure
+
+
+def retrieve_air_dynamic_viscosity(ds_env):
+    """Retrieve air dynamic viscosity."""
+    air_viscosity = get_air_dynamic_viscosity(ds_env["temperature"])
+    return air_viscosity
+
+
+def retrieve_air_density(ds_env):
+    """Retrieve air density."""
+    temperature = ds_env["temperature"]
+    relative_humidity = ds_env["relative_humidity"]
+    air_pressure = retrieve_air_pressure(ds_env)
+    vapor_pressure = get_vapor_actual_pressure(
+        relative_humidity=relative_humidity,
+        temperature=temperature,
+    )
+    air_density = get_air_density(
+        temperature=temperature,
+        air_pressure=air_pressure,
+        vapor_pressure=vapor_pressure,
+    )
+    return air_density
+
+
+####---------------------------------------------------------------------------.
+#### Beard model
+
+
 def get_raindrop_reynolds_number(diameter, temperature, air_density, water_density, g):
     """Compute raindrop Reynolds number.
 
@@ -395,6 +438,7 @@ def get_raindrop_reynolds_number(diameter, temperature, air_density, water_densi
     Coefficients are taken from Table 1 of Beard 1976.
 
     Reference: Beard 1976; Pruppacher & Klett 1978
+    See also Table A1 in Rahman et al., 2020.
 
     Parameters
     ----------
@@ -422,7 +466,7 @@ def get_raindrop_reynolds_number(diameter, temperature, air_density, water_densi
     air_viscosity = get_air_dynamic_viscosity(temperature)  # kg/(m*s) (aka Pa*s).
     delta_density = water_density - air_density
 
-    # Compute Davis number for small droplets
+    # Compute Davies number for small droplets
     davis_number = 4 * air_density * delta_density * g * diameter**3 / (3 * air_viscosity**2)
 
     # Compute the slip correction (is approx 1 and can be discarded)

disdrodb/l1/fall_velocity.py

@@ -45,11 +45,6 @@ def get_fall_velocity_atlas_1973(diameter):
     Reviews of Geophysics, 11(1), 1-35.
     https://doi.org/10.1029/RG011i001p00001
 
-    Atlas, D., & Ulbrich, C. W. (1977).
-    Path- and area-integrated rainfall measurement by microwave attenuation in the 1-3 cm band.
-    Journal of Applied Meteorology, 16(12), 1322-1331.
-    https://doi.org/10.1175/1520-0450(1977)016<1322:PAAIRM>2.0.CO;2
-
     Gunn, R., & Kinzer, G. D. (1949).
     The terminal velocity of fall for water droplets in stagnant air.
     Journal of Meteorology, 6(4), 243-248.
@@ -111,7 +106,7 @@ def get_fall_velocity_uplinger_1981(diameter):
 
     """
     # Valid between 0.1 and 7 mm
-    fall_velocity = 4.874 * diameter * np.exp(-0.195 * diameter)
+    fall_velocity = 4.874 * diameter * np.exp(-0.195 * diameter)  # 4.854?
     fall_velocity = fall_velocity.clip(min=0, max=None)
     return fall_velocity
 

disdrodb/l1/filters.py

@@ -157,6 +157,8 @@ def define_raindrop_spectrum_mask(
         A boolean mask array indicating valid bins according to the specified criteria.
 
     """
+    # TODO: use lower and upper fall_velocity !
+
     # Ensure it creates a 2D mask if the fall_velocity does not vary over time
     if "time" in drop_number.dims and "time" not in fall_velocity.dims:
         drop_number = drop_number.isel(time=0)

disdrodb/l2/empirical_dsd.py

@@ -220,27 +220,31 @@ def get_effective_sampling_area(sensor_name, diameter):
     check_sensor_name(sensor_name)
     if sensor_name in ["PARSIVEL", "PARSIVEL2"]:
         # Calculate sampling area for each diameter bin (S_i)
+        # - Parsivel remove margin fallers !
+        # - The effective sampling area decreases with increasing drop diameter
+        # sampling_area = 0.0054 # m2
         L = 180 / 1000  # Length of the Parsivel beam in m (180 mm)
         B = 30 / 1000  # Width of the Parsivel beam in m (30mm)
-        sampling_area = L * (B - diameter / 2)
+        sampling_area = L * (B - diameter / 2)  # d_eq
         return sampling_area
-    if sensor_name == "LPM":
+    if sensor_name in ["LPM", "LPM_V0"]:
         # Calculate sampling area for each diameter bin (S_i)
-        L = 228 / 1000  # Length of the Parsivel beam in m (228 mm)
-        B = 20 / 1000  # Width of the Parsivel beam in m (20 mm)
-        sampling_area = L * (B - diameter / 2)
+        # L = 228 / 1000  # Length of the beam in m (228 mm)
+        # B = 20 / 1000  # Width of the beam in m (20 mm)
+        # sampling_area = L * (B - diameter / 2)
+        sampling_area = 0.0045  # m2
         return sampling_area
     if sensor_name == "PWS100":
-        sampling_area = 0.004  # m2  # TODO: L * (B - diameter / 2) ?
+        sampling_area = 0.004  # m2
         return sampling_area
     if sensor_name == "RD80":
         sampling_area = 0.005  # m2
         return sampling_area
-    if sensor_name == "SWS250":  # TODO: L * (B - diameter / 2) ?
+    if sensor_name == "SWS250":
         # Table 29 of the manual that the sample volume is 400cm3, path length?
         # Distance between the end of the hood heaters is 291 mm.
         # Adding a factor of 1.5 for better representation of the Tx-Rx distance: L= 436 mm.
-        sampling_area = 0.0091  # m2
+        sampling_area = 0.0091  # m2 #  0.006504 m2 maybe?
         return sampling_area
     raise NotImplementedError(f"Effective sampling area for {sensor_name} must yet to be specified in the software.")