Remove references to "reader_dir" which is not longer required

radas/adas_interface/read_adf11_file.py

@@ -14,7 +14,7 @@ def load_library(library_name: str, filepath: Path):
 
 
 def read_adf11_file(
-    reader_dir, data_file_dir, species_name, dataset_type, dataset_config
+    data_file_dir, species_name, dataset_type
 ) -> dict:
     """Open and read an ADF11 OpenADAS file.
     

radas/cli.py

@@ -89,10 +89,9 @@ def run_radas(
     if verbose:
         print(f"Running radas in {radas_dir.absolute()}")
     data_file_dir = radas_dir / "data_files"
-    reader_dir = radas_dir / "readers"
     output_dir = radas_dir / "output"
 
-    for path in [radas_dir, data_file_dir, reader_dir, output_dir]:
+    for path in [radas_dir, data_file_dir, output_dir]:
         path.mkdir(exist_ok=True)
 
     if species == ("none",):
@@ -126,7 +125,7 @@ def run_radas(
                 (species_name in species) or (species == ("all",))
             ):
                 datasets[species_name] = read_rate_coeff(
-                    reader_dir, data_file_dir, species_name, configuration
+                    data_file_dir, species_name, configuration
                 )
 
         output_dir.mkdir(exist_ok=True, parents=True)

radas/read_rate_coeffs.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 
-def read_rate_coeff(reader_dir, data_file_dir, species_name, config):
+def read_rate_coeff(data_file_dir, species_name, config):
     """Builds a rate_dataset combining all of the raw data available for a given species."""
     config_for_species = config["species"][species_name]
 
@@ -26,7 +26,6 @@ def read_rate_coeff(reader_dir, data_file_dir, species_name, config):
 
         if reader_key == "adf11":
             rate_dataset = build_adf11_rate_dataset(
-                reader_dir,
                 data_file_dir,
                 species_name,
                 dataset_type,
@@ -82,13 +81,11 @@ def determine_coordinates(dataset: xr.Dataset, rate_dataset: xr.Dataset):
 
 
 def build_adf11_rate_dataset(
-    reader_dir, data_file_dir, species_name, dataset_type, dataset_config
+    data_file_dir, species_name, dataset_type, dataset_config
 ):
     from .adas_interface.read_adf11_file import read_adf11_file
 
-    data = read_adf11_file(
-        reader_dir, data_file_dir, species_name, dataset_type, dataset_config
-    )
+    data = read_adf11_file(data_file_dir, species_name, dataset_type)
 
     ds = xr.Dataset()
 

tests/conftest.py

@@ -28,12 +28,6 @@ def data_file_dir(radas_dir):
     return radas_dir / "data_files"
 
 
-@pytest.fixture(scope="session")
-def reader_dir(radas_dir):
-    (radas_dir / "readers").mkdir(exist_ok=False)
-    return radas_dir / "readers"
-
-
 @pytest.fixture(scope="session")
 def output_dir(radas_dir):
     (radas_dir / "output").mkdir(exist_ok=False)

tests/test_main.py

@@ -38,13 +38,13 @@ def test_download_species_data(data_file_dir, selected_species, configuration, v
 
 
 @pytest.fixture()
-def datasets(reader_dir, data_file_dir, selected_species, configuration, verbose):
+def datasets(data_file_dir, selected_species, configuration, verbose):
     from radas import read_rate_coeff
 
     datasets = dict()
 
     datasets[selected_species] = read_rate_coeff(
-        reader_dir, data_file_dir, selected_species, configuration
+        data_file_dir, selected_species, configuration
     )
 
     return datasets