From 6bddb1876119bf2b1adbd4e6a700266013ed76d4 Mon Sep 17 00:00:00 2001 From: jurjen93 Date: Thu, 15 Jul 2021 18:11:23 +0200 Subject: [PATCH] bugfix int type --- make_movie.py | 12 ++++++++---- video/scripts/moviemaker.py | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/make_movie.py b/make_movie.py index 9840b40..6a932d0 100755 --- a/make_movie.py +++ b/make_movie.py @@ -10,7 +10,7 @@ parser = argparse.ArgumentParser("Make movie from fits file.") parser.add_argument('-d', '--downloading', type=int, help='Download your own data') parser.add_argument('-csv', '--csvfile', help='Csv file with outliers with RA and DEC in degrees') -parser.add_argument('-fr', '--framerate', help='Frame rate of your video') +parser.add_argument('-fr', '--framerate', type=int, help='Frame rate of your video') parser.add_argument('-fi', '--fits', type=str, help='Fits file to use') args = parser.parse_args() @@ -111,9 +111,13 @@ def isNaN(a): pos_x = pos_x + ((-1)**(i+number_of_steps))*step_size_x positions.append([pos_x, pos_y]) - positions = [(p.ra.degree, p.dec.degree) for p in [Movie.wcs.pixel_to_world(position[0], position[1]) - for position in positions - if not isNaN(Movie.image_data[position[0], position[1]])]] + try: + positions = [(p.ra.degree, p.dec.degree) for p in [Movie.wcs.pixel_to_world(position[0], position[1]) + for position in positions + if not isNaN(Movie.image_data[position[0], position[1]])]] + except: + positions = [(p.ra.degree, p.dec.degree) for p in [Movie.wcs.pixel_to_world(position[0], position[1]) + for position in positions]] Movie.imsize = 2*abs(fits_header['CDELT1']*fits_header['CRPIX1']/number_of_steps) Movie.zoom(N_frames=int(3*Movie.framerate), first_time=True) diff --git a/video/scripts/moviemaker.py b/video/scripts/moviemaker.py index 818accc..8a863a5 100644 --- a/video/scripts/moviemaker.py +++ b/video/scripts/moviemaker.py @@ -168,7 +168,6 @@ def zoom(self, N_frames: int = None, first_time: bool=False, imsize_out: float = :param imsize_out: Output image size. :param full_im: start with full image (when first_time==True) """ - if first_time: begin_size = self.image_data.shape[0] * np.max(self.wcs.pixel_scale_matrix) if not full_im: