Major cleanup in Exceptions

Author: rhandberg

photometry/BasePhotometry.py

@@ -322,7 +322,7 @@ def __init__(self, starid, input_folder, output_folder, datasource='ffi',
 			elif len(fname) == 0:
 				raise FileNotFoundError("Target Pixel File not found")
 			elif len(fname) > 1:
-				raise OSError("Multiple Target Pixel Files found matching pattern")
+				raise FileNotFoundError("Multiple Target Pixel Files found matching pattern")
 
 			# Open the FITS file:
 			self.tpf = fits.open(fname, mode='readonly', memmap=True)
@@ -410,7 +410,7 @@ def __init__(self, starid, input_folder, output_folder, datasource='ffi',
 			cursor.execute("SELECT ra,decl,ra_J2000,decl_J2000,pm_ra,pm_decl,tmag,teff FROM catalog WHERE starid={0:d};".format(self.starid))
 			target = cursor.fetchone()
 			if target is None:
-				raise Exception("Star could not be found in catalog: {0:d}".format(self.starid))
+				raise RuntimeError(f"Star could not be found in catalog: {self.starid:d}")
 			self.target = dict(target) # Dictionary of all main target properties.
 			cursor.execute("SELECT sector,reference_time,ticver FROM settings LIMIT 1;")
 			target = cursor.fetchone()
@@ -1336,15 +1336,15 @@ def photometry(self, *args, **kwargs):
 
 		# Check that the status has been changed:
 		if self._status == STATUS.UNKNOWN:
-			raise Exception("STATUS was not set by do_photometry")
+			raise ValueError("STATUS was not set by do_photometry")
 
 		# Calculate performance metrics if status was not an error:
 		if self._status in (STATUS.OK, STATUS.WARNING):
 			# Simple check that entire lightcurve is not NaN:
 			if allnan(self.lightcurve['flux']):
-				raise Exception("Final lightcurve fluxes are all NaNs")
+				raise ValueError("Final lightcurve fluxes are all NaNs")
 			if allnan(self.lightcurve['flux_err']):
-				raise Exception("Final lightcurve errors are all NaNs")
+				raise ValueError("Final lightcurve errors are all NaNs")
 
 			# Pick out the part of the lightcurve that has a good quality
 			# and only use this subset to calculate the diagnostic metrics:

photometry/fixes/time_offset.py

@@ -115,7 +115,7 @@ def time_offset(time, header, datatype='ffi', timepos='mid', return_flag=False):
 	# files in earlier versions of the pipeline. In that case, we have to throw
 	# an error and tell users to re-run prepare:
 	elif datarel in (27, 29) and procver is None:
-		raise Exception("""The timestamps of these data may need to be corrected,
+		raise ValueError("""The timestamps of these data may need to be corrected,
 			but the PROCVER header is not present. HDF5 files may need to be re-created.""")
 
 	elif datarel == 27 \

photometry/image_motion.py

@@ -210,7 +210,7 @@ def calc_kernel(self, image, number_of_iterations=10000, termination_eps=1e-6):
 
 		# Check that reference image was actually given:
 		if self.image_ref is None:
-			raise Exception("Reference image not defined")
+			raise RuntimeError("Reference image not defined")
 
 		# Define the motion model
 		if self.warpmode == 'euclidian':

photometry/prepare.py

@@ -211,7 +211,7 @@ def prepare_photometry(input_folder=None, sectors=None, cameras=None, ccds=None,
 			cursor.execute("SELECT sector,reference_time FROM settings LIMIT 1;")
 			row = cursor.fetchone()
 			if row is None:
-				raise OSError("Settings could not be loaded from catalog")
+				raise RuntimeError("Settings could not be loaded from catalog")
 			#sector = row['sector']
 			sector_reference_time = row['reference_time']
 			cursor.close()
@@ -395,7 +395,7 @@ def prepare_photometry(input_folder=None, sectors=None, cameras=None, ccds=None,
 						offset = first_cadenceno - first_time/timedelt
 						cadenceno[k] = np.round((time[k] - timecorr[k])/timedelt + offset)
 					elif is_tess:
-						raise Exception("Could not determine CADENCENO for TESS data")
+						raise RuntimeError("Could not determine CADENCENO for TESS data")
 					else:
 						cadenceno[k] = k+1
 

photometry/spice.py

@@ -19,7 +19,7 @@
 from .utilities import download_parallel
 
 #--------------------------------------------------------------------------------------------------
-class InadequateSpiceException(Exception):
+class InadequateSpiceError(Exception):
 	pass
 
 #--------------------------------------------------------------------------------------------------
@@ -431,7 +431,7 @@ def position(self, jd, of='TESS', relative_to='EARTH'):
 			positions, _ = spiceypy.spkpos(of, times, 'J2000', 'NONE', relative_to)
 			positions = np.atleast_2d(positions)
 		except spiceypy.utils.exceptions.SpiceSPKINSUFFDATA:
-			raise InadequateSpiceException("Inadequate SPICE kernels available")
+			raise InadequateSpiceError("Inadequate SPICE kernels available")
 
 		return positions
 
@@ -490,7 +490,7 @@ def position_velocity(self, jd, of='TESS', relative_to='EARTH'):
 			pos_vel, _ = spiceypy.spkezr(of, times, 'J2000', 'NONE', relative_to)
 			pos_vel = np.asarray(pos_vel)
 		except spiceypy.utils.exceptions.SpiceSPKINSUFFDATA:
-			raise InadequateSpiceException("Inadequate SPICE kernels available")
+			raise InadequateSpiceError("Inadequate SPICE kernels available")
 
 		return pos_vel
 

photometry/todolist.py

@@ -150,7 +150,7 @@ def _ffi_todo(hdf5_file, exclude=[], faint_limit=15.0):
 		cursor.execute("SELECT * FROM settings WHERE sector=? AND camera=? AND ccd=? LIMIT 1;", (sector, camera, ccd))
 		settings = cursor.fetchone()
 		if settings is None:
-			raise Exception(f"Settings not found in catalog (SECTOR={sector:d}, CAMERA={camera:d}, CCD={ccd:d})")
+			raise RuntimeError(f"Settings not found in catalog (SECTOR={sector:d}, CAMERA={camera:d}, CCD={ccd:d})")
 
 		# Find all the stars in the catalog brigher than a certain limit:
 		cursor.execute("SELECT starid,tmag,ra,decl FROM catalog WHERE tmag < ? ORDER BY tmag;", [faint_limit])

photometry/utilities.py

@@ -635,7 +635,7 @@ def download_file(url, destination, desc=None, timeout=60,
 					pbar.update(len(block))
 
 		if os.path.getsize(destination) != total_size:
-			raise Exception("File not downloaded correctly")
+			raise RuntimeError("File not downloaded correctly")
 
 	except: # noqa: E722, pragma: no cover
 		logger.exception("Could not download file")
@@ -693,7 +693,7 @@ def _wrapper(arg):
 				errors.append(url[0])
 
 	if errors:
-		raise Exception("Errors encountered during download of the following URLs:\n%s" % '\n'.join(errors))
+		raise RuntimeError("Errors encountered during download of the following URLs:\n%s" % '\n'.join(errors))
 
 #--------------------------------------------------------------------------------------------------
 class TqdmLoggingHandler(logging.Handler):
@@ -799,10 +799,10 @@ def sqlite_drop_column(conn, table, col):
 	for sql in index_sql:
 		m = regex_index.match(sql)
 		if not m:
-			raise Exception("COULD NOT UNDERSTAND SQL") # pragma: no cover
+			raise RuntimeError("COULD NOT UNDERSTAND SQL") # pragma: no cover
 		index_columns = [i.strip() for i in m.group(3).split(',')]
 		if col in index_columns:
-			raise Exception("Column is used in INDEX %s." % m.group(2))
+			raise RuntimeError("Column is used in INDEX %s." % m.group(2))
 
 	# Store the current foreign_key setting:
 	cursor.execute("PRAGMA foreign_keys;")

run_tessphot_mpi.py

@@ -128,7 +128,7 @@ def main():
 					else: # pragma: no cover
 						# This should never happen, but just to
 						# make sure we don't run into an infinite loop:
-						raise Exception("Master received an unknown tag: '{0}'".format(tag))
+						raise RuntimeError(f"Master received an unknown tag: '{tag}'")
 
 				tm.logger.info("Master finishing")
 
@@ -186,7 +186,7 @@ def main():
 				else: # pragma: no cover
 					# This should never happen, but just to
 					# make sure we don't run into an infinite loop:
-					raise Exception("Worker received an unknown tag: '{0}'".format(tag))
+					raise RuntimeError(f"Worker received an unknown tag: '{tag}'")
 
 		except: # noqa: E722, pragma: no cover
 			logger.exception("Something failed in worker")

run_todo_merge.py

@@ -73,7 +73,7 @@
 		cursor.execute("SELECT COUNT(*) FROM original.todolist;")
 		count_table2 = cursor.fetchone()[0]
 		if count_table1 != count_table2:
-			raise Exception("The two TODO-files are incompatible")
+			raise RuntimeError("The two TODO-files are incompatible")
 		# Columns that should be the same:
 		cursor.execute("""SELECT COUNT(*) FROM main.todolist t1 LEFT JOIN original.todolist t2 ON t1.priority=t2.priority WHERE
 			t2.priority IS NULL
@@ -84,7 +84,7 @@
 			OR t1.cbv_area != t2.cbv_area
 		;""")
 		if cursor.fetchone()[0] != 0:
-			raise Exception("The two TODO-files are incompatible")
+			raise RuntimeError("The two TODO-files are incompatible")
 
 		# TODO: Create list of priorities where corrections should be re-run.
 		# This is if the method has changed, or the status have changed:
@@ -128,7 +128,7 @@
 						cursor.execute("DROP TABLE %s;" % tbl)
 						conn.commit()
 					else:
-						raise Exception("bla bla bla: %s" % tbl)
+						raise RuntimeError("bla bla bla: %s" % tbl)
 
 		# Using temporary directory to dump the needed tables
 		# to raw SQL file and insert them into the combined SQLite file afterwards:

tests/test_basephotometry.py

@@ -50,7 +50,7 @@ def test_basephotometry_invalid_input(SHARED_INPUT_DIR):
 		assert str(e.value) == "SECTOR, CAMERA and CCD keywords must be provided for FFI targets."
 
 		# Test target not in the catalog:
-		with pytest.raises(Exception) as e:
+		with pytest.raises(RuntimeError) as e:
 			with BasePhotometry(0, SHARED_INPUT_DIR, OUTPUT_DIR, datasource='ffi', **DUMMY_KWARG):
 				pass
 		assert str(e.value) == "Star could not be found in catalog: 0"

tests/test_fixes.py

@@ -37,11 +37,11 @@ def test_fixes_time_offset_invalid_input():
 
 	# The cases of data release 27 and 29 and no PROCVER:
 	hdr = {'DATA_REL': 27, 'CAMERA': 1, 'PROCVER': None}
-	with pytest.raises(Exception):
+	with pytest.raises(ValueError):
 		fixes.time_offset(time, hdr)
 
 	hdr = {'DATA_REL': 29, 'CAMERA': 2, 'PROCVER': None}
-	with pytest.raises(Exception):
+	with pytest.raises(ValueError):
 		fixes.time_offset(time, hdr)
 
 #--------------------------------------------------------------------------------------------------

tests/test_imagemotion.py

@@ -39,7 +39,7 @@ def test_imagemotion(SHARED_INPUT_DIR, warpmode):
 		assert len(imk) == 0, "Kernel should be an empty array for 'unchanged'"
 	else:
 		# Trying to calculate kernel with no reference image should give error:
-		with pytest.raises(Exception) as e:
+		with pytest.raises(RuntimeError) as e:
 			ImageMovementKernel(image_ref=None, warpmode=warpmode).calc_kernel(img)
 		assert str(e.value) == "Reference image not defined"
 

tests/test_spice.py

@@ -15,7 +15,7 @@
 from tempfile import TemporaryDirectory
 import conftest # noqa: F401
 from photometry import AperturePhotometry
-from photometry.spice import TESS_SPICE, InadequateSpiceException
+from photometry.spice import TESS_SPICE, InadequateSpiceError
 from photometry.utilities import find_tpf_files, find_hdf5_files, add_proper_motion
 from photometry.plots import plt, plots_interactive
 from mpl_toolkits.mplot3d import Axes3D # noqa: F401
@@ -64,15 +64,15 @@ def test_position_velocity():
 		# We should fail with a timestamp that are outside the TESS SPICE coverage:
 		# The timestamp used here is well before TESS was launched
 		time_nocoverage = 1000 + 2457000
-		with pytest.raises(InadequateSpiceException) as e:
+		with pytest.raises(InadequateSpiceError) as e:
 			knl.position(time_nocoverage)
 		assert str(e.value) == 'Inadequate SPICE kernels available'
 
-		with pytest.raises(InadequateSpiceException) as e:
+		with pytest.raises(InadequateSpiceError) as e:
 			knl.velocity(time_nocoverage)
 		assert str(e.value) == 'Inadequate SPICE kernels available'
 
-		with pytest.raises(InadequateSpiceException) as e:
+		with pytest.raises(InadequateSpiceError) as e:
 			knl.position_velocity(time_nocoverage)
 		assert str(e.value) == 'Inadequate SPICE kernels available'
 

tests/test_utilities.py

@@ -438,10 +438,10 @@ def test_sqlite_drop_column(factory, foreign_keys):
 
 		# Attempting to drop a column associated with an index should
 		# cause an Exception:
-		with pytest.raises(Exception):
+		with pytest.raises(RuntimeError):
 			u.sqlite_drop_column(conn, 'tbl', 'col_c')
 
-		with pytest.raises(Exception):
+		with pytest.raises(RuntimeError):
 			u.sqlite_drop_column(conn, 'tbl', 'col_e')
 
 #--------------------------------------------------------------------------------------------------