bugs due to change of arguments in pCccd

HiPERCAM · Jun 4, 2021 · 49852f7 · 49852f7
1 parent 0e43820
commit 49852f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/hipercam/scripts/hplot.py b/hipercam/scripts/hplot.py
@@ -266,18 +266,12 @@ def hplot(args=None):
                     wind -= wind.median()
 
             vmin, vmax, _ = hcam.mpl.pCcd(
-                axes,
-                mccd[cnam],
-                iset,
-                plo,
-                phi,
-                ilo,
-                ihi,
+                axes, mccd[cnam],
+                iset, plo, phi,
+                ilo, ihi,
                 "CCD {:s}".format(cnam),
-                xlo,
-                xhi,
-                ylo,
-                yhi, cmap=cmap
+                xlo=xlo, xhi=xhi, ylo=ylo, yhi=yhi,
+                cmap=cmap
             )
             print("CCD =", cnam, "plot range =", vmin, "to", vmax)
 

diff --git a/hipercam/scripts/makemovie.py b/hipercam/scripts/makemovie.py
@@ -761,7 +761,10 @@ def makemovie(args=None):
                 # plot images
                 for n, (cnam, ccd, ilo, ihi)  in enumerate(zip(ccds, current_ccds, ilos, ihis)):
                     ax = fig.add_subplot(gs[n // nx, n % nx])
-                    mpl.pCcd(ax, ccd, iset, plo, phi, ilo, ihi, f'CCD {cnam}', xlo, xhi, ylo, yhi, cmap)
+                    mpl.pCcd(
+                        ax, ccd, iset, plo, phi, ilo, ihi, f'CCD {cnam}',
+                        xlo=xlo, xhi=xhi, ylo=ylo, yhi=yhi, cmap=cmap
+                    )
                     ax.set_xlim(xlo,xhi)
                     ax.set_ylim(ylo,yhi)
                     ax.tick_params(axis="x", direction="in")

diff --git a/hipercam/scripts/setaper.py b/hipercam/scripts/setaper.py
@@ -544,7 +544,7 @@ def setaper(args=None):
         hcam.mpl.pCcd(
             axes, mccd[cnam],
             iset, plo, phi, ilo, ihi,
-            f"CCD {cnam}", xlo, xhi, ylo, yhi,
+            f"CCD {cnam}", xlo=xlo, xhi=xhi, ylo=ylo, yhi=yhi,
             cmap=cmap
         )
 

diff --git a/hipercam/window.py b/hipercam/window.py
@@ -501,6 +501,7 @@ def window(self, xlo, xhi, ylo, yhi, copy=False):
             self.llx,
             self.llx + self.xbin * int(math.ceil((xlo - self.xlo) / self.xbin)),
         )
+
         lly = max(
             self.lly,
             self.lly + self.ybin * int(math.ceil((ylo - self.ylo) / self.ybin)),