Multiple statistics annotations on one plot (#80)

* restructure eva stats method to use emcpy add text function * multistats working * update test files and emcpy commit * pep8 * update emcpy hash --------- Co-authored-by: danholdaway <[email protected]>
JCSDA-internal · Mar 8, 2023 · 7f93ee9 · 7f93ee9
1 parent 2506383
commit 7f93ee9
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 286 deletions.
diff --git a/setup.py b/setup.py
@@ -39,9 +39,9 @@
         'cartopy>=0.18.0',
         'scikit-learn>=1.0.2',
         'xarray>=0.11.3',
-        #  'seaborn==0.12',
         'emcpy @ git+https://github.com/NOAA-EMC/' +
-        'emcpy@dcdc868e7f48bb1ff55507f34c0548742af8bec1#egg=emcpy',
+        'emcpy@471cb60c44c51a7e07dfbd0173c276ecdc1b46f1#egg=emcpy',
+        # Option dependency for making density plots
         # 'seaborn==0.12',
     ],
     package_data={

diff --git a/src/eva/eva_tests.py b/src/eva/eva_tests.py
@@ -14,14 +14,11 @@
 # imports
 import argparse
 import os
-import nbformat
-from nbconvert.preprocessors import ExecutePreprocessor
 
 # local imports
 from eva.eva_path import return_eva_path
 from eva.utilities.logger import Logger, textcolors
 from eva.utilities.utils import load_yaml_file, replace_vars_dict, replace_vars_notebook
-
 from eva.plot_tools import figure_driver
 from eva.plot_tools.figure_driver import FigureDriver
 
@@ -64,6 +61,8 @@ def application_tests(logger):
 def notebook_tests(logger):
 
     from eva.eva_base import eva
+    import nbformat
+    from nbconvert.preprocessors import ExecutePreprocessor
 
     # Write some messaging
     logger.info(f'Running Eva notebook tests ...')

diff --git a/src/eva/tests/config/testGsiObsSpaceAmsuaMetop-A.yaml b/src/eva/tests/config/testGsiObsSpaceAmsuaMetop-A.yaml
@@ -36,18 +36,21 @@ diagnostics:
           add_legend:
             loc: 'upper left'
           statistics:
-            data:
-              variable: experiment::GsiNcDiag::Obs_Minus_Forecast_adjusted
-              channel: ${channel}
-            statistic list:
+            fields:
+              - field_name: experiment::GsiNcDiag::Obs_Minus_Forecast_adjusted
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.10
+                kwargs:
+                  color: 'black'
+                  fontsize: 8
+                  fontfamily: monospace
+            statistics_variables:
             - n
             - min
             - mean
             - max
             - std
-            - name
-            kwargs:
-              fontsize: 6
           layers:
           - type: Histogram
             data:

diff --git a/src/eva/tests/config/testIodaObsSpaceAircraft.yaml b/src/eva/tests/config/testIodaObsSpaceAircraft.yaml
@@ -221,17 +221,27 @@ diagnostics:
           add_legend:
             loc: 'upper left'
           statistics:
-            data:
-              variable: experiment::ObsValueMinusHofx::${variable}
-            statistic list:
+            fields:
+              - field_name: experiment::ObsValueMinusGsiHofXBc::${variable}
+                xloc: 0.5
+                yloc: -0.10
+                kwargs:
+                  color: 'blue'
+                  fontsize: 8
+                  fontfamily: monospace
+              - field_name: experiment::ObsValueMinusHofx::${variable}
+                xloc: 0.5
+                yloc: -0.13
+                kwargs:
+                  color: 'red'
+                  fontsize: 8
+                  fontfamily: monospace
+            statistics_variables:
             - n
             - min
             - mean
             - max
             - std
-            - name
-            kwargs:
-              fontsize: 6
           layers:
           - type: Histogram
             data:

diff --git a/src/eva/tests/config/testIodaObsSpaceAmsuaN19.yaml b/src/eva/tests/config/testIodaObsSpaceAmsuaN19.yaml
@@ -97,18 +97,29 @@ diagnostics:
           add_legend:
             loc: 'upper left'
           statistics:
-            data:
-              variable: experiment::hofx::${variable}
-              channel: ${channel}
-            statistic list:
+            fields:
+              - field_name: experiment::hofx::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.10
+                kwargs:
+                  color: 'black'
+                  fontsize: 8
+                  fontfamily: monospace
+              - field_name: experiment::hofxPassedQc::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.13
+                kwargs:
+                  color: 'red'
+                  fontsize: 8
+                  fontfamily: monospace
+            statistics_variables:
             - n
             - min
             - mean
             - max
             - std
-            - name
-            kwargs:
-              fontsize: 6
           layers:
           - type: Scatter
             x:
@@ -249,18 +260,29 @@ diagnostics:
           add_legend:
             loc: 'upper left'
           statistics:
-            data:
-              variable: experiment::ObsValueMinusHofx::${variable}
-              channel: ${channel}
-            statistic list:
+            fields:
+              - field_name: experiment::ObsValueMinusGsiHofXBc::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.10
+                kwargs:
+                  color: 'blue'
+                  fontsize: 8
+                  fontfamily: monospace
+              - field_name: experiment::ObsValueMinusHofx::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.13
+                kwargs:
+                  color: 'red'
+                  fontsize: 8
+                  fontfamily: monospace
+            statistics_variables:
             - n
             - min
             - mean
             - max
             - std
-            - name
-            kwargs:
-              fontsize: 6
           layers:
           - type: Histogram
             data:
@@ -296,18 +318,29 @@ diagnostics:
           add_legend:
             loc: 'upper left'
           statistics:
-            data:
-              variable: experiment::ObsValueMinusHofx::${variable}
-              channel: ${channel}
-            statistic list:
+            fields:
+              - field_name: experiment::ObsValueMinusGsiHofXBc::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.10
+                kwargs:
+                  color: 'blue'
+                  fontsize: 8
+                  fontfamily: monospace
+              - field_name: experiment::ObsValueMinusHofx::${variable}
+                channel: ${channel}
+                xloc: 0.5
+                yloc: -0.13
+                kwargs:
+                  color: 'red'
+                  fontsize: 8
+                  fontfamily: monospace
+            statistics_variables:
             - n
             - min
             - mean
             - max
             - std
-            - name
-            kwargs:
-              fontsize: 6
           layers:
           - type: Density
             data:
@@ -328,7 +361,6 @@ diagnostics:
 
     # Map plots
     # ---------
-
     # Observations
     - batch figure:
         variables: *variables
@@ -365,7 +397,6 @@ diagnostics:
             cmap: ${dynamic_cmap}
             vmin: ${dynamic_vmin}
             vmax: ${dynamic_vmax}
-
     # Observations over north polar region
     - batch figure:
         variables: *variables
@@ -402,7 +433,6 @@ diagnostics:
             cmap: ${dynamic_cmap}
             vmin: ${dynamic_vmin}
             vmax: ${dynamic_vmax}
-
     # omb jedi
     - batch figure:
         variables: *variables