Retrieve pp input dir from fre yaml, pass to analysis script engine call

Author: Chris Blanton

fre/analysis/plugins/esnb.py

@@ -14,7 +14,7 @@ def __init__(self):
         self.description = "Wrapper to access analysis framework for ESNB scripts"
         self.title = "ESNB"
 
-    def run_analysis(self, config, name, date_range, scripts_dir, output_dir, output_yaml):
+    def run_analysis(self, config, name, date_range, scripts_dir, output_dir, output_yaml, pp_dir):
         """Runs the ESNB analysis specified in the yaml and the runtime options
 
         Args:
@@ -24,6 +24,7 @@ def run_analysis(self, config, name, date_range, scripts_dir, output_dir, output
             scripts_dir: Path to a directory to save intermediate scripts
             output_dir: Path to a directory to save figures
             output_yaml: Path to use as an structured output yaml file
+            pp_dir: Path to input postprocessed files
         """
 
         # save notebook to scripts_dir
@@ -48,9 +49,14 @@ def run_analysis(self, config, name, date_range, scripts_dir, output_dir, output
         }
 
         # create case_settings dictionary
+        split_date = date_range.split(",")
+        case_settings = {
+            'PP_DIR': pp_dir,
+            'date_range': split_date
+        }
 
         # write the python script that runs the notebook
-        python_script = esnb.engine.canopy_launcher(run_settings, verbose=True) 
+        python_script = esnb.engine.canopy_launcher(run_settings, case_settings, verbose=True)
         fre_logger.debug(f"ESNB python wrapper saved to '{python_script}'")
 
         # run the python script

fre/analysis/plugins/subtools.py

@@ -127,7 +127,7 @@ def plugin_requirements(name):
     return _plugin_object(name).requires()
 
 
-def run_plugin(script_type, name, config, date_range, scripts_dir, output_dir, output_yaml):
+def run_plugin(script_type, name, config, date_range, scripts_dir, output_dir, output_yaml, pp_dir):
     """Runs the plugin's analysis.
 
     Args:
@@ -136,8 +136,9 @@ def run_plugin(script_type, name, config, date_range, scripts_dir, output_dir, o
         png_dir: Directory where the output figures will be stored.
         config: Dictionary of configuration values.
         catalog: Path to the catalog of reference data.
+        pp_dir: Directory to input pp files
 
     Returns:
         A list of png figure files that were created by the analysis.
     """
-    return _plugin_object(script_type).run_analysis(config, name, date_range, scripts_dir, output_dir, output_yaml)
+    return _plugin_object(script_type).run_analysis(config, name, date_range, scripts_dir, output_dir, output_yaml, pp_dir)

fre/analysis/subtools.py

@@ -94,9 +94,10 @@ def run_analysis(yaml, name, date_range, scripts_dir, output_dir, output_yaml):
         config_yaml = safe_load(file_)
         specific_config = config_yaml["analysis"][name]["specific_config"]
         script_type = config_yaml["analysis"][name]["script_type"]
+        pp_dir = config_yaml["directories"]["pp_dir"]
 
     # Run the analysis.
-    figure_paths = run_plugin(script_type, name, specific_config, date_range, scripts_dir, output_dir, output_yaml)
+    figure_paths = run_plugin(script_type, name, specific_config, date_range, scripts_dir, output_dir, output_yaml, pp_dir)
 
 
 def uninstall_analysis_package(name, library_directory=None):