exit_util used

rigdenlab · May 5, 2017 · 291f656 · 291f656
1 parent 76c0de7
commit 291f656
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/simbad/command_line/simbad_contaminant.py b/simbad/command_line/simbad_contaminant.py
@@ -11,6 +11,7 @@
 import time
 
 import simbad.command_line
+import simbad.util.exit_util
 import simbad.util.simbad_util
 import simbad.version
 
@@ -80,4 +81,8 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except Exception as e:
+        msg = "Error running main SIMBAD program: {0}".format(e.message)
+        simbad.util.exit_util.exit_error(msg, sys.exc_info()[2])
diff --git a/simbad/command_line/simbad_create_lattice_db.py b/simbad/command_line/simbad_create_lattice_db.py
@@ -2,7 +2,7 @@
 
 __author__ = "Felix Simkovic & Adam Simpkin"
 __date__ = "28 Apr 2017"
-__version__ = "1.0"
+__version__ = "0.0"
 
 import argparse
 import numpy as np
@@ -12,6 +12,10 @@
 import cctbx.crystal
 import simbad.constants 
 import simbad.command_line
+import simbad.util.exit_util
+import simbad.version
+
+__version__ = simbad.version.__version__
 
 
 def create_db_argparse():
@@ -128,4 +132,8 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except Exception as e:
+        msg = "Error running main SIMBAD program: {0}".format(e.message)
+        simbad.util.exit_util.exit_error(msg, sys.exc_info()[2])
diff --git a/simbad/command_line/simbad_lattice.py b/simbad/command_line/simbad_lattice.py
@@ -11,6 +11,7 @@
 import time
 
 import simbad.command_line
+import simbad.util.exit_util
 import simbad.util.simbad_util
 import simbad.version
 
@@ -79,5 +80,9 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except Exception as e:
+        msg = "Error running main SIMBAD program: {0}".format(e.message)
+        simbad.util.exit_util.exit_error(msg, sys.exc_info()[2])
 
diff --git a/simbad/command_line/simbad_main.py b/simbad/command_line/simbad_main.py
@@ -124,9 +124,8 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
-    #try:
-    #    main()
-    #except Exception as e:
-    #    msg = "Error running main SIMBAD program: {0}".format(e.message)
-    #    simbad.util.exit_util.exit_error(msg, sys.exc_info()[2])
+    try:
+        main()
+    except Exception as e:
+        msg = "Error running main SIMBAD program: {0}".format(e.message)
+        simbad.util.exit_util.exit_error(msg, sys.exc_info()[2])