py-ewr 2.3.7__tar.gz → 2.3.9__tar.gz

{py_ewr-2.3.7 → py_ewr-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: py_ewr
-Version: 2.3.7
+Version: 2.3.9
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -34,6 +34,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: summary
@@ -43,23 +44,29 @@ Dynamic: summary
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.3.7 README**
+### **ewr tool version 2.3.9 README**
 
 ### **Notes on recent version updates**
-- Including metadata report (this is still being ironed out and tested)
-- CLLMM_c and CLLMM_d ewrs are now able to be calculated without all barrage level gauges being present in the model file. 
-- Including draft objective mapping files in the package (see below sub heading **Objective mapping** for more information). Objective mapping has been therefore pulled out of the parameter sheet
-- Including an example parallel processing script for running the EWR tool
+
+#### EWR handling and outputs
 - Adding handling for cases where there are single MDBA bigmod site IDs mapping to multiple different gauges
-- Fix SDL resource unit mapping in the parameter sheet
-- Adding lat and lon to the parameter sheet
-- ten thousand year handling - this has been brought back online.
-- Remove TQDM loading bars
-- Adding new model format handling - 'IQQM - netcdf'
-- Standard time-series handling added - each column needs a gauge, followed by and underscore, followed by either flow or level (e.g. 409025_flow). This handling also has missing date filling - so any missing dates will be filled with NaN values in all columns.
-- bug fixes: spells of length equal to the minimum required spell length were getting filtered out of the successful events table and successful interevents table, fixed misclassification of some gauges to flow, level, and lake level categories
 - New EWRs: New Qld EWRs - SF_FD and BF_FD used to look into the FD EWRs in closer detail.
 - Adding state and Surface Water SDL (SWSDL) to py-ewr output tables
+-  Including metadata report (this is still being ironed out and tested)
+-  New handling capabilities for FIRM model formated files
+
+#### Model metadata
+- Added new FIRM ID file mapping FIRM ID to gauge number.
+
+#### parameter metadata
+- Updated parameter sheet and objective mapping correcting some mismatched links between environmental objectives and EWRs
+- Fix SDL resource unit mapping in the parameter sheet
+- Adding lat and lon to the parameter sheet
+- Added in model handling for FIRM model outputs
+- Various minor variable renamings for consistency
+- Renamed MaxLevelRise to MaxLevelChange
+- Removed AnnualFlowSum and MinLevelRise column from parameter sheet
+- New format of objective mapping includes the adding of objective mapping back into the parameter sheet and one secondary dataframe (objective_reference.csv) in parameter metadata.
 
 ### **Installation**
 
@@ -77,13 +84,14 @@ pip install py-ewr
 ``` 
 
 ### Option 1: Running the observed mode of the tool
-The EWR tool will use a second program called gauge getter to first download the river data at the locations and dates selected and then run this through the EWR tool
+The ewr tool will use a second program called gauge getter to first download the river data at the locations and dates selected and then run this through the ewr tool.
+For more information please visit the [MDBA Gauge Getter](https://github.com/MDBAuth/MDBA_Gauge_Getter) github page. 
 
 ```python
 
 from datetime import datetime
 
-#USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+# USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 dates = {'start_date': datetime(YYYY, 7, 1), 
         'end_date': datetime(YYYY, 6, 30)}
@@ -98,15 +106,15 @@ gauges = ['Gauge1', 'Gauge2']
 
 from py_ewr.observed_handling import ObservedHandler
 
-# Running the EWR tool:
+# Running the ewr tool:
 ewr_oh = ObservedHandler(gauges=gauges, dates=dates)
 
 # Generating tables:
-# Table 1: Summarised EWR results for the entire timeseries
+# Table 1: Summarised ewr results for the entire timeseries
 ewr_results = ewr_oh.get_ewr_results()
 
-# Table 2: Summarised EWR results, aggregated to water years:
-yearly_ewr_results = ewr_oh.get_yearly_ewr_results()
+# Table 2: Summarised ewr results, aggregated to water years:
+yearly_results = ewr_oh.get_yearly_results()
 
 # Table 3: All events details regardless of duration 
 all_events = ewr_oh.get_all_events()
@@ -122,14 +130,23 @@ all_successful_interEvents = ewr_oh.get_all_successful_interEvents()
 
 ```
 
-### Option 2: Running model scenarios through the EWR tool
+### Option 2: Running model scenarios through the ewr tool
 
-1. Tell the tool where the model files are (can either be local or in a remote location)
+1. Tell the tool where the model files are (can either be local or in a remote location). For each scenario list the file path of each file. Python will default to the path relative to the directory it is being run from, but if you put a full file path you can choose any file.
+```python
+scenarios = {'Scenario1': ['path/to/file1', 'path/to/file2', 'path/to/file3'],
+             'Scenario2': ['path/to/file1', 'path/to/file2', 'path/to/file3']}
+```
 2. Tell the tool what format the model files are in. The current model format options are: 
     - 'Bigmod - MDBA'
         Bigmod formatted outputs
+      
     - 'Source - NSW (res.csv)'
         Source res.csv formatted outputs
+      
+    - 'FIRM - MDBA'
+        FIRM ID formatted outputs
+      
     - 'Standard time-series'
         The first column header should be *Date* with the date values in the YYYY-MM-DD format.
         The next columns should have the *gauge* followed by *_* followed by either *flow* or *level*
@@ -151,23 +168,31 @@ all_successful_interEvents = ewr_oh.get_all_successful_interEvents()
 
 
 ```python
-#USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+# USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 # Minimum 1 scenario and 1 related file required
-scenarios = {'Scenario1': ['file/location/1', 'file/location/2', 'file/location/3'],
-             'Scenario2': ['file/location/1', 'file/location/2', 'file/location/3']}
+scenarios = {'Scenario1': ['path/to/file1', 'path/to/file2', 'path/to/file3'],
+             'Scenario2': ['path/to/file1', 'path/to/file2', 'path/to/file3']}
 
 model_format = 'Bigmod - MDBA'
 
+#-----  other model formats include -----#
+# 'Bigmod - MDBA'
+# 'Source - NSW (res.csv)'
+# 'FIRM - MDBA'
+# 'Standard time-series'
+# 'ten thousand year'
+
 # END USER INPUT<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 ```
+File names will be incorporated into the Scenario column of the ewr tool output tables for tracebility of ewr tool output and corresponding model file. In the code written below, scenario name will be appendeded to the file name. eg. Scenario_name1_all_results.csv, therefore it is suggested to have informative scenario names that can traceback to your model files as well.
 
 ``` python
 from py_ewr.scenario_handling import ScenarioHandler
 import pandas as pd
 
-ewr_results_dict = {}
+summary_results_dict = {}
 yearly_results_dict = {}
 all_events_dict = {}
 all_interEvents_dict = {}
@@ -175,25 +200,25 @@ all_successful_Events_dict = {}
 all_successful_interEvents_dict = {}
 
 for scenario_name, scenario_list in scenarios.items():
-    ewr_results = pd.DataFrame()
-    yearly_ewr_results = pd.DataFrame()
+    summary_results = pd.DataFrame()
+    yearly_results = pd.DataFrame()
     all_events = pd.DataFrame()
     all_interEvents = pd.DataFrame()
     all_successful_Events = pd.DataFrame()
     all_successful_interEvents = pd.DataFrame()
     for file in scenarios[scenario_name]:
 
-        # Running the EWR tool:
+        # Running the ewr tool:
         ewr_sh = ScenarioHandler(scenario_file = file, 
                                 model_format = model_format)
 
         # Return each table and stitch the different files of the same scenario together:
-        # Table 1: Summarised EWR results for the entire timeseries
-        temp_ewr_results = ewr_sh.get_ewr_results()
-        ewr_results = pd.concat([ewr_results, temp_ewr_results], axis = 0)
-        # Table 2: Summarised EWR results, aggregated to water years:
-        temp_yearly_ewr_results = ewr_sh.get_yearly_ewr_results()
-        yearly_ewr_results = pd.concat([yearly_ewr_results, temp_yearly_ewr_results], axis = 0)
+        # Table 1: Summarised ewr results for the entire timeseries
+        temp_summary_results = ewr_sh.get_ewr_results()
+        summary_results = pd.concat([summary_results, temp_summary_results], axis = 0)
+        # Table 2: Summarised ewr results, aggregated to water years:
+        temp_yearly_results = ewr_sh.get_yearly_ewr_results()
+        yearly_results = pd.concat([yearly_results, temp_yearly_results], axis = 0)
         # Table 3: All events details regardless of duration 
         temp_all_events = ewr_sh.get_all_events()
         all_events = pd.concat([all_events, temp_all_events], axis = 0)
@@ -209,64 +234,74 @@ for scenario_name, scenario_list in scenarios.items():
         
 
     # Optional code to output results to csv files:
-    ewr_results.to_csv(scenario_name + 'all_results.csv')
-    yearly_ewr_results.to_csv(scenario_name + 'yearly_ewr_results.csv')
+    summary_results.to_csv(scenario_name + 'summary_results.csv')
+    yearly_results.to_csv(scenario_name + 'yearly_results.csv')
     all_events.to_csv(scenario_name + 'all_events.csv')
     all_interEvents.to_csv(scenario_name + 'all_interevents.csv')
     all_successful_Events.to_csv(scenario_name + 'all_successful_Events.csv')
     all_successful_interEvents.to_csv(scenario_name + 'all_successful_interEvents.csv')
 
     # Save the final tables to the dictionaries:   
-    ewr_results_dict[scenario_name] = ewr_results
-    yearly_results_dict[scenario_name] = yearly_ewr_results
-    all_events_dict[scenario_name] = all_events_dict
+    summary_results_dict[scenario_name] = summary_results
+    yearly_results_dict[scenario_name] = yearly_results
+    all_events_dict[scenario_name] = all_events
     all_interEvents_dict[scenario_name] = all_interEvents
     all_successful_Events_dict[scenario_name] = all_successful_Events
     all_successful_interEvents_dict[scenario_name] = all_successful_interEvents
 
 
 ```
-
+#### Optional arguments for ScenarioHandler
+```python
+        ewr_sh = ScenarioHandler(scenario_file = file, 
+                                model_format = model_format,
+                                parameter_sheet = parameter_sheet,
+                                calc_config_path = calc_config_path)
+```
+You may add a custom parameter sheet and or calc_config_file to your EWR tool run using the ```parameter_sheet``` and ```calc_config_path``` arguments.  These arguments take a string file path pointing to files. Please check this ewr_calc_config.json file found in parameter metadata to see if any EWRs in your custom parameter sheet are not represented in the calc_config_file. For an EWR to be calculated, it must be found in both calc_config.json and the parameter sheet.
 
 ### **Purpose**
 This tool has two purposes:
-1. Operational: Tracking EWR success at gauges of interest in real time - option 1 above.
-2. Planning: Comparing EWR success between scenarios (i.e. model runs) - option 2 above.
+1. Operational: Tracking ewr success at gauges of interest in real time - option 1 above.
+2. Planning: Comparing ewr success between scenarios (i.e. model runs) - option 2 above.
 
 **Support**
-For issues relating to the script, a tutorial, or feedback please contact Lara Palmer at lara.palmer@mdba.gov.au, Martin Job at martin.job@mdba.gov.au, or Joel Bailey at joel.bailey@mdba.gov.au
+For issues relating to the script, a tutorial, or feedback please contact Martin Job at martin.job@mdba.gov.au, Sirous Safari Pour at sirous.safaripour@mdba.gov.au, Elisha Freedman at elisha.freedman@mdba.gov.au, Joel Bailey at joel.bailey@mdba.gov.au, or Lara Palmer at lara.palmer@mdba.gov.au.
 
 
 **Disclaimer**
-Every effort has been taken to ensure the EWR database represents the original EWRs from state Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) as best as possible, and that the code within this tool has been developed to interpret and analyse these EWRs in an accurate way. However, there may still be unresolved bugs in the EWR parameter sheet and/or EWR tool. Please report any bugs to the issues tab under the GitHub project so we can investigate further. 
+Every effort has been taken to ensure the ewr database represents the original EWRs from state Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) as best as possible, and that the code within this tool has been developed to interpret and analyse these EWRs in an accurate way. However, there may still be unresolved bugs in the ewr parameter sheet and/or ewr tool. Please report any bugs to the issues tab under the GitHub project so we can investigate further. 
 
 
 **Notes on development of the dataset of EWRs**
 The MDBA has worked with Basin state representatives to ensure scientific integrity of EWRs has been maintained when translating from raw EWRs in the Basin state LTWPs and EWMPs to the machine readable format found in the parameter sheet within this tool. 
 
+Environmental Water Requirements (EWRs) in the tool are subject to change when the relevant documents including Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) are updated or move from draft to final versions. LTWPs that are currently in draft form include the ACT and the upper Murrumbidgee section of the NSW Murrumbidgee LTWP.
+
 **Compatibility**
 
-NSW:
 - All Queensland catchments
 - All New South Wales catchments
 - All South Australian catchments
 - All EWRs from river based Environmental Water Management Plans (EWMPs) in Victoria*
+- All EWRs for ACT (draft version)
 
-*Currently the wetland EWMPS and mixed wetland-river EWMPs in Victoria contain EWRs that cannot be evaluated by an automated EWR tool so the EWRs from these plans have been left out for now. The MDBA will work with our Victorian colleagues to ensure any updated EWRs in these plans are integrated into the tool where possible.
+*The wetland EWMPS and mixed wetland-river EWMPs in Victoria are in progress. The MDBA will work with our Victorian colleagues to ensure any updated EWRs in these plans are integrated into the tool where possible.
 
 **Input data**
 
 - Gauge data from the relevant Basin state websites and the Bureau of Meteorology website
 - Scenario data input by the user
 - Model metadata for location association between gauge ID's and model nodes
-- EWR parameter sheet
+#### optional
+- ewr parameter sheet
+- calc_config.json 
 
-**Running the tool**
+**Objective mapping**
+The objective mapping is located in the EWR tool package. This is intended to be used to link EWRs to the detailed objectives, theme level targets and specific goals. The objective reference file is located in the py_ewr/parameter_metadata folder:
 
-Consult the user manual for instructions on how to run the tool. Please email the above email addresses for a copy of the user manual.
+parameter_sheet.csv (EnvObj column)
+obj_reference.csv
 
-**Objective mapping**
-Objective mapping csv files are now included in the EWR tool package. Currently this objective mapping is in an early draft format. The objective mapping will be finalised after consultation with relevant state representatives. The files are intended to be used together to link EWRs to the detailed objectives, theme level targets and specific goals. The three sheets are located in the py_ewr/parameter_metadata folder:
-- ewr2obj.csv: For each planning unit, gauge, ewr combination there are either one or many env_obj codes. These env_obj codes come under one of five different theme level targets (Native Fish, Native vegetation, Waterbirds, Other species or Ecosystem functions)
-- obj2target.csv: env_obj's are unique to their planning unit in the LTWP (noting there are often a lot of similarities between env_obj's in the same states). The plain english wording of the env objectives is also contained in this csv. The LTWP, planning unit and env_obj rows are repeated for each specific goal related to that LTWP, planning unit and env_obj. 
-- obj2yrtarget.csv: The environmental objectives are related to 5, 10 and 20 year targets
+Contains the individual environmnetal objectives listed in the 'EnvObj' column of the parameter sheet and their ecological targets (Target) and plain english description of objectives (Objectives) for each planning unit, long term water plan (LTWPShortName), and surface water sustainable diversion limit (SWSDLName).
+the function ```get_obj_mapping()``` is available to automatically merge the information from obj_reference.csv with the parameter sheet to link these objectives with their specific ewr_codes.

{py_ewr-2.3.7 → py_ewr-2.3.9}/README.md

@@ -3,23 +3,29 @@
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.3.7 README**
+### **ewr tool version 2.3.9 README**
 
 ### **Notes on recent version updates**
-- Including metadata report (this is still being ironed out and tested)
-- CLLMM_c and CLLMM_d ewrs are now able to be calculated without all barrage level gauges being present in the model file. 
-- Including draft objective mapping files in the package (see below sub heading **Objective mapping** for more information). Objective mapping has been therefore pulled out of the parameter sheet
-- Including an example parallel processing script for running the EWR tool
+
+#### EWR handling and outputs
 - Adding handling for cases where there are single MDBA bigmod site IDs mapping to multiple different gauges
-- Fix SDL resource unit mapping in the parameter sheet
-- Adding lat and lon to the parameter sheet
-- ten thousand year handling - this has been brought back online.
-- Remove TQDM loading bars
-- Adding new model format handling - 'IQQM - netcdf'
-- Standard time-series handling added - each column needs a gauge, followed by and underscore, followed by either flow or level (e.g. 409025_flow). This handling also has missing date filling - so any missing dates will be filled with NaN values in all columns.
-- bug fixes: spells of length equal to the minimum required spell length were getting filtered out of the successful events table and successful interevents table, fixed misclassification of some gauges to flow, level, and lake level categories
 - New EWRs: New Qld EWRs - SF_FD and BF_FD used to look into the FD EWRs in closer detail.
 - Adding state and Surface Water SDL (SWSDL) to py-ewr output tables
+-  Including metadata report (this is still being ironed out and tested)
+-  New handling capabilities for FIRM model formated files
+
+#### Model metadata
+- Added new FIRM ID file mapping FIRM ID to gauge number.
+
+#### parameter metadata
+- Updated parameter sheet and objective mapping correcting some mismatched links between environmental objectives and EWRs
+- Fix SDL resource unit mapping in the parameter sheet
+- Adding lat and lon to the parameter sheet
+- Added in model handling for FIRM model outputs
+- Various minor variable renamings for consistency
+- Renamed MaxLevelRise to MaxLevelChange
+- Removed AnnualFlowSum and MinLevelRise column from parameter sheet
+- New format of objective mapping includes the adding of objective mapping back into the parameter sheet and one secondary dataframe (objective_reference.csv) in parameter metadata.
 
 ### **Installation**
 
@@ -37,13 +43,14 @@ pip install py-ewr
 ``` 
 
 ### Option 1: Running the observed mode of the tool
-The EWR tool will use a second program called gauge getter to first download the river data at the locations and dates selected and then run this through the EWR tool
+The ewr tool will use a second program called gauge getter to first download the river data at the locations and dates selected and then run this through the ewr tool.
+For more information please visit the [MDBA Gauge Getter](https://github.com/MDBAuth/MDBA_Gauge_Getter) github page. 
 
 ```python
 
 from datetime import datetime
 
-#USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+# USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 dates = {'start_date': datetime(YYYY, 7, 1), 
         'end_date': datetime(YYYY, 6, 30)}
@@ -58,15 +65,15 @@ gauges = ['Gauge1', 'Gauge2']
 
 from py_ewr.observed_handling import ObservedHandler
 
-# Running the EWR tool:
+# Running the ewr tool:
 ewr_oh = ObservedHandler(gauges=gauges, dates=dates)
 
 # Generating tables:
-# Table 1: Summarised EWR results for the entire timeseries
+# Table 1: Summarised ewr results for the entire timeseries
 ewr_results = ewr_oh.get_ewr_results()
 
-# Table 2: Summarised EWR results, aggregated to water years:
-yearly_ewr_results = ewr_oh.get_yearly_ewr_results()
+# Table 2: Summarised ewr results, aggregated to water years:
+yearly_results = ewr_oh.get_yearly_results()
 
 # Table 3: All events details regardless of duration 
 all_events = ewr_oh.get_all_events()
@@ -82,14 +89,23 @@ all_successful_interEvents = ewr_oh.get_all_successful_interEvents()
 
 ```
 
-### Option 2: Running model scenarios through the EWR tool
+### Option 2: Running model scenarios through the ewr tool
 
-1. Tell the tool where the model files are (can either be local or in a remote location)
+1. Tell the tool where the model files are (can either be local or in a remote location). For each scenario list the file path of each file. Python will default to the path relative to the directory it is being run from, but if you put a full file path you can choose any file.
+```python
+scenarios = {'Scenario1': ['path/to/file1', 'path/to/file2', 'path/to/file3'],
+             'Scenario2': ['path/to/file1', 'path/to/file2', 'path/to/file3']}
+```
 2. Tell the tool what format the model files are in. The current model format options are: 
     - 'Bigmod - MDBA'
         Bigmod formatted outputs
+      
     - 'Source - NSW (res.csv)'
         Source res.csv formatted outputs
+      
+    - 'FIRM - MDBA'
+        FIRM ID formatted outputs
+      
     - 'Standard time-series'
         The first column header should be *Date* with the date values in the YYYY-MM-DD format.
         The next columns should have the *gauge* followed by *_* followed by either *flow* or *level*
@@ -111,23 +127,31 @@ all_successful_interEvents = ewr_oh.get_all_successful_interEvents()
 
 
 ```python
-#USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+# USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 # Minimum 1 scenario and 1 related file required
-scenarios = {'Scenario1': ['file/location/1', 'file/location/2', 'file/location/3'],
-             'Scenario2': ['file/location/1', 'file/location/2', 'file/location/3']}
+scenarios = {'Scenario1': ['path/to/file1', 'path/to/file2', 'path/to/file3'],
+             'Scenario2': ['path/to/file1', 'path/to/file2', 'path/to/file3']}
 
 model_format = 'Bigmod - MDBA'
 
+#-----  other model formats include -----#
+# 'Bigmod - MDBA'
+# 'Source - NSW (res.csv)'
+# 'FIRM - MDBA'
+# 'Standard time-series'
+# 'ten thousand year'
+
 # END USER INPUT<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 ```
+File names will be incorporated into the Scenario column of the ewr tool output tables for tracebility of ewr tool output and corresponding model file. In the code written below, scenario name will be appendeded to the file name. eg. Scenario_name1_all_results.csv, therefore it is suggested to have informative scenario names that can traceback to your model files as well.
 
 ``` python
 from py_ewr.scenario_handling import ScenarioHandler
 import pandas as pd
 
-ewr_results_dict = {}
+summary_results_dict = {}
 yearly_results_dict = {}
 all_events_dict = {}
 all_interEvents_dict = {}
@@ -135,25 +159,25 @@ all_successful_Events_dict = {}
 all_successful_interEvents_dict = {}
 
 for scenario_name, scenario_list in scenarios.items():
-    ewr_results = pd.DataFrame()
-    yearly_ewr_results = pd.DataFrame()
+    summary_results = pd.DataFrame()
+    yearly_results = pd.DataFrame()
     all_events = pd.DataFrame()
     all_interEvents = pd.DataFrame()
     all_successful_Events = pd.DataFrame()
     all_successful_interEvents = pd.DataFrame()
     for file in scenarios[scenario_name]:
 
-        # Running the EWR tool:
+        # Running the ewr tool:
         ewr_sh = ScenarioHandler(scenario_file = file, 
                                 model_format = model_format)
 
         # Return each table and stitch the different files of the same scenario together:
-        # Table 1: Summarised EWR results for the entire timeseries
-        temp_ewr_results = ewr_sh.get_ewr_results()
-        ewr_results = pd.concat([ewr_results, temp_ewr_results], axis = 0)
-        # Table 2: Summarised EWR results, aggregated to water years:
-        temp_yearly_ewr_results = ewr_sh.get_yearly_ewr_results()
-        yearly_ewr_results = pd.concat([yearly_ewr_results, temp_yearly_ewr_results], axis = 0)
+        # Table 1: Summarised ewr results for the entire timeseries
+        temp_summary_results = ewr_sh.get_ewr_results()
+        summary_results = pd.concat([summary_results, temp_summary_results], axis = 0)
+        # Table 2: Summarised ewr results, aggregated to water years:
+        temp_yearly_results = ewr_sh.get_yearly_ewr_results()
+        yearly_results = pd.concat([yearly_results, temp_yearly_results], axis = 0)
         # Table 3: All events details regardless of duration 
         temp_all_events = ewr_sh.get_all_events()
         all_events = pd.concat([all_events, temp_all_events], axis = 0)
@@ -169,64 +193,74 @@ for scenario_name, scenario_list in scenarios.items():
         
 
     # Optional code to output results to csv files:
-    ewr_results.to_csv(scenario_name + 'all_results.csv')
-    yearly_ewr_results.to_csv(scenario_name + 'yearly_ewr_results.csv')
+    summary_results.to_csv(scenario_name + 'summary_results.csv')
+    yearly_results.to_csv(scenario_name + 'yearly_results.csv')
     all_events.to_csv(scenario_name + 'all_events.csv')
     all_interEvents.to_csv(scenario_name + 'all_interevents.csv')
     all_successful_Events.to_csv(scenario_name + 'all_successful_Events.csv')
     all_successful_interEvents.to_csv(scenario_name + 'all_successful_interEvents.csv')
 
     # Save the final tables to the dictionaries:   
-    ewr_results_dict[scenario_name] = ewr_results
-    yearly_results_dict[scenario_name] = yearly_ewr_results
-    all_events_dict[scenario_name] = all_events_dict
+    summary_results_dict[scenario_name] = summary_results
+    yearly_results_dict[scenario_name] = yearly_results
+    all_events_dict[scenario_name] = all_events
     all_interEvents_dict[scenario_name] = all_interEvents
     all_successful_Events_dict[scenario_name] = all_successful_Events
     all_successful_interEvents_dict[scenario_name] = all_successful_interEvents
 
 
 ```
-
+#### Optional arguments for ScenarioHandler
+```python
+        ewr_sh = ScenarioHandler(scenario_file = file, 
+                                model_format = model_format,
+                                parameter_sheet = parameter_sheet,
+                                calc_config_path = calc_config_path)
+```
+You may add a custom parameter sheet and or calc_config_file to your EWR tool run using the ```parameter_sheet``` and ```calc_config_path``` arguments.  These arguments take a string file path pointing to files. Please check this ewr_calc_config.json file found in parameter metadata to see if any EWRs in your custom parameter sheet are not represented in the calc_config_file. For an EWR to be calculated, it must be found in both calc_config.json and the parameter sheet.
 
 ### **Purpose**
 This tool has two purposes:
-1. Operational: Tracking EWR success at gauges of interest in real time - option 1 above.
-2. Planning: Comparing EWR success between scenarios (i.e. model runs) - option 2 above.
+1. Operational: Tracking ewr success at gauges of interest in real time - option 1 above.
+2. Planning: Comparing ewr success between scenarios (i.e. model runs) - option 2 above.
 
 **Support**
-For issues relating to the script, a tutorial, or feedback please contact Lara Palmer at lara.palmer@mdba.gov.au, Martin Job at martin.job@mdba.gov.au, or Joel Bailey at joel.bailey@mdba.gov.au
+For issues relating to the script, a tutorial, or feedback please contact Martin Job at martin.job@mdba.gov.au, Sirous Safari Pour at sirous.safaripour@mdba.gov.au, Elisha Freedman at elisha.freedman@mdba.gov.au, Joel Bailey at joel.bailey@mdba.gov.au, or Lara Palmer at lara.palmer@mdba.gov.au.
 
 
 **Disclaimer**
-Every effort has been taken to ensure the EWR database represents the original EWRs from state Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) as best as possible, and that the code within this tool has been developed to interpret and analyse these EWRs in an accurate way. However, there may still be unresolved bugs in the EWR parameter sheet and/or EWR tool. Please report any bugs to the issues tab under the GitHub project so we can investigate further. 
+Every effort has been taken to ensure the ewr database represents the original EWRs from state Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) as best as possible, and that the code within this tool has been developed to interpret and analyse these EWRs in an accurate way. However, there may still be unresolved bugs in the ewr parameter sheet and/or ewr tool. Please report any bugs to the issues tab under the GitHub project so we can investigate further. 
 
 
 **Notes on development of the dataset of EWRs**
 The MDBA has worked with Basin state representatives to ensure scientific integrity of EWRs has been maintained when translating from raw EWRs in the Basin state LTWPs and EWMPs to the machine readable format found in the parameter sheet within this tool. 
 
+Environmental Water Requirements (EWRs) in the tool are subject to change when the relevant documents including Long Term Water Plans (LTWPs) and Environmental Water Management Plans (EWMPs) are updated or move from draft to final versions. LTWPs that are currently in draft form include the ACT and the upper Murrumbidgee section of the NSW Murrumbidgee LTWP.
+
 **Compatibility**
 
-NSW:
 - All Queensland catchments
 - All New South Wales catchments
 - All South Australian catchments
 - All EWRs from river based Environmental Water Management Plans (EWMPs) in Victoria*
+- All EWRs for ACT (draft version)
 
-*Currently the wetland EWMPS and mixed wetland-river EWMPs in Victoria contain EWRs that cannot be evaluated by an automated EWR tool so the EWRs from these plans have been left out for now. The MDBA will work with our Victorian colleagues to ensure any updated EWRs in these plans are integrated into the tool where possible.
+*The wetland EWMPS and mixed wetland-river EWMPs in Victoria are in progress. The MDBA will work with our Victorian colleagues to ensure any updated EWRs in these plans are integrated into the tool where possible.
 
 **Input data**
 
 - Gauge data from the relevant Basin state websites and the Bureau of Meteorology website
 - Scenario data input by the user
 - Model metadata for location association between gauge ID's and model nodes
-- EWR parameter sheet
+#### optional
+- ewr parameter sheet
+- calc_config.json 
 
-**Running the tool**
+**Objective mapping**
+The objective mapping is located in the EWR tool package. This is intended to be used to link EWRs to the detailed objectives, theme level targets and specific goals. The objective reference file is located in the py_ewr/parameter_metadata folder:
 
-Consult the user manual for instructions on how to run the tool. Please email the above email addresses for a copy of the user manual.
+parameter_sheet.csv (EnvObj column)
+obj_reference.csv
 
-**Objective mapping**
-Objective mapping csv files are now included in the EWR tool package. Currently this objective mapping is in an early draft format. The objective mapping will be finalised after consultation with relevant state representatives. The files are intended to be used together to link EWRs to the detailed objectives, theme level targets and specific goals. The three sheets are located in the py_ewr/parameter_metadata folder:
-- ewr2obj.csv: For each planning unit, gauge, ewr combination there are either one or many env_obj codes. These env_obj codes come under one of five different theme level targets (Native Fish, Native vegetation, Waterbirds, Other species or Ecosystem functions)
-- obj2target.csv: env_obj's are unique to their planning unit in the LTWP (noting there are often a lot of similarities between env_obj's in the same states). The plain english wording of the env objectives is also contained in this csv. The LTWP, planning unit and env_obj rows are repeated for each specific goal related to that LTWP, planning unit and env_obj. 
-- obj2yrtarget.csv: The environmental objectives are related to 5, 10 and 20 year targets
+Contains the individual environmnetal objectives listed in the 'EnvObj' column of the parameter sheet and their ecological targets (Target) and plain english description of objectives (Objectives) for each planning unit, long term water plan (LTWPShortName), and surface water sustainable diversion limit (SWSDLName).
+the function ```get_obj_mapping()``` is available to automatically merge the information from obj_reference.csv with the parameter sheet to link these objectives with their specific ewr_codes.