diff --git a/coordinator/ProcessorEpidemiology.py b/coordinator/ProcessorEpidemiology.py index 3dbd1d90613f18dbaca0c68b2704ae46dd5c04a9..7dad3c3cc102755d66251f7041d437a5a68aff9b 100644 --- a/coordinator/ProcessorEpidemiology.py +++ b/coordinator/ProcessorEpidemiology.py @@ -19,11 +19,9 @@ from rasterio import open as rio_open from EpiModel import ( # created by rs481 EpiAnalysis, EpiModel, - EpiPrep, - EpiPrepLister, - EpiPrepLoader, plotRaster ) +from EpiModel.EpiPrep import lister, loader, prep from ews_postprocessing.epi.epi_post_processor import EPIPostPostProcessor from ProcessorUtils import ( @@ -272,7 +270,7 @@ def process_in_job_epi(jobPath,status,config,component): # Use config-defined file lister file_lister_dep_name = config_epi['Deposition']['FileListerFunction'] - file_lister_dep = getattr(EpiPrepLister,file_lister_dep_name) + file_lister_dep = getattr(lister,file_lister_dep_name) config_for_lister = config.copy() config_for_lister.update(config_epi) @@ -286,10 +284,10 @@ def process_in_job_epi(jobPath,status,config,component): try: - EpiPrep.prep_input(config_for_lister,start_date,end_date, + prep.prep_input(config_for_lister,start_date,end_date, component='Deposition', file_lister=file_lister_dep, - file_loader=EpiPrepLoader.load_NAME_file, + file_loader=loader.load_NAME_file, lister_kwargs=lister_kwargs, **loader_kwargs) @@ -363,16 +361,16 @@ def process_in_job_epi(jobPath,status,config,component): # Use config-defined file lister file_lister_env_name = config_epi['Environment']['FileListerFunction'] - file_lister_env = getattr(EpiPrepLister,file_lister_env_name) + file_lister_env = getattr(lister,file_lister_env_name) config_for_lister = config.copy() config_for_lister.update(config_epi) try: - EpiPrep.prep_input(config_for_lister,start_date,end_date, + prep.prep_input(config_for_lister,start_date,end_date, component='Environment', - file_loader=EpiPrepLoader.load_env_file, + file_loader=loader.load_env_file, file_lister=file_lister_env) assert os.path.isfile(config_epi['Environment']['FileNamePrepared'])