Make many of the GSObject str representations a bit simpler

(#218)

Author: rmjarvis

galsim/base.py

@@ -1401,7 +1401,11 @@ def __repr__(self):
             self.sigma, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Gaussian(sigma=%s, flux=%s)'%(self.sigma, self.flux)
+        s = 'galsim.Gaussian(sigma=%s'%self.sigma
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBGaussian.__getinitargs__ = lambda self: (
         self.getSigma(), self.getFlux(), self.getGSParams())
@@ -1513,8 +1517,13 @@ def __repr__(self):
             self.beta, self.scale_radius, self.trunc, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Moffat(beta=%s, scale_radius=%s, trunc=%s, flux=%s)'%(
-            self.beta, self.scale_radius, self.trunc, self.flux)
+        s = 'galsim.Moffat(beta=%s, scale_radius=%s'%(self.beta, self.scale_radius)
+        if self.trunc != 0.:
+            s += ', trunc=%s'%self.trunc
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBMoffat.__getinitargs__ = lambda self: (
         self.getBeta(), self.getScaleRadius(), None, None, self.getTrunc(), 
@@ -1675,8 +1684,13 @@ def __repr__(self):
             self.lam_over_diam, self.obscuration, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Airy(lam_over_diam=%s, obscuration=%s, flux=%s)'%(
-            self.lam_over_diam, self.obscuration, self.flux)
+        s = 'galsim.Airy(lam_over_diam=%s'%self.lam_over_diam
+        if self.obscuration != 0.:
+            s += ', obscuration=%s'%self.obscuration
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBAiry.__getinitargs__ = lambda self: (
         self.getLamOverD(), self.getObscuration(), self.getFlux(), self.getGSParams())
@@ -1799,7 +1813,11 @@ def __repr__(self):
             self.lam_over_r0, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Kolmogorov(lam_over_r0=%s, flux=%s)'%(self.lam_over_r0, self.flux)
+        s = 'galsim.Kolmogorov(lam_over_r0=%s'%self.lam_over_r0
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBKolmogorov.__getinitargs__ = lambda self: (
         self.getLamOverR0(), self.getFlux(), self.getGSParams())
@@ -1856,7 +1874,11 @@ def __repr__(self):
             self.scale, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Pixel(scale=%s, flux=%s)'%(self.scale, self.flux)
+        s = 'galsim.Pixel(scale=%s'%self.scale
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 
 class Box(GSObject):
@@ -1913,7 +1935,11 @@ def __repr__(self):
             self.width, self.height, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Box(width=%s, height=%s, flux=%s)'%(self.width, self.height, self.flux)
+        s = 'galsim.Box(width=%s, height=%s'%(self.width, self.height)
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBBox.__getinitargs__ = lambda self: (
         self.getWidth(), self.getHeight(), self.getFlux(), self.getGSParams())
@@ -1967,7 +1993,11 @@ def __repr__(self):
             self.radius, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.TopHat(radius=%s, flux=%s)'%(self.radius, self.flux)
+        s = 'galsim.TopHat(radius=%s'%self.radius
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBTopHat.__getinitargs__ = lambda self: (
         self.getRadius(), self.getFlux(), self.getGSParams())
@@ -2190,8 +2220,13 @@ def __str__(self):
         # Note: for the repr, we use the scale_radius, since that should just flow as is through
         # the constructor, so it should be exact.  But most people use half_light_radius
         # for Sersics, so use that in the looser str() function.
-        return 'galsim.Sersic(n=%s, half_light_radius=%s, trunc=%s, flux=%s)'%(
-            self.n, self.half_light_radius, self.trunc, self.flux)
+        s = 'galsim.Sersic(n=%s, half_light_radius=%s'%(self.n, self.half_light_radius)
+        if self.trunc != 0.:
+            s += ', trunc=%s'%self.trunc
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBSersic.__getinitargs__ = lambda self: (
         self.getN(), self.getScaleRadius(), None, self.getFlux(), self.getTrunc(),
@@ -2277,7 +2312,11 @@ def __repr__(self):
             self.scale_radius, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Exponential(scale_radius=%s, flux=%s)'%(self.scale_radius, self.flux)
+        s = 'galsim.Exponential(scale_radius=%s'%self.scale_radius
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBExponential.__getinitargs__ = lambda self: (
         self.getScaleRadius(), self.getFlux(), self.getGSParams())
@@ -2365,8 +2404,13 @@ def __repr__(self):
             self.scale_radius, self.trunc, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.DeVaucouleurs(half_light_radius=%s, trunc=%s, flux=%s)'%(
-            self.half_light_radius, self.trunc, self.flux)
+        s = 'galsim.DeVaucouleurs(half_light_radius=%s'%self.half_light_radius
+        if self.trunc != 0.:
+            s += ', trunc=%s'%self.trunc
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBDeVaucouleurs.__getinitargs__ = lambda self: (
         self.getScaleRadius(), None, self.getFlux(), self.getTrunc(), False, self.getGSParams())
@@ -2481,8 +2525,11 @@ def __repr__(self):
             self.nu, self.scale_radius, self.flux, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Spergel(nu=%s, half_light_radius=%s, flux=%s)'%(
-            self.nu, self.half_light_radius, self.flux)
+        s = 'galsim.Spergel(nu=%s, half_light_radius=%s'%(self.nu, self.half_light_radius)
+        if self.flux != 1.0:
+            s += ', flux=%s'%self.flux
+        s += ')'
+        return s
 
 _galsim.SBSpergel.__getinitargs__ = lambda self: (
         self.getNu(), self.getScaleRadius(), None, self.getFlux(), self.getGSParams())

galsim/compound.py

@@ -164,7 +164,8 @@ def __repr__(self):
 
     def __str__(self):
         str_list = [ str(obj) for obj in self.obj_list ]
-        return 'galsim.Sum([%s])'%', '.join(str_list)
+        return '(' + ' + '.join(str_list) + ')'
+        #return 'galsim.Sum([%s])'%', '.join(str_list)
 
     def __getstate__(self):
         d = self.__dict__.copy()
@@ -400,11 +401,11 @@ def __repr__(self):
 
     def __str__(self):
         str_list = [ str(obj) for obj in self.obj_list ]
+        s = 'galsim.Convolve(%s'%(', '.join(str_list))
         if self.real_space:
-            real = ', real_space=True'
-        else:
-            real = ''
-        return 'galsim.Convolution([%s]%s)'%(', '.join(str_list), real)
+            s += ', real_space=True'
+        s += ')'
+        return s
 
     def __getstate__(self):
         d = self.__dict__.copy()
@@ -495,7 +496,7 @@ def __repr__(self):
         return 'galsim.Deconvolution(%r, gsparams=%r)'%(self.orig_obj, self._gsparams)
 
     def __str__(self):
-        return 'galsim.Deconvolution(%s)'%self.orig_obj
+        return 'galsim.Deconvolve(%s)'%self.orig_obj
 
     def __getstate__(self):
         d = self.__dict__.copy()
@@ -616,11 +617,11 @@ def __repr__(self):
                 self.orig_obj, self.real_space, self._gsparams)
 
     def __str__(self):
+        s = 'galsim.AutoConvolve(%s'%self.orig_obj
         if self.real_space:
-            real = ', real_space=True'
-        else:
-            real = ''
-        return 'galsim.AutoConvolution(%s%s)'%(self.orig_obj, real)
+            s += ', real_space=True'
+        s += ')'
+        return s
 
     def __getstate__(self):
         d = self.__dict__.copy()
@@ -747,11 +748,11 @@ def __repr__(self):
                 self.orig_obj, self.real_space, self._gsparams)
 
     def __str__(self):
+        s = 'galsim.AutoCorrelate(%s'%self.orig_obj
         if self.real_space:
-            real = ', real_space=True'
-        else:
-            real = ''
-        return 'galsim.AutoCorrelation(%s%s)'%(self.orig_obj, real)
+            s += ', real_space=True'
+        s += ')'
+        return s
 
     def __getstate__(self):
         d = self.__dict__.copy()

galsim/optics.py

@@ -380,8 +380,11 @@ def __repr__(self):
         return s
 
     def __str__(self):
-        s = 'galsim.OpticalPSF(lam_over_diam=%s, aberrations=%s'%(
-                self._lam_over_diam, self._aberrations)
+        s = 'galsim.OpticalPSF(lam_over_diam=%s'%self._lam_over_diam
+        # The aberrations look a bit nicer without the spaces, since it tightens up that
+        # parameter, which makes it easier to distinguish from the others.
+        ab_str = [ str(ab) for ab in self._aberrations ]
+        s += ', aberrations=[' + ','.join(ab_str) + ']'
         if self._obscuration != 0.:
             s += ', obscuration=%s'%self._obscuration
         if self._nstruts != 0:
@@ -392,7 +395,9 @@ def __str__(self):
                     self._pupil_plane_im, self._pupil_angle)
         if self._circular_pupil == False:
             s += ', circular_pupil=False'
-        s += ', flux=%s)'%self._flux
+        if self._flux != 1.0:
+            s += ', flux=%s'%self._flux
+        s += ')'
         return s
 
     def __getstate__(self):

galsim/transform.py

@@ -176,7 +176,8 @@ def __str__(self):
         if self.offset.x != 0 or self.offset.y != 0:
             s += '.shift(%s,%s)'%(self.offset.x,self.offset.y)
         if self.flux_ratio != 1.:
-            s += '.withScaledFlux(%s)'%self.flux_ratio
+            #s += '.withScaledFlux(%s)'%self.flux_ratio
+            s += ' * %s'%self.flux_ratio
         return s
 
     def __getstate__(self):