From 897c7e98cc47171c19df88558a38de87c077ab30 2018-07-02 01:52:44 From: Juan C. Espinoza Date: 2018-07-02 01:52:44 Subject: [PATCH] Set default alarms to none --- diff --git a/schainpy/controller.py b/schainpy/controller.py index 4e04c13..affb256 100644 --- a/schainpy/controller.py +++ b/schainpy/controller.py @@ -956,7 +956,7 @@ class Project(Process): self.procUnitConfObjDict = newProcUnitConfObjDict - def setup(self, id, name='', description='', email=None, alarm=[3]): + def setup(self, id, name='', description='', email=None, alarm=[]): print print '*' * 60 @@ -1186,6 +1186,9 @@ class Project(Process): if modes is None: modes = self.alarm + + if not self.alarm: + modes = [] err = traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], @@ -1302,6 +1305,8 @@ class Project(Process): is_ok = is_ok or sts except SchainWarning: err = self.__handleError(procUnitConfObj, modes=[2, 3], stdout=False) + is_ok = False + break except KeyboardInterrupt: is_ok = False break diff --git a/schainpy/model/graphics/jroplot_data.py b/schainpy/model/graphics/jroplot_data.py index 8c3aafe..21914ec 100644 --- a/schainpy/model/graphics/jroplot_data.py +++ b/schainpy/model/graphics/jroplot_data.py @@ -512,6 +512,8 @@ class PlotData(Operation, Process): self.__plot() except zmq.Again as e: + if self.data and self.data.ended: + break log.log('Waiting for data...') if self.data: figpause(self.data.throttle)