wfc3tools 1.5.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

wfc3tools/calwf3.py

@@ -29,11 +29,13 @@ import subprocess
 
 # STSCI
 from stsci.tools import parseinput
+
 from .util import error_code
 
 
-def calwf3(input=None, printtime=False, save_tmp=False,
-           verbose=False, debug=False, parallel=True, version=False, log_func=print):
+def calwf3(
+    input=None, printtime=False, save_tmp=False, verbose=False, debug=False, parallel=True, version=False, log_func=print
+):
     """
     Run the calwf3.e executable as from the shell.
 
@@ -137,33 +139,32 @@ def calwf3(input=None, printtime=False, save_tmp=False,
 
     """
 
-    call_list = ['calwf3.e']
+    call_list = ["calwf3.e"]
     return_code = None
 
     if printtime:
-        call_list.append('-t')
+        call_list.append("-t")
 
     if save_tmp:
-        call_list.append('-s')
+        call_list.append("-s")
 
     if verbose:
-        call_list.append('-v')
+        call_list.append("-v")
 
     if version:
-        call_list.append('--version')
+        call_list.append("--version")
 
     if debug:
-        call_list.append('-d')
+        call_list.append("-d")
 
     if not parallel:
-        call_list.append('-1')
+        call_list.append("-1")
 
     infiles, dummy = parseinput.parseinput(input)
     if (len(parseinput.irafglob(input)) == 0) and not version:
         raise IOError("No valid image specified")
     if len(parseinput.irafglob(input)) > 1:
-        raise IOError("calwf3 can only accept 1 file for"
-                      "input at a time: {0}".format(infiles))
+        raise IOError("calwf3 can only accept 1 file forinput at a time: {0}".format(infiles))
 
     for image in infiles:
         if not os.path.exists(image):
@@ -180,7 +181,7 @@ def calwf3(input=None, printtime=False, save_tmp=False,
 
     if log_func is not None:
         for line in proc.stdout:
-            log_func(line.decode('utf8'))
+            log_func(line.decode("utf8"))
 
     return_code = proc.wait()
     ec = error_code(return_code)

wfc3tools/embedsub.py

@@ -1,13 +1,13 @@
-from .sub2full import sub2full
+import numpy
 
 # STDLIB
 from astropy.io import fits
-import os
-import numpy
 
 # STSCI
 from stsci.tools import parseinput
 
+from .sub2full import sub2full
+
 __taskname__ = "embedsub"
 
 
@@ -36,14 +36,13 @@ def embedsub(files):
 
     # process all the input subarrays
     for filename in infiles:
-
         # Make sure the input name conforms to normal style
-        if '_flt' not in filename:
+        if "_flt" not in filename:
             print("Warning: Can't properly parse '%s'; Skipping" % files)
 
         # Extract the root name and build SPT and output file names
-        root = filename[0:filename.find('_flt')]
-        full = root[0:len(root)-1] + 'f_flt.fits'
+        root = filename[0 : filename.find("_flt")]
+        full = root[0 : len(root) - 1] + "f_flt.fits"
 
         try:
             # open input file read-only
@@ -51,14 +50,13 @@ def embedsub(files):
         except EnvironmentError:
             print("Problem opening fits file %s" % (filename))
 
-        detector = flt[0].header['DETECTOR']
-        if 'UVIS' in detector:
+        detector = flt[0].header["DETECTOR"]
+        if "UVIS" in detector:
             uvis = True
 
         # compute subarray corners assuming the raw image location
         x1, x2, y1, y2 = sub2full(filename, fullExtent=True)[0]
-        print("Subarray image section [x1,x2,y1,y2] = [%d:%d,%d:%d]" % (x1, x2,
-                                                                        y1, y2))
+        print("Subarray image section [x1,x2,y1,y2] = [%d:%d,%d:%d]" % (x1, x2, y1, y2))
 
         if uvis:
             xaxis = uvis_full_x
@@ -74,44 +72,44 @@ def embedsub(files):
         err = numpy.zeros([xaxis, yaxis], dtype=numpy.float32)
         dq = numpy.zeros([xaxis, yaxis], dtype=numpy.int16) + 4
 
-        sci[y1-1:y2, x1-1:x2] = flt[1].data
-        err[y1-1:y2, x1-1:x2] = flt[2].data
-        dq[y1-1:y2, x1-1:x2] = flt[3].data
+        sci[y1 - 1 : y2, x1 - 1 : x2] = flt[1].data
+        err[y1 - 1 : y2, x1 - 1 : x2] = flt[2].data
+        dq[y1 - 1 : y2, x1 - 1 : x2] = flt[3].data
 
         if not uvis:
             samp = numpy.zeros([xaxis, yaxis], dtype=numpy.int16)
             time = numpy.zeros([xaxis, yaxis], dtype=numpy.float32)
-            samp[y1-1:y2, x1-1:x2] = flt[4].data
-            time[y1-1:y2, x1-1:x2] = flt[5].data
+            samp[y1 - 1 : y2, x1 - 1 : x2] = flt[4].data
+            time[y1 - 1 : y2, x1 - 1 : x2] = flt[5].data
 
         # Reset a few WCS values to make them appropriate for a
         # full-chip image
-        crpix1 = flt[1].header['CRPIX1']
-        crpix2 = flt[1].header['CRPIX2']
+        crpix1 = flt[1].header["CRPIX1"]
+        crpix2 = flt[1].header["CRPIX2"]
 
-        flt[1].header['sizaxis1'] = yaxis
-        flt[1].header['sizaxis2'] = xaxis
+        flt[1].header["sizaxis1"] = yaxis
+        flt[1].header["sizaxis2"] = xaxis
 
         for i in range(1, 4):
-            if 'CRPIX1' in flt[i].header:
-                flt[i].header['crpix1'] = crpix1 + x1 - 1
-                flt[i].header['crpix2'] = crpix2 + y1 - 1
-            if 'LTV1' in flt[i].header:
-                flt[i].header['ltv1'] = 0.0
-                flt[i].header['ltv2'] = 0.0
+            if "CRPIX1" in flt[i].header:
+                flt[i].header["crpix1"] = crpix1 + x1 - 1
+                flt[i].header["crpix2"] = crpix2 + y1 - 1
+            if "LTV1" in flt[i].header:
+                flt[i].header["ltv1"] = 0.0
+                flt[i].header["ltv2"] = 0.0
 
         # set the header value of SUBARRAY to False since it's now
         # regular size image
-        flt[0].header['SUBARRAY'] = False
-        
+        flt[0].header["SUBARRAY"] = False
+
         # Now write out the SCI, ERR, DQ extensions to the full-chip file
-        flt[1].data = sci 
+        flt[1].data = sci
         flt[2].data = err
         flt[3].data = dq
-        
+
         if not uvis:
             flt[4].data = samp
-            flt[5].data = time    
+            flt[5].data = time
 
         flt.writeto(full, overwrite=False)
 

wfc3tools/pstack.py

@@ -42,16 +42,14 @@ Usage:
 """
 
 # STDLIB
-import os
-from astropy.io import fits
 import numpy as np
+from astropy.io import fits
 from matplotlib import pyplot as plt
 
 plt.ion()
 
 
-def pstack(filename, column=0, row=0, extname="sci", units="counts",
-           title=None, xlabel=None, ylabel=None, plot=True):
+def pstack(filename, column=0, row=0, extname="sci", units="counts", title=None, xlabel=None, ylabel=None, plot=True):
     """
     A function to plot the statistics of one pixels up the IR ramp image.
     Original implementation in the iraf nicmos package. Pixel values here are
@@ -139,28 +137,28 @@ def pstack(filename, column=0, row=0, extname="sci", units="counts",
 
         for i in range(1, nsamp, 1):
             if time:
-                yaxis[i-1] = myfile["SCI", i].header['SAMPTIME']
+                yaxis[i - 1] = myfile["SCI", i].header["SAMPTIME"]
             else:
                 # Numpy is row-major with array indices written row-first
                 # (lexicographical access order)
-                yaxis[i-1] = myfile[extname.upper(), i].data[row, column]
-                xaxis[i-1] = myfile["SCI", i].header['SAMPTIME']
+                yaxis[i - 1] = myfile[extname.upper(), i].data[row, column]
+                xaxis[i - 1] = myfile["SCI", i].header["SAMPTIME"]
 
                 # convert to countrate
                 if "rate" in units.lower() and "/" not in bunit.lower():
-                    exptime = myfile["SCI", i].header['SAMPTIME']
-                    yaxis[i-1] /= exptime
+                    exptime = myfile["SCI", i].header["SAMPTIME"]
+                    yaxis[i - 1] /= exptime
                 # convert to counts
                 if "counts" in units.lower() and "/" in bunit.lower():
-                    exptime = myfile["SCI", i].header['SAMPTIME']
-                    yaxis[i-1] *= exptime
+                    exptime = myfile["SCI", i].header["SAMPTIME"]
+                    yaxis[i - 1] *= exptime
 
     if not ylabel:
         if "rate" in units.lower():
             if "/" in bunit.lower():
                 ylabel = bunit
             else:
-                ylabel = bunit+" per second"
+                ylabel = bunit + " per second"
         else:
             if "/" in bunit:
                 stop_index = bunit.find("/")
@@ -177,8 +175,7 @@ def pstack(filename, column=0, row=0, extname="sci", units="counts",
             plt.xlabel("Sample time")
 
         if not title:
-            title = "%s   Pixel stack for col=%d, row=%d" % (filename, column,
-                                                             row)
+            title = "%s   Pixel stack for col=%d, row=%d" % (filename, column, row)
         plt.title(title)
 
         if time:

wfc3tools/pstat.py

@@ -37,7 +37,7 @@ Usage:
     Note that the arrays are structured in SCI order, so the final exposure is the first element in the array.
 
 .. Warning::
-    The interface to this utility has been updated from previous versions and 
+    The interface to this utility has been updated from previous versions and
     is **not backwards compatible.**  Here is an example to illustrate the "original"
     syntax, the "original syntax corrected for row/column order", and finally the
     "new" syntax which requires column and row sections to be specified as tuples.
@@ -56,17 +56,27 @@ Usage:
 """
 
 # STDLIB
-import os
-from astropy.io import fits
 import numpy as np
+from astropy.io import fits
 from matplotlib import pyplot as plt
 from scipy.stats import mode as mode
 
 plt.ion()
 
 
-def pstat(filename, col_slice=None, row_slice=None, extname="sci", units="counts",
-          stat="midpt", title=None, xlabel=None, ylabel=None, plot=True, overplot=False):
+def pstat(
+    filename,
+    col_slice=None,
+    row_slice=None,
+    extname="sci",
+    units="counts",
+    stat="midpt",
+    title=None,
+    xlabel=None,
+    ylabel=None,
+    plot=True,
+    overplot=False,
+):
     """
     A function to plot the statistics of one or more pixels up an IR ramp.
 
@@ -147,9 +157,9 @@ def pstat(filename, col_slice=None, row_slice=None, extname="sci", units="counts
     bracket_loc = filename.find("[")
 
     # get the base filename and strip off any extra information as necessary
-    if (bracket_loc < 0):
+    if bracket_loc < 0:
         imagename = filename
-    elif (bracket_loc > 0):
+    elif bracket_loc > 0:
         imagename = filename[:bracket_loc]
         print("Any extension name or image section must be specified via parameters.")
         print("Input filename has been stripped of data in brackets, %s" % (imagename))
@@ -169,14 +179,14 @@ def pstat(filename, col_slice=None, row_slice=None, extname="sci", units="counts
     all_cols = False
     if not col_slice:
         all_cols = True
-    elif not(isinstance(col_slice, tuple) and len(col_slice) == 2 and all(isinstance(val, int) for val in col_slice)):
+    elif not (isinstance(col_slice, tuple) and len(col_slice) == 2 and all(isinstance(val, int) for val in col_slice)):
         print("Invalid specification for col_slice which must be a tuple of two integer values.")
         return 0, 0
 
     all_rows = False
     if not row_slice:
         all_rows = True
-    elif not(isinstance(row_slice, tuple) and len(row_slice) == 2 and all(isinstance(val, int) for val in row_slice)):
+    elif not (isinstance(row_slice, tuple) and len(row_slice) == 2 and all(isinstance(val, int) for val in row_slice)):
         print("Invalid specification for row_slice which must be a tuple of two integer values.")
         return 0, 0
 
@@ -207,33 +217,32 @@ def pstat(filename, col_slice=None, row_slice=None, extname="sci", units="counts
 
         for i in range(1, nsamp, 1):
             if "midpt" in stat:
-                yaxis[i-1] = np.median(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
+                yaxis[i - 1] = np.median(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
 
             if "mean" in stat:
-                yaxis[i-1] = np.mean(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
+                yaxis[i - 1] = np.mean(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
 
             if "mode" in stat:
-                yaxis[i-1] = mode(myfile[extname.upper(), i].data[ystart:yend, xstart:xend],
-                                  axis=None)[0]
+                yaxis[i - 1] = mode(myfile[extname.upper(), i].data[ystart:yend, xstart:xend], axis=None)[0]
 
             if "min" in stat:
-                yaxis[i-1] = np.min(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
+                yaxis[i - 1] = np.min(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
 
             if "max" in stat:
-                yaxis[i-1] = np.max(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
+                yaxis[i - 1] = np.max(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
 
             if "stddev" in stat:
-                yaxis[i-1] = np.std(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
+                yaxis[i - 1] = np.std(myfile[extname.upper(), i].data[ystart:yend, xstart:xend])
 
-            exptime = myfile["SCI", i].header['SAMPTIME']
-            xaxis[i-1] = exptime
+            exptime = myfile["SCI", i].header["SAMPTIME"]
+            xaxis[i - 1] = exptime
 
             # convert to countrate
             if "rate" in units.lower() and "/" not in bunit.lower():
-                yaxis[i-1] /= exptime
+                yaxis[i - 1] /= exptime
             # convert to counts
             if "counts" in units.lower() and "/" in bunit.lower():
-                yaxis[i-1] *= exptime
+                yaxis[i - 1] *= exptime
 
     if plot:
         if not overplot:
@@ -251,15 +260,14 @@ def pstat(filename, col_slice=None, row_slice=None, extname="sci", units="counts
                 else:
                     ylabel = bunit
 
-        ylabel += ("   %s" % (stat))
+        ylabel += "   %s" % (stat)
         plt.ylabel(ylabel)
 
         if not xlabel:
             plt.xlabel("Sample time (s)")
 
         if not title:
-            title = "%s   Pixel stats for [%d:%d,%d:%d]" % (imagename, xstart,
-                                                            xend, ystart, yend)
+            title = "%s   Pixel stats for [%d:%d,%d:%d]" % (imagename, xstart, xend, ystart, yend)
         plt.title(title)
         plt.plot(xaxis, yaxis, "+")
         plt.draw()

wfc3tools/sampinfo.py

@@ -26,57 +26,57 @@ Usage:
 
     >>> from wfc3tools import sampinfo
     >>> sampinfo('ibcf02faq_raw.fits')
-    >>> IMAGE			NEXTEND	SAMP_SEQ	NSAMP	EXPTIME
-        ibcf02faq_raw.fits	80	STEP50		16	499.234009
-
-        IMSET	SAMPNUM	SAMPTIME	DELTATIM
-        1	15	499.234009	50.000412
-        2	14	449.233582	50.000412
-        3	13	399.233154	50.000412
-        4	12	349.232727	50.000412
-        5	11	299.2323	50.000412
-        6	10	249.231873	50.000412
-        7	9	199.231461	50.000412
-        8	8	149.231049	50.000412
-        9	7	99.230637	50.000412
-        10	6	49.230225	25.000511
-        11	5	24.229715	12.500551
-        12	4	11.729164	2.932291
-        13	3	8.796873	2.932291
-        14	2	5.864582	2.932291
-        15	1	2.932291	2.932291
-        16	0	0.0	0.0
+    >>> IMAGE           NEXTEND SAMP_SEQ    NSAMP   EXPTIME
+        ibcf02faq_raw.fits  80  STEP50      16  499.234009
+
+        IMSET   SAMPNUM SAMPTIME    DELTATIM
+        1   15  499.234009  50.000412
+        2   14  449.233582  50.000412
+        3   13  399.233154  50.000412
+        4   12  349.232727  50.000412
+        5   11  299.2323    50.000412
+        6   10  249.231873  50.000412
+        7   9   199.231461  50.000412
+        8   8   149.231049  50.000412
+        9   7   99.230637   50.000412
+        10  6   49.230225   25.000511
+        11  5   24.229715   12.500551
+        12  4   11.729164   2.932291
+        13  3   8.796873    2.932291
+        14  2   5.864582    2.932291
+        15  1   2.932291    2.932291
+        16  0   0.0 0.0
 
     Include median:
 
         >>> sampinfo('ibcf02faq_raw.fits',median=True)
-        >>> IMAGE			NEXTEND	SAMP_SEQ	NSAMP	EXPTIME
-            ibcf02faq_raw.fits	80	STEP50		16	499.234009
-
-            IMSET	SAMPNUM	SAMPTIME	DELTATIM
-            1	15	499.234009	50.000412	MedPixel: 11384.0
-            2	14	449.233582	50.000412	MedPixel: 11360.0
-            3	13	399.233154	50.000412	MedPixel: 11335.0
-            4	12	349.232727	50.000412	MedPixel: 11309.0
-            5	11	299.2323	50.000412	MedPixel: 11283.0
-            6	10	249.231873	50.000412	MedPixel: 11256.0
-            7	9	199.231461	50.000412	MedPixel: 11228.0
-            8	8	149.231049	50.000412	MedPixel: 11198.0
-            9	7	99.230637	50.000412	MedPixel: 11166.0
-            10	6	49.230225	25.000511	MedPixel: 11131.0
-            11	5	24.229715	12.500551	MedPixel: 11111.0
-            12	4	11.729164	2.932291	MedPixel: 11099.0
-            13	3	8.796873	2.932291	MedPixel: 11097.0
-            14	2	5.864582	2.932291	MedPixel: 11093.0
-            15	1	2.932291	2.932291	MedPixel: 11090.0
-            16	0	0.0	0.0	MedPixel: 11087.0
+        >>> IMAGE           NEXTEND SAMP_SEQ    NSAMP   EXPTIME
+            ibcf02faq_raw.fits  80  STEP50      16  499.234009
+
+            IMSET   SAMPNUM SAMPTIME    DELTATIM
+            1   15  499.234009  50.000412   MedPixel: 11384.0
+            2   14  449.233582  50.000412   MedPixel: 11360.0
+            3   13  399.233154  50.000412   MedPixel: 11335.0
+            4   12  349.232727  50.000412   MedPixel: 11309.0
+            5   11  299.2323    50.000412   MedPixel: 11283.0
+            6   10  249.231873  50.000412   MedPixel: 11256.0
+            7   9   199.231461  50.000412   MedPixel: 11228.0
+            8   8   149.231049  50.000412   MedPixel: 11198.0
+            9   7   99.230637   50.000412   MedPixel: 11166.0
+            10  6   49.230225   25.000511   MedPixel: 11131.0
+            11  5   24.229715   12.500551   MedPixel: 11111.0
+            12  4   11.729164   2.932291    MedPixel: 11099.0
+            13  3   8.796873    2.932291    MedPixel: 11097.0
+            14  2   5.864582    2.932291    MedPixel: 11093.0
+            15  1   2.932291    2.932291    MedPixel: 11090.0
+            16  0   0.0 0.0 MedPixel: 11087.0
 
 """
 
 # STDLIB
-from astropy.io import fits
-import os
+
 import numpy as np
+from astropy.io import fits
 
 # STSCI
 from stsci.tools import parseinput
@@ -132,11 +132,11 @@ def sampinfo(imagelist, add_keys=None, mean=False, median=False):
         ir_list += add_keys
 
     # measure the min and max data
-    if (mean):
-        if (add_keys):
-            if ("DATAMIN" not in add_keys):
+    if mean:
+        if add_keys:
+            if "DATAMIN" not in add_keys:
                 ir_list += ["DATAMIN"]
-            if ("DATAMAX" not in add_keys):
+            if "DATAMAX" not in add_keys:
                 ir_list += ["DATAMAX"]
         else:
             ir_list += ["DATAMIN", "DATAMAX"]
@@ -155,37 +155,35 @@ def sampinfo(imagelist, add_keys=None, mean=False, median=False):
         samp_seq = header0["SAMP_SEQ"]
 
         print("IMAGE\t\t\tNEXTEND\tSAMP_SEQ\tNSAMP\tEXPTIME")
-        print("%s\t%d\t%s\t\t%d\t%f\n" % (image, nextend, samp_seq,
-                                          nsamp, exptime))
+        print("%s\t%d\t%s\t\t%d\t%f\n" % (image, nextend, samp_seq, nsamp, exptime))
         printline = "IMSET\tSAMPNUM"
 
         for key in ir_list:
-            printline += ("\t"+key)
+            printline += "\t" + key
         print(printline)
 
         # loop through all the samples for the image and print stuff as we go
-        for samp in range(1, nsamp+1, 1):
+        for samp in range(1, nsamp + 1, 1):
             printline = ""
             printline += str(samp)
-            printline += ("\t"+str(nsamp-samp))
+            printline += "\t" + str(nsamp - samp)
             for key in ir_list:
                 if "DATAMIN" in key:
                     datamin = True
                     dataminval = np.min(current["SCI", samp].data)
                 if "DATAMAX" in key:
                     datamax = True
-                    datamaxval = np.min(current["SCI", samp].data)
+                    datamaxval = np.max(current["SCI", samp].data)
                 try:
-                    printline += ("\t"+str(current["SCI", samp].header[key]))
+                    printline += "\t" + str(current["SCI", samp].header[key])
                 except KeyError:
                     try:
-                        printline += ("\t"+str(current[0].header[key]))
+                        printline += "\t" + str(current[0].header[key])
                     except KeyError as e:
-                        printline += ("\tNA")
-            if (datamin and datamax):
-                printline += ("\tAvgPixel: "+str((dataminval+datamaxval)/2.))
-            if (median):
-                printline += ("\tMedPixel: "+str(np.median(current["SCI",
-                                                           samp].data)))
+                        printline += "\tNA"
+            if datamin and datamax:
+                printline += "\tAvgPixel: " + str((dataminval + datamaxval) / 2.0)
+            if median:
+                printline += "\tMedPixel: " + str(np.median(current["SCI", samp].data))
             print(printline)
         current.close()

wfc3tools/sub2full.py

@@ -36,8 +36,9 @@ Usage:
 """
 
 # STDLIB
-from astropy.io import fits
 import os
+
+from astropy.io import fits
 from stsci.tools import parseinput
 
 
@@ -85,13 +86,12 @@ def sub2full(filename, x=None, y=None, fullExtent=False):
 
     infiles, dummy_out = parseinput.parseinput(filename)
     if len(infiles) < 1:
-        return ValueError("Please input a valid HST filename")
+        raise ValueError("Please input a valid HST filename")
 
     coords = list()
 
     for f in infiles:
-        spt = os.path.join(os.path.dirname(f), os.path.basename(f)[0:9] +
-                           '_spt.fits')
+        spt = os.path.join(os.path.dirname(f), os.path.basename(f)[0:9] + "_spt.fits")
         uvis_x_size = 2051
         serial_over = 25.0
         ir_overscan = 5.0
@@ -100,27 +100,27 @@ def sub2full(filename, x=None, y=None, fullExtent=False):
         try:
             fd2 = fits.open(spt)
         except (ValueError, IOError) as e:
-            raise ValueError('%s ' % (e))
+            raise ValueError("%s " % (e))
 
         # check for required keywords and close the images
         try:
-            detector = fd2[0].header['SS_DTCTR']
-            subarray = fd2[0].header['SS_SUBAR']
-            xcorner = int(fd2[1].header['XCORNER'])
-            ycorner = int(fd2[1].header['YCORNER'])
-            numrows = int(fd2[1].header['NUMROWS'])
-            numcols = int(fd2[1].header['NUMCOLS'])
+            detector = fd2[0].header["SS_DTCTR"]
+            subarray = fd2[0].header["SS_SUBAR"]
+            xcorner = int(fd2[1].header["XCORNER"])
+            ycorner = int(fd2[1].header["YCORNER"])
+            numrows = int(fd2[1].header["NUMROWS"])
+            numcols = int(fd2[1].header["NUMCOLS"])
             fd2.close()
         except KeyError as e:
-            raise KeyError("Required header keyword missing; %s" % (e))
+            raise KeyError(f"Required header keyword missing: {e}")
 
         if "NO" in subarray:
-            raise ValueError("Image is not a subarray: %s" % (f))
+            raise ValueError(f"Image is not a subarray: {f}")
 
         sizaxis1 = numcols
         sizaxis2 = numrows
 
-        if (xcorner == 0 and ycorner == 0):
+        if xcorner == 0 and ycorner == 0:
             cornera1 = 0
             cornera2 = 0
             cornera1a = cornera1 + 1
@@ -128,7 +128,7 @@ def sub2full(filename, x=None, y=None, fullExtent=False):
             cornera2a = cornera2 + 1
             cornera2b = cornera2a + sizaxis2 - 1
         else:
-            if 'UVIS' in detector:
+            if "UVIS" in detector:
                 cornera1 = ycorner
                 cornera2 = uvis_x_size - xcorner - sizaxis2
                 if xcorner >= uvis_x_size:
@@ -152,17 +152,16 @@ def sub2full(filename, x=None, y=None, fullExtent=False):
                 cornera2a = cornera2 + 1
                 cornera2b = cornera2a + sizaxis2 - 11
 
-        if (x or y):
-            if ((not isinstance(x, int) or (not isinstance(y, int)))):
+        if x or y:
+            if not isinstance(x, int) or (not isinstance(y, int)):
                 raise ValueError("Must input integer value for x and y ")
             else:
                 cornera1a = cornera1a + x
                 cornera2a = cornera2a + y
                 fullExtent = False
 
-        if (fullExtent):
-            coords.append((int(cornera1a), int(cornera1b), int(cornera2a),
-                           int(cornera2b)))
+        if fullExtent:
+            coords.append((int(cornera1a), int(cornera1b), int(cornera2a), int(cornera2b)))
         else:
             coords.append((int(cornera1a), int(cornera2a)))