From 07919658774600391efe39d6ec202c8081724864 Mon Sep 17 00:00:00 2001 From: Daniel Savoiu Date: Wed, 1 Aug 2018 15:14:52 +0200 Subject: [PATCH] Prepare next release: some minor/cosmetic changes --- kafe/fit.py | 15 ++++++++------- kafe/multifit.py | 16 +++++++++------- kafe/stream.py | 6 +++--- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/kafe/fit.py b/kafe/fit.py index 723d9ff..5fd0da3 100644 --- a/kafe/fit.py +++ b/kafe/fit.py @@ -983,7 +983,7 @@ def do_fit(self, quiet=False, verbose=False): self.out_stream.flush() # write to output files - + def print_raw_results(self): ''' unformatted print-out of all fit results @@ -1428,14 +1428,15 @@ def plot_correlations(self): return cor_fig def close(self): - # close output file(s) + '''close output file(s)''' self.out_stream.close() - print('closing files') - + def __del__(self): - # close output file(s) - self.out_stream.close() - print('destructor class Fit: closing files') + '''destructor: close output file(s)''' + # check needed in case the constructor throws + if hasattr(self, 'out_stream'): + self.out_stream.close() + class GaussianConstraint(object): ''' diff --git a/kafe/multifit.py b/kafe/multifit.py index 7859db5..6769f3c 100644 --- a/kafe/multifit.py +++ b/kafe/multifit.py @@ -775,7 +775,7 @@ def do_fit(self, quiet=False, verbose=False): self.out_stream.flush() # write to output files - + # Private Methods ################## @@ -1402,15 +1402,17 @@ def plot_correlations(self, function=None): i, j, dchi2=[1., 2.3], axes=axarr[jp, ip]) return cor_fig + def close(self): - # close output file(s) + '''close output file(s)''' self.out_stream.close() - print('closing files') - + def __del__(self): - # close output file(s) - self.out_stream.close() - print('destructor class Fit: closing files') + '''destructor: close output file(s)''' + # check needed in case the constructor throws + if hasattr(self, 'out_stream'): + self.out_stream.close() + class _ParameterSpace(object): diff --git a/kafe/stream.py b/kafe/stream.py index 4d8be60..04ad83b 100644 --- a/kafe/stream.py +++ b/kafe/stream.py @@ -66,9 +66,9 @@ def __init__(self, out_file, suppress_stdout=False): try: file_like.write("") except AttributeError: - # self.out_file.append(open(file_like, 'a')) - #one-line buffe enforces output - self.out_file.append(open(file_like, 'a')) + # one-line buffer enforces output + #self.out_file.append(open(file_like, 'a')) + self.out_file.append(open(file_like, 'a', 1)) else: self.out_file.append(file_like) self.closed = False