From 3cceaef55eea21d5f36b859c3fd252ff4365806d Mon Sep 17 00:00:00 2001 From: sphemakh Date: Fri, 18 Jan 2019 11:30:09 +0200 Subject: [PATCH] Make crash when CASA crashes --- simms/__init__.py | 2 +- simms/casasm.py | 2 -- simms/simms.py | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simms/__init__.py b/simms/__init__.py index e13bd59..39e0411 100644 --- a/simms/__init__.py +++ b/simms/__init__.py @@ -1 +1 @@ -__version__ = "1.0.8" +__version__ = "1.0.9" diff --git a/simms/casasm.py b/simms/casasm.py index d6c194b..efc53e4 100644 --- a/simms/casasm.py +++ b/simms/casasm.py @@ -183,8 +183,6 @@ def toFloat(val): nscans = np.int( np.ceil( synthesis/scan_length[0] ) ) scan_length = scan_length*(nscans) - print sum(scan_length)/3600.0 - if ndir>=1: # if scan legth is not set, set it to equal the synthesis time if nscans == 0: diff --git a/simms/simms.py b/simms/simms.py index 7d0b7fb..80c94eb 100644 --- a/simms/simms.py +++ b/simms/simms.py @@ -193,6 +193,7 @@ def toList_freq(item, nounits=False): stdout=subprocess.PIPE if not isinstance(sys.stdout,file) else sys.stdout, shell=True) + failed = False if process.stdout or process.stderr: out,err = process.communicate() sys.stdout.write(out) @@ -202,6 +203,7 @@ def toList_freq(item, nounits=False): process.wait() if process.returncode: print 'ERROR: simms.py returns errr code %d. %s'%(process.returncode, message) + failed = True casa_script.close() os.system('mv %s/%s . && rm -fr %s'%(tmpdir,logfile,tmpdir) ) @@ -222,7 +224,7 @@ def toList_freq(item, nounits=False): std.write('\n %s ::: %s\n%s\n'%(ts," ".join(command),ran)) std.write("Parameters: %s\n"%fmt) - if os.path.exists(msname): + if os.path.exists(msname) and failed==False: info("simms succeeded") else: raise CasapyError(message)