From 37e900dd9118035cf1916a7fe2fd398f7b01a2a4 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 16 Aug 2019 14:23:47 +0200 Subject: [PATCH] wham now uses automask --- adaptiveumbrella/wham2d.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adaptiveumbrella/wham2d.py b/adaptiveumbrella/wham2d.py index 8b6379f..96e6e1b 100644 --- a/adaptiveumbrella/wham2d.py +++ b/adaptiveumbrella/wham2d.py @@ -74,7 +74,7 @@ class WHAM2DRunner(UmbrellaRunner): borders = self.get_wham_borders() - cmd = "{exec} Px={px} {min_x} {max_x} {frames_x} Py={py} {min_y} {max_y} {frames_y} {tol} {temperature} 0 {metafile} {outfile} 0".format( + cmd = "{exec} Px={px} {min_x} {max_x} {frames_x} Py={py} {min_y} {max_y} {frames_y} {tol} {temperature} 0 {metafile} {outfile} {mask}".format( exec=self.WHAM_EXEC, px=self.whamconfig['Px'], min_x=borders[0], @@ -87,7 +87,8 @@ class WHAM2DRunner(UmbrellaRunner): tol=self.whamconfig['tolerance'], temperature=self.whamconfig['temperature'], metafile=metafile_path, - outfile=output_path + outfile=output_path, + mask=1 ) if self.verbose: print(cmd)