Changeset 3287 for branches

Timestamp:

01/26/12 21:07:14 (4 months ago)

Author:

erkn

Message:

Only catch known exceptions

Location:

branches/mcxtrace-1.0/src/mcrun2

Files:

• log.py (added)
• main.py (modified) (2 diffs)
• optimisation.py (modified) (3 diffs)

branches/mcxtrace-1.0/src/mcrun2/main.py

@@ -2 +2 @@
 
 import logging
+from log import McRunException
 
 from os.path import isfile, isdir, abspath, dirname
@@ -321 +322 @@
         main()
     except KeyboardInterrupt:
-        exit(1)
-    except Exception, e:
+        LOG.fatal('User interrupt.')
+    except OptionValueError, e:
         LOG.fatal(str(e))
+    except McRunException, e:
+        LOG.fatal(str(e))

branches/mcxtrace-1.0/src/mcrun2/optimisation.py

@@ -1 +1 @@
 from os import mkdir
+
+from log import McRunException
+
 import logging
 LOG = logging.getLogger('mcstas.optimisation')
@@ -87 +90 @@
 
 
+class InvalidInterval(McRunException):
+    pass
+
+
 class Scanner:
     def __init__(self, mcstas, intervals):
@@ -104 +111 @@
 
         if len(self.intervals) == 0:
-            LOG.fatal('No intervals specified! (e.g. lambda=1.0,5.0)')
-            exit(1)
+            raise InvalidInterval('No interval range specified')
 
         fid = open(self.outfile, 'w')