fixed central points being floor instead of round

york-stsci · Oct 4, 2021 · 3a0209e · 3a0209e
1 parent 5251ca1
commit 3a0209e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/stips/astro_image/astro_image.py b/stips/astro_image/astro_image.py
@@ -273,7 +273,7 @@ def initFromPoints(cls, xs, ys, rates, **kwargs):
         if img.ysize < np.ceil(np.max(ys)) + 1:
             img.ysize = np.ceil(np.max(ys)) + 1
         ids = np.arange(len(xs))
-        img.addPoints(ids, xs, ys, rates)
+        img.addPoints(ids, xs, ys, xs, ys, rates)
         return img
 
     @classmethod
@@ -764,7 +764,7 @@ def galsimSersic(id, gal_params, psf_params, xsize, ysize, dir, overrides, logge
             The flux at the central pixel of the model
         """
         fname = 'sersic_{}.npy'.format(id)
-        ix, iy = int(np.floor(gal_params['x'])), int(np.floor(gal_params['y']))
+        ix, iy = int(round(gal_params['x'])), int(round(gal_params['y']))
         if gal_params['flux'] == 0.:
             result = np.zeros((ysize, xsize), dtype=np.float32)
             with open(os.path.join(dir, fname), 'wb') as f:
@@ -874,7 +874,7 @@ def astropySersic(id, gal_params, psf_params, xsize, ysize, dir, overrides, logg
         Parameters and return values are the same as galsimSersic
         """
         fname = 'sersic_{}.npy'.format(id)
-        ix, iy = int(np.floor(gal_params['x'])), int(np.floor(gal_params['y']))
+        ix, iy = int(round(gal_params['x'])), int(round(gal_params['y']))
         if gal_params['flux'] == 0.:
             result = np.zeros((ysize, xsize), dtype=np.float32)
             with open(os.path.join(dir, fname), 'wb') as f:
@@ -993,7 +993,7 @@ def pandeiaSersic(id, gal_params, psf_params, xsize, ysize, dir, overrides, logg
 #         print("Creating galaxy {} ({})".format(id, time.ctime()))
 
         fname = 'sersic_{}.npy'.format(id)
-        ix, iy = int(np.floor(gal_params['x'])), int(np.floor(gal_params['y']))
+        ix, iy = int(round(gal_params['x'])), int(round(gal_params['y']))
         if gal_params['flux'] == 0.:
             result = np.zeros((ysize, xsize), dtype=np.float32)
             with open(os.path.join(dir, fname), 'wb') as f:
@@ -1989,6 +1989,7 @@ def _remap(self, xs, ys):
         """
         # Step 1 -- compensate for PSF adjustments
         adj = ((self.shape - self.base_shape)/2).astype(np.int32)
+        self._log("debug", "Mapping offset is {}".format(adj))
         out_y = (ys - adj[0])
         out_x = (xs - adj[1])
         return out_x, out_y

diff --git a/stips/utilities/PSFGrid.py b/stips/utilities/PSFGrid.py
@@ -390,7 +390,7 @@ def get_reduced_psf(self, psf_ext, flux, cx, cy, id=0):
             SaveArrayToFits(fname, psf_img, self.overrides)
         self.logger.debug("PSF Image {} at ({},{})".format(psf_ext, cx, cy))
         self.logger.debug("\tSize {}".format(psf_img.shape))
-        self.logger.debug("\tPSF Evaluated over [{}:{},{}:{}]".format(ly, hy, lx, hx))
+        self.logger.debug("\tPSF Evaluated over [{}:{},{}:{}] (PSF)".format(ly, hy, lx, hx))
         max_flux = np.unravel_index(psf_img.argmax(), psf_img.shape)
         self.logger.debug("\tMaximum flux is {} at {}".format(np.max(psf_img), max_flux))
         self.logger.debug("\tTotal flux is {}".format(np.sum(psf_img)))