Merge branch 'tickets/DM-14290'

lsst · Aug 22, 2020 · eb4c96b · eb4c96b
2 parents dd5c15c + 4f17558
commit eb4c96b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/examples/imagePsfMatchTask.py b/examples/imagePsfMatchTask.py
@@ -95,18 +95,18 @@ def run(args):
     # Run the requested method of the Task
     if args.template is not None and args.science is not None:
         if not os.path.isfile(args.template):
-            raise Exception("Template image %s does not exist" % (args.template))
+            raise FileNotFoundError("Template image %s does not exist" % (args.template))
         if not os.path.isfile(args.science):
-            raise Exception("Science image %s does not exist" % (args.science))
+            raise FileNotFoundError("Science image %s does not exist" % (args.science))
 
         try:
             templateExp = afwImage.ExposureF(args.template)
         except Exception:
-            raise Exception("Cannot read template image %s" % (args.template))
+            raise RuntimeError("Cannot read template image %s" % (args.template))
         try:
             scienceExp = afwImage.ExposureF(args.science)
         except Exception:
-            raise Exception("Cannot read science image %s" % (args.science))
+            raise RuntimeError("Cannot read science image %s" % (args.science))
     else:
         templateExp, scienceExp = generateFakeImages()
         config.kernel.active.sizeCellX = 128

diff --git a/examples/modelPsfMatchTask.py b/examples/modelPsfMatchTask.py
@@ -99,18 +99,18 @@ def run(args):
     # Run the requested method of the Task
     if args.template is not None and args.science is not None:
         if not os.path.isfile(args.template):
-            raise Exception("Template image %s does not exist" % (args.template))
+            raise FileNotFoundError("Template image %s does not exist" % (args.template))
         if not os.path.isfile(args.science):
-            raise Exception("Science image %s does not exist" % (args.science))
+            raise FileNotFoundError("Science image %s does not exist" % (args.science))
 
         try:
             templateExp = afwImage.ExposureF(args.template)
         except Exception:
-            raise Exception("Cannot read template image %s" % (args.template))
+            raise RuntimeError("Cannot read template image %s" % (args.template))
         try:
             scienceExp = afwImage.ExposureF(args.science)
         except Exception:
-            raise Exception("Cannot read science image %s" % (args.science))
+            raise RuntimeError("Cannot read science image %s" % (args.science))
     else:
         templateExp, scienceExp = generateFakeData()
         config.kernel.active.sizeCellX = 128

diff --git a/examples/snapPsfMatchTask.py b/examples/snapPsfMatchTask.py
@@ -94,18 +94,18 @@ def run(args):
     # Run the requested method of the Task
     if args.template is not None and args.science is not None:
         if not os.path.isfile(args.template):
-            raise Exception("Template image %s does not exist" % (args.template))
+            raise FileNotFoundError("Template image %s does not exist" % (args.template))
         if not os.path.isfile(args.science):
-            raise Exception("Science image %s does not exist" % (args.science))
+            raise FileNotFoundError("Science image %s does not exist" % (args.science))
 
         try:
             templateExp = afwImage.ExposureF(args.template)
         except Exception:
-            raise Exception("Cannot read template image %s" % (args.template))
+            raise RuntimeError("Cannot read template image %s" % (args.template))
         try:
             scienceExp = afwImage.ExposureF(args.science)
         except Exception:
-            raise Exception("Cannot read science image %s" % (args.science))
+            raise RuntimeError("Cannot read science image %s" % (args.science))
     else:
         templateExp, scienceExp = generateFakeImages()
         config.kernel.active.fitForBackground = True

diff --git a/python/lsst/ip/diffim/imagePsfMatch.py b/python/lsst/ip/diffim/imagePsfMatch.py
@@ -271,17 +271,17 @@ def run(args):
         # Run the requested method of the Task
         if args.template is not None and args.science is not None:
             if not os.path.isfile(args.template):
-                raise Exception("Template image %s does not exist" % (args.template))
+                raise FileNotFoundError("Template image %s does not exist" % (args.template))
             if not os.path.isfile(args.science):
-                raise Exception("Science image %s does not exist" % (args.science))
+                raise FileNotFoundError("Science image %s does not exist" % (args.science))
             try:
                 templateExp = afwImage.ExposureF(args.template)
             except Exception as e:
-                raise Exception("Cannot read template image %s" % (args.template))
+                raise RuntimeError("Cannot read template image %s" % (args.template))
             try:
                 scienceExp = afwImage.ExposureF(args.science)
             except Exception as e:
-                raise Exception("Cannot read science image %s" % (args.science))
+                raise RuntimeError("Cannot read science image %s" % (args.science))
         else:
             templateExp, scienceExp = generateFakeImages()
             config.kernel.active.sizeCellX = 128

diff --git a/python/lsst/ip/diffim/modelPsfMatch.py b/python/lsst/ip/diffim/modelPsfMatch.py
@@ -230,17 +230,17 @@ def run(args):
         # Run the requested method of the Task
         if args.template is not None and args.science is not None:
             if not os.path.isfile(args.template):
-                raise Exception("Template image %s does not exist" % (args.template))
+                raise FileNotFoundError("Template image %s does not exist" % (args.template))
             if not os.path.isfile(args.science):
-                raise Exception("Science image %s does not exist" % (args.science))
+                raise FileNotFoundError("Science image %s does not exist" % (args.science))
             try:
                 templateExp = afwImage.ExposureF(args.template)
             except Exception as e:
-                raise Exception("Cannot read template image %s" % (args.template))
+                raise RuntimeError("Cannot read template image %s" % (args.template))
             try:
                 scienceExp = afwImage.ExposureF(args.science)
             except Exception as e:
-                raise Exception("Cannot read science image %s" % (args.science))
+                raise RuntimeError("Cannot read science image %s" % (args.science))
         else:
             templateExp, scienceExp = generateFakeData()
             config.kernel.active.sizeCellX = 128

diff --git a/python/lsst/ip/diffim/snapPsfMatch.py b/python/lsst/ip/diffim/snapPsfMatch.py
@@ -243,17 +243,17 @@ def run(args):
         # Run the requested method of the Task
         if args.template is not None and args.science is not None:
             if not os.path.isfile(args.template):
-                raise Exception("Template image %s does not exist" % (args.template))
+                raise FileNotFoundError("Template image %s does not exist" % (args.template))
             if not os.path.isfile(args.science):
-                raise Exception("Science image %s does not exist" % (args.science))
+                raise FileNotFoundError("Science image %s does not exist" % (args.science))
             try:
                 templateExp = afwImage.ExposureF(args.template)
             except Exception as e:
-                raise Exception("Cannot read template image %s" % (args.template))
+                raise RuntimeError("Cannot read template image %s" % (args.template))
             try:
                 scienceExp = afwImage.ExposureF(args.science)
             except Exception as e:
-                raise Exception("Cannot read science image %s" % (args.science))
+                raise RuntimeError("Cannot read science image %s" % (args.science))
         else:
             templateExp, scienceExp = generateFakeImages()
             config.kernel.active.fitForBackground = True