From 4ed88297d44a15ff4b585cbf01c0b62c321d82cb Mon Sep 17 00:00:00 2001
From: Daniel Bauer <bauer@cbs.tu-darmstadt.de>
Date: Wed, 20 Jun 2018 17:23:55 +0200
Subject: [PATCH] wham exit code

---
 adaptiveumbrella/__init__.py | 3 ++-
 adaptiveumbrella/wham2d.py   | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/adaptiveumbrella/__init__.py b/adaptiveumbrella/__init__.py
index 6516b48..ffb7e11 100644
--- a/adaptiveumbrella/__init__.py
+++ b/adaptiveumbrella/__init__.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 from .runner import UmbrellaRunner
+from .wham2d import WHAM2DRunner
 
 __all__ = ['AdaptiveUmbrella']
-__version__ = "0.3.0"
+__version__ = "0.3.1"
diff --git a/adaptiveumbrella/wham2d.py b/adaptiveumbrella/wham2d.py
index 849894b..28b3b08 100644
--- a/adaptiveumbrella/wham2d.py
+++ b/adaptiveumbrella/wham2d.py
@@ -33,6 +33,8 @@ class WHAM2DRunner(UmbrellaRunner):
         path = os.path.join(self.tmp_folder, "{}_metadata.dat".format(self.num_iterations))
         with open(path, 'w') as out:
             for file in os.listdir(self.simulation_folder):
+                if not os.path.exists(os.path.join(path, file, "COLVAR")):
+                    continue
                 prefix, x, y = file.split("_")
                 colvar_file = os.path.join(file, 'COLVAR')
                 out.write("{file}\t{x}\t{y}\t{fc_x}\t{fc_y}\n".format(
@@ -63,10 +65,9 @@ class WHAM2DRunner(UmbrellaRunner):
             outfile=output_path
         )
         print(cmd)
-        try:
-            subprocess.call(cmd, shell=True)
-        except OSError:
-            print("wham failed.")
+        err_code = subprocess.call(cmd, shell=True)
+        if err_code != 0:
+            print("wham exited with error code {}".format(err_corde))
             exit(1)
 
     def load_wham_pmf(self, wham_file):