disdrodb 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

disdrodb/l0/readers/LPM/ARM/ARM_LPM.py

@@ -30,6 +30,13 @@ def reader(
     #### Open the netCDF
     ds = open_raw_netcdf_file(filepath=filepath, logger=logger)
 
+    ##------------------------------------------------------------------------.
+    # Check correct dimensions
+    if ds.sizes["particle_diameter"] != 22 or ds.sizes["particle_fall_velocity"] != 20:
+        raise ValueError(
+            f"Dimensions of {filepath} {ds.sizes} do not match the expected dimensions for LPM sensor.",
+        )
+
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
     # Define dictionary mapping dataset variables to select and rename

disdrodb/l0/readers/PARSIVEL2/ARM/ARM_PARSIVEL2.py

@@ -32,6 +32,10 @@ def reader(
 
     ##------------------------------------------------------------------------.
     #### Adapt the dataframe to adhere to DISDRODB L0 standards
+    # Correct for inverted raw_spectrum axis
+    ds["raw_spectrum"] = ds["raw_spectrum"].transpose("time", "particle_size", "raw_fall_velocity")
+    ds["raw_spectrum"].data = ds["raw_spectrum"].data.swapaxes(1, 2)
+
     # Define dictionary mapping dataset variables to select and rename
     dict_names = {
         ### Dimensions

disdrodb/l0/readers/PARSIVEL2/CANADA/UQAM_NC.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2023 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""Reader for UQAM OTT PARSIVEL2 sensor in netCDF format."""
+
+from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
+from disdrodb.l0.l0b_nc_processing import open_raw_netcdf_file, standardize_raw_dataset
+
+
+@is_documented_by(reader_generic_docstring)
+def reader(
+    filepath,
+    logger=None,
+):
+    """Reader."""
+    ##------------------------------------------------------------------------.
+    #### Open the netCDF
+    ds = open_raw_netcdf_file(filepath=filepath, logger=logger)
+
+    ##------------------------------------------------------------------------.
+    #### Adapt the dataframe to adhere to DISDRODB L0 standards
+    # Add time coordinate
+    ds["time"] = ds["time_as_string"].astype("M8[s]")
+    ds["time"].attrs.pop("comment", None)
+    ds["time"].attrs.pop("units", None)
+    ds = ds.set_coords("time")
+
+    # Define dictionary mapping dataset variables to select and rename
+    dict_names = {
+        ### Dimensions
+        "diameter_classes": "diameter_bin_center",
+        "velocity_classes": "velocity_bin_center",
+        ### Variables
+        "rainfall_rate_32bit": "rainfall_rate_32bit",
+        "weather_code_synop_4680": "weather_code_synop_4680",
+        "weather_code_synop_4677": "weather_code_synop_4677",
+        "weather_code_metar_4678": "weather_code_metar_4678",
+        "weather_code_nws": "weather_code_nws",
+        "reflectivity_32bit": "reflectivity_32bit",
+        "mor_visibility": "mor_visibility",
+        "laser_amplitude": "laser_amplitude",
+        "number_particles_validated": "number_particles",
+        "sensor_temperature": "sensor_temperature",
+        "error_code": "error_code",
+        "kinetic_energy": "rain_kinetic_energy",
+        "fieldV": "raw_drop_average_velocity",
+        "fieldN": "raw_drop_concentration",
+        "raw_data": "raw_drop_number",
+    }
+
+    # Rename dataset variables and columns and infill missing variables
+    ds = standardize_raw_dataset(ds=ds, dict_names=dict_names, sensor_name="PARSIVEL2")
+
+    # Return the dataset adhering to DISDRODB L0B standards
+    return ds

disdrodb/l0/readers/PARSIVEL2/MPI/BCO_PARSIVEL2.py

@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2023 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+import pandas as pd
+
+from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
+from disdrodb.l0.l0a_processing import read_raw_text_file
+
+
+@is_documented_by(reader_generic_docstring)
+def reader(
+    filepath,
+    logger=None,
+):
+    """Reader."""
+    ##------------------------------------------------------------------------.
+    #### Define column names
+    column_names = ["TO_BE_PARSED"]
+
+    ##------------------------------------------------------------------------.
+    #### Define reader options
+    reader_kwargs = {}
+
+    # - Define delimiter
+    reader_kwargs["delimiter"] = "/\n"
+
+    # Skip first row as columns names
+    reader_kwargs["header"] = None
+
+    # Skip first 2 rows
+    reader_kwargs["skiprows"] = 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"
+
+    # - 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"]
+
+    ##------------------------------------------------------------------------.
+    #### Read the data
+    df = read_raw_text_file(
+        filepath=filepath,
+        column_names=column_names,
+        reader_kwargs=reader_kwargs,
+        logger=logger,
+    )
+
+    ##------------------------------------------------------------------------.
+    #### Adapt the dataframe to adhere to DISDRODB L0 standards
+    # Remove rows with invalid length
+    # df = df[df["TO_BE_PARSED"].str.len().isin([4664])]
+
+    # Count number of delimiters to select valid rows
+    df = df[df["TO_BE_PARSED"].str.count(";") == 1107]
+
+    # Split by ; delimiter
+    df = df["TO_BE_PARSED"].str.split(";", expand=True, n=19)
+
+    # Assign column names
+    names = [
+        "date",
+        "time",
+        "rainfall_rate_32bit",
+        "rainfall_accumulated_32bit",
+        "weather_code_synop_4680",
+        # "weather_code_synop_4677",
+        # "weather_code_metar_4678",
+        "reflectivity_32bit",
+        "mor_visibility",
+        "sample_interval",
+        "laser_amplitude",
+        "number_particles",
+        "sensor_temperature",
+        "sensor_serial_number",
+        "firmware_iop",
+        "sensor_heating_current",
+        "sensor_battery_voltage",
+        "sensor_status",
+        "station_name",
+        "rainfall_amount_absolute_32bit",
+        "error_code",
+        "ARRAY_TO_SPLIT",
+    ]
+
+    df.columns = names
+
+    # Define time in datetime format
+    time_str = df["date"] + " " + df["time"]
+    df["time"] = pd.to_datetime(time_str, format="%d.%m.%Y %H:%M:%S", errors="coerce")
+
+    # Add raw array
+    df["raw_drop_concentration"] = df["ARRAY_TO_SPLIT"].str[:224]
+    df["raw_drop_average_velocity"] = df["ARRAY_TO_SPLIT"].str[224:448]
+    df["raw_drop_number"] = df["ARRAY_TO_SPLIT"].str[448:]
+
+    # Drop columns not agreeing with DISDRODB L0 standards
+    columns_to_drop = [
+        "date",
+        "station_name",
+        "firmware_iop",
+        "ARRAY_TO_SPLIT",
+        "sensor_serial_number",
+        "sample_interval",
+    ]
+    df = df.drop(columns=columns_to_drop)
+
+    return df

disdrodb/l0/readers/PARSIVEL2/MPI/BOWTIE.py

@@ -0,0 +1,220 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2023 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+import os
+
+import numpy as np
+import pandas as pd
+
+from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
+from disdrodb.l0.l0a_processing import read_raw_text_file
+
+TRACKS_DICT = {
+    "M203": ("2024-08-16 02:53:21", "2024-09-24 07:59:57"),
+    "M204": ("2024-09-27 08:00:00", "2024-10-20 07:59:57"),
+    "M205": ("2024-10-23 08:00:01", "2024-11-28 13:00:01"),
+    "M206": ("2024-12-01 08:00:02", "2024-12-30 07:59:57"),
+    "M207": ("2025-01-04 08:00:01", "2025-02-11 10:25:15"),
+}
+
+
+def get_track_for_dataframe(df):
+    """Retrieve ship track identifier."""
+    df_start, df_end = df["time"].min(), df["time"].max()
+
+    overlaps = []
+    for key, (start, end) in TRACKS_DICT.items():
+        start, end = pd.to_datetime(start), pd.to_datetime(end)
+        # check if df range lies within track coverage
+        if df_start <= end and df_end >= start:
+            overlaps.append(key)
+    return overlaps
+
+
+def read_tracks_file(tracks_filepath):
+    """Read GPS master track file."""
+    df = pd.read_csv(
+        tracks_filepath,
+        names=["time", "latitude", "longitude", "flag"],
+        dtype={"time": str, "latitude": float, "longitude": float, "flag": str},
+        sep="\t",  # tab-separated
+        skiprows=1,  # skip the weird first line
+        engine="c",  # speed up reading
+    )
+    df["time"] = pd.to_datetime(df["time"])
+    return df
+
+
+def add_gps_coordinates(df, filepath):
+    """Add GPS coordinates to dataframe."""
+    # Retrieve useful tracks ids
+    tracks_ids = get_track_for_dataframe(df)
+
+    if len(tracks_ids) == 0:
+        df["latitude"] = np.nan
+        df["longitude"] = np.nan
+        return df
+
+    # Retrieve station base directory
+    station_base_dir = os.path.join(os.path.sep, *filepath.split(os.path.sep)[:-2])
+    # Define GPS files to read
+    tracks_filepaths = [os.path.join(station_base_dir, f"{tracks_id}_mastertrack.zip") for tracks_id in tracks_ids]
+    # Read GPS files
+    list_df_tracks = [read_tracks_file(fpath) for fpath in tracks_filepaths]
+    df_tracks = pd.concat(list_df_tracks)
+    df_tracks = df_tracks.dropna(subset=["time"])
+
+    # Ensure dataframes are sorted by time
+    df = df.sort_values("time")
+    df_tracks = df_tracks.sort_values("time")
+
+    # Remove bad flags
+    # df_tracks = df_tracks[df_tracks["flag"] == "1"]
+
+    # Remove flag column
+    df_tracks = df_tracks.drop(columns="flag")
+
+    # Add GPS coordinate to dataframe
+    df = pd.merge_asof(
+        df,
+        df_tracks,
+        on="time",
+        direction="nearest",
+        tolerance=pd.Timedelta("5min"),
+    )
+    return df
+
+
+@is_documented_by(reader_generic_docstring)
+def reader(
+    filepath,
+    logger=None,
+):
+    """Reader."""
+    ##------------------------------------------------------------------------.
+    #### Define column names
+    column_names = ["TO_BE_PARSED"]
+
+    ##------------------------------------------------------------------------.
+    #### Define reader options
+    reader_kwargs = {}
+
+    # - Define delimiter
+    reader_kwargs["delimiter"] = "/\n"
+
+    # Skip first row as columns names
+    reader_kwargs["header"] = None
+
+    # Skip first 2 rows
+    reader_kwargs["skiprows"] = 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"
+
+    # - 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"]
+
+    # - Define encoding
+    reader_kwargs["encoding"] = "latin1"
+
+    ##------------------------------------------------------------------------.
+    #### Read the data
+    df = read_raw_text_file(
+        filepath=filepath,
+        column_names=column_names,
+        reader_kwargs=reader_kwargs,
+        logger=logger,
+    )
+
+    ##------------------------------------------------------------------------.
+    #### Adapt the dataframe to adhere to DISDRODB L0 standards
+    # Remove rows with invalid length
+    # df = df[df["TO_BE_PARSED"].str.len().isin([4664])]
+
+    # Count number of delimiters to select valid rows
+    df = df[df["TO_BE_PARSED"].str.count(";") == 1107]
+
+    # Split by ; delimiter
+    df = df["TO_BE_PARSED"].str.split(";", expand=True, n=19)
+
+    # Assign column names
+    names = [
+        "date",
+        "time",
+        "rainfall_rate_32bit",
+        "rainfall_accumulated_32bit",
+        "weather_code_synop_4680",
+        # "weather_code_synop_4677",
+        # "weather_code_metar_4678",
+        "reflectivity_32bit",
+        "mor_visibility",
+        "sample_interval",
+        "laser_amplitude",
+        "number_particles",
+        "sensor_temperature",
+        "sensor_serial_number",
+        "firmware_iop",
+        "sensor_heating_current",
+        "sensor_battery_voltage",
+        "sensor_status",
+        "station_name",
+        "rainfall_amount_absolute_32bit",
+        "error_code",
+        "ARRAY_TO_SPLIT",
+    ]
+
+    df.columns = names
+
+    # Define time in datetime format
+    time_str = df["date"] + " " + df["time"]
+    df["time"] = pd.to_datetime(time_str, format="%d.%m.%Y %H:%M:%S", errors="coerce")
+    df = df.dropna(subset=["time"])
+
+    # Add raw array
+    df["raw_drop_concentration"] = df["ARRAY_TO_SPLIT"].str[:224]
+    df["raw_drop_average_velocity"] = df["ARRAY_TO_SPLIT"].str[224:448]
+    df["raw_drop_number"] = df["ARRAY_TO_SPLIT"].str[448:]
+
+    # Drop columns not agreeing with DISDRODB L0 standards
+    columns_to_drop = [
+        "date",
+        "station_name",
+        "firmware_iop",
+        "ARRAY_TO_SPLIT",
+        "sensor_serial_number",
+        "sample_interval",
+    ]
+    df = df.drop(columns=columns_to_drop)
+
+    # Add GPS coordinates
+    df = add_gps_coordinates(df, filepath=filepath)
+    return df

disdrodb/l0/readers/PARSIVEL2/NASA/LPVEX.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2023 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 APU stations.
+
+The reader allows to read raw  APU data from the following NASA campaigns:
+
+    - HYMEX
+    - IFLOODS
+    - IPHEX
+    - OLYMPEX
+    - ICEPOP
+    - IMPACTS
+    - GCPEX
+    - WFF
+
+"""
+
+import pandas as pd
+
+from disdrodb.l0.l0_reader import is_documented_by, reader_generic_docstring
+from disdrodb.l0.l0a_processing import read_raw_text_file
+
+
+@is_documented_by(reader_generic_docstring)
+def reader(
+    filepath,
+    logger=None,
+):
+    """Reader."""
+    ##------------------------------------------------------------------------.
+    #### Define column names
+    column_names = ["time", "TO_BE_SPLITTED"]
+
+    ##------------------------------------------------------------------------.
+    #### Define reader options
+    reader_kwargs = {}
+    # - Define delimiter
+    reader_kwargs["delimiter"] = ";"
+    # - Skip first row as columns names
+    reader_kwargs["header"] = None
+    reader_kwargs["skiprows"] = 0
+    # - Skip file with encoding errors
+    reader_kwargs["encoding_errors"] = "ignore"
+    # - 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"
+    # - 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", "-.-"]
+
+    ##------------------------------------------------------------------------.
+    #### Read the data
+    df = read_raw_text_file(
+        filepath=filepath,
+        column_names=column_names,
+        reader_kwargs=reader_kwargs,
+        logger=logger,
+    )
+
+    ##------------------------------------------------------------------------.
+    #### 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(",", n=3, expand=True)
+
+    # Assign column names
+    names = [
+        "station_name",
+        "unknown",
+        "unknown2",
+        "raw_drop_number",
+    ]
+    df.columns = names
+
+    # Add the time column
+    df["time"] = df_time
+
+    # Drop columns not agreeing with DISDRODB L0 standards
+    df = df.drop(columns=["station_name", "unknown", "unknown2"])
+
+    # Return the dataframe adhering to DISDRODB L0 standards
+    return df

disdrodb/l0/readers/PARSIVEL2/NETHERLANDS/DELFT_NC.py

@@ -65,5 +65,8 @@ def reader(
     # Rename dataset variables and columns and infill missing variables
     ds = standardize_raw_dataset(ds=ds, dict_names=dict_names, sensor_name="PARSIVEL2")
 
+    # Replace NaN flags
+    ds["raw_drop_number"] = ds["raw_drop_number"].where(ds["raw_drop_number"] < 65437)  # dummy flag 65437.0
+
     # Return the dataset adhering to DISDRODB L0B standards
     return ds

disdrodb/l1/fall_velocity.py

@@ -195,6 +195,7 @@ def ensure_valid_coordinates(ds, default_altitude=0, default_latitude=0, default
         The dataset with invalid coordinates replaced by default values.
 
     """
+    # TODO raise error if not present
     invalid_altitude = np.logical_or(np.isnan(ds["altitude"]), ds["altitude"] == -9999)
     ds["altitude"] = ds["altitude"].where(~invalid_altitude, default_altitude)
 
@@ -250,6 +251,12 @@ def get_raindrop_fall_velocity(diameter, method, ds_env=None):
         raise ValueError(f"{method} is an invalid fall velocity method. Valid methods: {available_methods}.")
     # Copy diameter
     diameter = diameter.copy()
+    # Initialize ds_env if None
+    # if ds_env is None:
+    #     ds_env = load_env_dataset(ds_env)
+
+    # TODO: wrapper for DISDRODB product !
+
     # Ensure valid altitude and geolocation (if missing set defaults)
     # - altitude required by Beard
     # - latitude required for gravity
@@ -258,3 +265,42 @@ def get_raindrop_fall_velocity(diameter, method, ds_env=None):
     func = dict_methods[method]
     fall_velocity = func(diameter, ds_env=ds_env) if method == "Beard1976" else func(diameter)
     return fall_velocity
+
+
+def get_dataset_fall_velocity(ds, method="Brandes2002"):
+    """Compute the fall velocity and add it to the dataset.
+
+    Parameters
+    ----------
+    ds : xarray.Dataset
+        DISDRODB L0C dataset.
+    method : str, optional
+        Method to compute fall velocity. The default method is ``"Brandes2002"``.
+
+    Returns
+    -------
+    xarray.Dataset
+        DISDRODB L0C dataset with an additional variable 'fall_velocity'.
+    """
+    from disdrodb.constants import DIAMETER_DIMENSION
+    from disdrodb.l1_env.routines import load_env_dataset
+
+    # Check if diameter dimension exists
+    if DIAMETER_DIMENSION not in ds.dims:
+        raise ValueError(f"Diameter dimension '{DIAMETER_DIMENSION}' not found in dataset dimensions.")
+
+    # Retrieve diameter values (in mm)
+    diameter_bin_center = ds["diameter_bin_center"]
+
+    # Ensure valid altitude and geolocation (if missing set defaults)
+    # TODO: MOBILE CASE !
+    default_geolocation = {"altitude": 0, "latitude": 0, "longitude": 0}
+    dataset_coords = {key: ds[key] for key in default_geolocation if key in ds}
+    default_geolocation.update(dataset_coords)
+    ds = ds.assign_coords(default_geolocation)
+
+    # TODO: deal with ENV dataset
+    ds_env = load_env_dataset(ds)
+
+    fall_velocity = get_raindrop_fall_velocity(diameter_bin_center, method=method, ds_env=ds_env)
+    return fall_velocity

disdrodb/l1/processing.py

@@ -83,7 +83,7 @@ def generate_l1(
     Returns
     -------
     xarray.Dataset
-        DISRODB L1 dataset.
+        DISDRODB L1 dataset.
     """
     # Retrieve source attributes
     attrs = ds.attrs.copy()

disdrodb/l2/processing.py

@@ -219,7 +219,7 @@ def generate_l2e(
     Returns
     -------
     xarray.Dataset
-        DISRODB L2E dataset.
+        DISDRODB L2E dataset.
     """
     # Check and prepapre input dataset
     ds = check_l2e_input_dataset(ds)