CosmoSim 2.8.0__tar.gz → 2.9.0__tar.gz

{cosmosim-2.8.0 → cosmosim-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.8.0
+Version: 2.9.0
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>

{cosmosim-2.8.0 → cosmosim-2.9.0}/include/cosmosim/Lens.h

@@ -138,7 +138,7 @@ public:
     virtual double psiXvalue( double, double ) const ;
     virtual double psiYvalue( double, double ) const ;
 
-    virtual cv::Point2d getXi( cv::Point2d ) ;
+    // virtual cv::Point2d getXi( cv::Point2d ) ;
 
     virtual double criticalXi( double ) const ;
     virtual cv::Point2d caustic( double ) const ;

{cosmosim-2.8.0 → cosmosim-2.9.0}/include/cosmosim/Source.h

@@ -51,11 +51,11 @@ class SourceConstellation : public Source {
 class SphericalSource : public Source {
 
 private:
-    double sigma ;
+    double sigma, n_sersic, luminosity;
     LightProfileSpec lightprofile;
 
 public:
-    SphericalSource(int,double,LightProfileSpec) ;
+    SphericalSource(int,double,double,double,LightProfileSpec) ;
 
 protected:
     virtual void drawSource(int, int, cv::Mat &) ;

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/Arguments.py

@@ -1,12 +1,85 @@
-# (C) 2023: Hans Georg Schaathun <georg@schaathun.net> 
+# (C) 2023,2026: Hans Georg Schaathun <georg@schaathun.net> 
 
 """
 This defines the `ArgumentParser` for the CosmoSim scripts.
 Several scripts use the same arguments, and thus share this module.
+
+The argument list is not complete.  For ease of maintenance, we should
+abandon support for command line arguments and refer to CSV and TOML 
+files instead.
+
+`paramap` is a mapping from the command line options into the
+structure of the TOML config files.  The key is the parameter
+name used in CSV and on the command line, while the value is
+the key used in TOML and nested `dict`s.
 """
 
 import argparse
 
+paramap = {
+        "config" : ( "simulator", "config", "mode" ), # renamed
+        "lens" : ( "simulator", "config", "lens" ),
+        "model" : ( "simulator", "config", "model" ),
+        "sampled" : ( "simulator", "config", "sampled" ),
+        "nterms" : ( "simulator", "nterms" ),
+        "imagesize" : ( "simulator", "imagesize" ),
+        "cropsize" : ( "simulator", "cropsize" ),
+        "xireference" : ( "simulator", "xireference" ), # new
+        "centred" : ( "simulator", "centred" ), # new
+        "source" : ( "source", "mode" ), # used differently
+
+        "chi" : ( "lens", "chi" ),
+        "einsteinradius" : ( "lens", "einsteinradius" ),
+        "orientation" : ( "lens", "orientation" ),
+        "ratio" : ( "lens", "ellipseratio" ), # relabelled
+
+        "sigma" :  ( "source", "sigma" ),
+        "sigma2" : ( "source", "sigma2" ),
+        "theta" : ( "source", "theta" ),
+        "directory" : ( "dataset", "directory" ) ,
+        "reflines" : ( "annotation", "reflines" ),
+        "criticalcurves" : ( "annotation", "criticalcurves" ),
+        }
+
+"""
+CLI options to be refactored into TOML structure.
++ [source] -> position is implicit
+
++ [position]
+        "x" : 1,
+        "y" : 1,
+        "phi" : 45,
+        # r is equal to x
+
+            
++ [masking] not yet in TOML
+    "maskradius" : None,
+    "mask" : False,
+    "showmask" : False,
+    "maskscale" : 0.9,
+
++ Not implemented yet
+        "cluster" : None,
+
+CLI options never used in main parameter structure
+    "toml" : None,        # Source
+    "maxcount" : None,
+    "amplitudes" : None,  # Amplitudes file
+    "mldata" : False,
+    "csvfile" : None,
+    "outfile" : None,
+    "name" : "test",
+
+CLI options currently unsupported
+    "psiplot" : False,
+    "kappaplot" : False,
+    "family" : False,
+    "components" : 6,
+    "join" : False,
+    "apparent" : False, 
+    "actual" : False, 
+"""
+
 class CosmoParser(argparse.ArgumentParser):
   def __init__(self,*a,**kw):
     super().__init__(*a,**kw)
@@ -42,7 +115,6 @@ class CosmoParser(argparse.ArgumentParser):
                       help="Number of Roulettes terms", default=15)
     self.add_argument('-Z', '--imagesize', default=512, help="image size for calculations")
     self.add_argument('-z', '--cropsize', help="Final image size")
-    self.add_argument('--lightprofile', help="light profile (sersic or gaussian)")
 
     # Output configuration 
     self.add_argument('-R', '--reflines',action='store_true',
@@ -68,7 +140,6 @@ class CosmoParser(argparse.ArgumentParser):
     self.add_argument('-A', '--apparent',action='store_true',help="write apparent image")
     self.add_argument('--mldata',action='store_true',help="Make roulette output for ML without redundant colums")
     self.add_argument('-a', '--actual',action='store_true',help="write actual image")
-    self.add_argument('-U', '--original',action='store_true',help="write original image before centring")
 
     # Output file names
     self.add_argument('-N', '--name', default="test",

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/Controller.py

@@ -10,7 +10,7 @@ from tkinter import *
 from tkinter import ttk
 import math
 
-from CosmoSim import modelValues, sourceValues
+from . import modelValues, sourceValues
 
 # Classes
 class FloatSlider:
@@ -146,8 +146,8 @@ class SourcePane(ttk.Frame):
         self.lightProfileSelector = ttk.Combobox( self,
                 textvariable=lightVar,
                 values=[ "Gaussian", "Sersic" ] )
-        lightProfileLabel.grid(column=0, row=5, sticky=E )
-        self.lightProfileSelector.grid(column=1, row=5)
+        lightProfileLabel.grid(column=0, row=7, sticky=E )
+        self.lightProfileSelector.grid(column=1, row=7)
         self.sigmaSlider = IntSlider( self,
                 text="Source Size", row=2,
                 default=20 )
@@ -157,9 +157,18 @@ class SourcePane(ttk.Frame):
         self.thetaSlider = IntSlider( self, 
                 toval=360,
                 text="Source Rotation", row=4, default=45 )
+        self.nslider = FloatSlider( self,
+                fromval=0.5,
+                toval=10,
+                text="Sersic Index", row=5, default=4 )
+        self.Lslider = FloatSlider( self,
+                toval=100,
+                text= "Luminosity", row = 6,  default=10 )
         self.sigmaSlider.var.trace_add( "write", self.push)
         self.sigma2Slider.var.trace_add( "write", self.push)
         self.thetaSlider.var.trace_add( "write", self.push)
+        self.nslider.var.trace_add("write", self.push)
+        self.Lslider.var.trace_add("write", self.push)
         self.push(runsim=False)
         modeVar.trace_add("write", self.push) 
         lightVar.trace_add( "write", self.push)
@@ -170,6 +179,8 @@ class SourcePane(ttk.Frame):
            "sigma2":  self.sigma2Slider.get(),
            "theta":  self.thetaSlider.get(),
            "lightprofile": self.lightprfVar.get(),
+           "n_sersic": self.nslider.get(),
+           "luminosity": self.Lslider.get()
            }
         print( "[Controller.py] Push source parameters", p )
         self.sim.makeSource(p)

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/CosmoSim.cpp

@@ -14,8 +14,10 @@
 
 
 CosmoSim::CosmoSim() {
-   std::cout << "CosmoSim Constructor\n" ;
-   std::cout << "Number of CPU cores: " << std::thread::hardware_concurrency() << std::endl ; 
+   if (DEBUG) {
+      std::cout << "CosmoSim Constructor\n" ;
+      std::cout << "Number of CPU cores: " << std::thread::hardware_concurrency() << std::endl ; 
+   }
    rPos = -1 ;
 }
 
@@ -124,24 +126,24 @@ void CosmoSim::setModelMode(int m) {
 }
 void CosmoSim::setLensMode(int m) { 
    if ( lensmode != m ) {
-      std::cout << "[CosmoSim.cpp] setLensMode(" << lensmode 
+      if (DEBUG) std::cout << "[CosmoSim.cpp] setLensMode(" << lensmode 
          << " -> " << m << ")\n" ;
       lensmode = m ; 
       modelchanged = 1 ;
    } else {
-      std::cout << "[CosmoSim.cpp] setLensMode(" << lensmode << ") unchanged\n" ;
+      if (DEBUG) std::cout << "[CosmoSim.cpp] setLensMode(" << lensmode << ") unchanged\n" ;
    }
 }
 void CosmoSim::setLens(PsiFunctionLens *l) { 
-   std::cout << "[CosmoSim::setLens]\n" ;
+   if (DEBUG) std::cout << "[CosmoSim::setLens]\n" ;
    lensmode = CSIM_PSI_CLUSTER ; 
    modelchanged = 1 ;
    lens = psilens = l ;
-   std::cout << "[CosmoSim::setLens] returning\n" ;
+   if (DEBUG) std::cout << "[CosmoSim::setLens] returning\n" ;
 }
 void CosmoSim::setSampled(int m) { 
    if ( sampledlens != m ) {
-      std::cout << "[CosmoSim.cpp] setSampled(" << m << " -> " << m << ")\n" ;
+      if (DEBUG) std::cout << "[CosmoSim.cpp] setSampled(" << m << " -> " << m << ")\n" ;
       sampledlens = m ; 
       modelchanged = 1 ;
    }
@@ -152,10 +154,10 @@ void CosmoSim::initLens() {
    if (DEBUG) std::cout << "[initLens] ellipseratio = " << ellipseratio << "\n" ;
    if ( ! modelchanged ) return ;
    if ( sim ) {
-      std::cout << "[initLens] delete sim\n" ;
+      if (DEBUG) std::cout << "[initLens] delete sim\n" ;
       delete sim ;
    }
-   std::cout << "switch( lensmode )\n" ;
+   if (DEBUG) std::cout << "switch( lensmode )\n" ;
    switch ( lensmode ) {
        case CSIM_PSI_CLUSTER:
           std::cout << "[initLens] ClusterLens - no further init\n" ;
@@ -181,9 +183,9 @@ void CosmoSim::initLens() {
          std::cerr << "No such lens model!\n" ;
          throw NotImplemented();
    }
-   std::cout << "[initLens] instantiated lens\n" ;
+   if (DEBUG) std::cout << "[initLens] instantiated lens\n" ;
 
-   std::cout << "switch( modelmode )\n" ;
+   if (DEBUG) std::cout << "switch( modelmode )\n" ;
    switch ( modelmode ) {
        case CSIM_MODEL_POINTMASS_ROULETTE:
          if (DEBUG) std::cout << "Running Roulette Point Mass Lens (mode=" 
@@ -249,18 +251,18 @@ void CosmoSim::setResolution(int sz ) {
    basesize = sz ; 
 }
 int CosmoSim::setSource( Source *src ) {
-    std::cout  << "[setSource]\n" ;
+    if (DEBUG) std::cout  << "[setSource]\n" ;
     srcmode = CSIM_SOURCE_EXTERN ;
     this->src = src ;
     return 1 ; 
 }
 bool CosmoSim::runSim() { 
-   std::cout  << "[runSim] starting \n" ;
+   if (DEBUG) std::cout  << "[runSim] starting \n" ;
 
    // Configure the lens
    initLens() ;   // initLens() implements changing lens and model modes
    if ( sim == NULL ) {
-      std::cout << "Simulator not initialised after initLens().\n" ;
+      if (DEBUG) std::cout << "Simulator not initialised after initLens().\n" ;
       throw std::logic_error("Simulator not initialised") ;
    }
    configLens() ; // configLens() implements parameter changes
@@ -284,13 +286,13 @@ bool CosmoSim::runSim() {
    // Py_BEGIN_ALLOW_THREADS
    if (DEBUG) std::cout << "[runSim] thread section\n" ;
    if ( sim == NULL ) {
-      std::cout << "Simulator not initialised in thread section.\n" ;
+      if (DEBUG) std::cout << "Simulator not initialised in thread section.\n" ;
       throw std::logic_error("Simulator not initialised") ;
    }
    sim->update() ;
    // Py_END_ALLOW_THREADS
 
-   std::cout << "[runSim] completes\n" ;
+   if (DEBUG) std::cout << "[runSim] completes\n" ;
    return true ;
 }
 bool CosmoSim::moveSim( double rot, double scale ) { 

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/CosmoSim.h

@@ -37,7 +37,7 @@ private:
     int sampledlens = 0, modelchanged = 1 ;
     int lensmode=CSIM_NOPSI_PM ;
     int srcmode=CSIM_SOURCE_SPHERE, sourceSize=20, sourceSize2=10,
-        sourceTheta=0 ;
+        sourceTheta=0, n_sersic=5, luminosity = 10 ;
     double xPos=10, yPos=0, rPos=10, thetaPos=0; ;
     cv::Point2d centrepoint ;
     double maskRadius=0 ;

cosmosim-2.9.0/src/CosmoSim/Helper/Parameters.py

@@ -0,0 +1,49 @@
+# (C) 2024,2026: Hans Georg Schaathun <georg@schaathun.net> 
+
+class Parameters:
+    """
+    The Parameters class wraps the commandline arguments as well as a CSV 
+    row as a dict-like object.
+
+    The constructor can take either an `ArgumentParser` object (`args`) 
+    as well as a nested `dict` (`cfg`) as given by a TOML file.  
+    Only selected parameters are used from the
+    TOML format, and they will never override `args`/`cfg` parameters.
+
+    For executable scripts, one can use `CosmoParser` object directly as
+    the `args` argument, in addition to a TOML file if available.
+    For API use, one should normally use the `cfg` argument.
+
+    To add a row from the dataset, use the `serRow()` method.  Values
+    from the row will always override other parameters.
+    """
+    def __init__(self,args=None,cfg=None):
+        if args:
+            self._args = args.__dict__
+            if cfg is not None:
+                raise ValueError( "Cannot specify both args and cfg." )
+        else:
+            self._args = {}
+        self._row = {}
+        if cfg:
+            cfg1 = cfg["simulator"]
+            if "cropsize" not in self._args:
+                self._args["cropsize"] = cfg1.get( "cropsize", 256 )
+            if "imagesize" not in self._args:
+                self._args["imagesize"] = cfg1.get( "imagesize", 512 )
+            if "source" not in self._args:
+                try:
+                    self._args["source"] = cfg["source"]["mode"]
+                except:
+                    self._args["source"] = None
+    def setRow(self,row):
+        self._row = row
+    def get(self,key,default=None,verbose=0):
+        r = self._args.get( key, default )
+        r = self._row.get(key,r)
+        return r
+    def __getitem__(self,key):
+        return self.get(key)
+    def __setitem__(self,key,v):
+        self._row[key] = v
+

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/Image.py

@@ -8,6 +8,10 @@ Post-processing functions for images.
 import numpy as np
 import cv2
 import argparse
+import matplotlib.pyplot as plt
+
+def imshow(im):
+    plt.imshow(im,cmap="grey", vmin=0, vmax=255)
 
 
 def imageCoordinate( pt, im ):

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/Simulator.py

@@ -18,8 +18,6 @@ the cost of reinstantiation in bulk simulation, and it also leaves the possibili
 to set defaults in advance.
 """
 
-import tomllib as tl
-
 import cv2 as cv
 import sys
 import os
@@ -31,7 +29,7 @@ from . import CosmoSim
 from .Image import centreImage, drawAxes, crop, annotatePoint, annotateCircle, translateImage
 
 from .Arguments import CosmoParser
-from .Parameters import Parameters
+from . import Parameters
 import pandas as pd
 
 defaultoutcols = [ "index", "filename", "source", "lens", "chi", "R", "phi", "einsteinR", "sigma", "sigma2", "theta", "x", "y" ]
@@ -41,20 +39,23 @@ class GenericSim:
     This is a generic superclass for shared methods.
     """
     def __init__(self,param=None,row=None,name=None,outcols=None,verbose=1):
-        if verbose > 0: print( "[GenericSim] init ..." )
+        if verbose > 1: print( "[GenericSim] init ..." )
         self.verbose = verbose
 
         self.outcols = outcols
 
         self.name = name
         if param is None: 
-            print( "[GenericSim] No parameters give. Using defaults" )
+            if verbose: print( "[GenericSim] No parameters give. Using defaults" )
             param = Parameters()
         self.param = param
         self.directory = param.get( "directory" )
         if self.directory:
             os.makedirs( self.directory, exist_ok=True )
 
+        if self.verbose > 2:
+            print( "[GenericSim] xireference =", self.param.get( "xireference" ) )
+
     def setParameters(self,row):
         """
         Reset parameters in the backend simulator, using the given data row.
@@ -67,9 +68,9 @@ class GenericSim:
         Run the simulator with the given data row.
         """
         if not row is None:
-            if self.verbose: print( "[initSim] using row" )
+            if self.verbose > 1: print( "[initSim] using row" )
             self.setParameters( row )
-            if self.verbose: print( "index", row.get( "index", None ) )
+            if self.verbose > 1: print( "index", row.get( "index", None ) )
             self.param.setRow( row )
             try:
                 name = row.name.split(".")[0]
@@ -77,17 +78,16 @@ class GenericSim:
                 name = row["filename"].split(".")[0]
             self.row = row
             self.name = name
-        elif self.verbose: print( "[initSim] row is None" )
-        if self.name is None:
-            self.name = self.param.get( "name" )
-        if self.verbose: print( "[initSim] item name:", self.name )
+        elif self.verbose > 1: print( "[initSim] row is None" )
+        if self.verbose>1: print( "[initSim] item name:", self.name )
 
         self.runSim()
 
         self.image = self.getDistortedImage( )
         (self.centreimage,self.centrepoint) = centreImage(self.image)
-        print( "[datagen.py] Centre Point", self.centrepoint,
-              "(Centre of Luminence in Planar Co-ordinates)" )
+        if self.verbose: print(
+                "[datagen.py] Centre Point", self.centrepoint,
+                "(Centre of Luminence in Planar Co-ordinates)" )
     def getDistortedImage(self):
         return  self.sim.getDistortedImage( 
                          critical=self.param.get( "criticalcurves" ),
@@ -95,11 +95,11 @@ class GenericSim:
     def setParameters(self):
         raise Exception("Not implemented")
     def runSim(self):
-        if self.verbose: print( "[runSim]" )
+        if self.verbose>2: print( "[runSim]" )
         self.sim.makeSource( self.param )
-        if self.verbose > 0: print ( "[initSim] ready for runSim()\n" ) ;
+        if self.verbose > 1: print ( "[GenericSim] ready for runSim()\n" ) ;
         self.sim.runSim()
-        if self.verbose > 0: print ( "[initSim] runSim() completed\n" ) ;
+        if self.verbose > 1: print ( "[GenericSim] runSim() completed\n" ) ;
     def getActual(self):
         param = self.param
         name = self.name
@@ -114,8 +114,12 @@ class GenericSim:
         cv.imwrite(fn,im)
     def getAnnotated(self,centred=None,cropsize=None):
         """
-        Stub for a future function to get an image with annotations.
+        Get an image with annotations showing key points and the convergence ring.
+        This is incomplete and should be extended with addition annotations and
+        options.
         """
+        if centred is not None:
+            raise NotImplementedError("centred option for getAnnotated() is not implemented yet.")
         im = self.sim.getDistortedImage( critical=True )
         im = annotatePoint( im, self.centrepoint, colour=( 64, 255, 64 ) )
         pt = self.sim.getXiOffset( (0,0) )
@@ -123,18 +127,21 @@ class GenericSim:
         x, y = pt
         convradius = np.sqrt( x*x + y*y )
         im = annotateCircle( im, pt, radius=convradius, colour=( 64, 64, 255 ) )
+        if cropsize is None: cropsize = self.param.get( "cropsize" )
+        if cropsize:
+            im = crop(im,int( cropsize ) )
         return im
-    def getImage(self,centred=None,cropsize=None):
-        param = self.param
-        if centred is None: centred = param.get( "centred" )
+    def getImage(self,centred=None,cropsize=None,reflines=None):
+        if centred is None: centred = self.param.get( "centred" )
+        if reflines is None: reflines = self.param.get( "reflines" )
         if centred:
-            im = self.centreimage
+            im = self.centreimage.copy()
         else:
-            im = self.image
-        if cropsize is None: cropsize = param.get( "cropsize" )
+            im = self.image.copy()
+        if cropsize is None: cropsize = self.param.get( "cropsize" )
         if cropsize:
-            im = crop(im,int( param.get( "cropsize" ) ))
-        if param.get( "reflines" ):
+            im = crop(im,int( cropsize ) )
+        if reflines:
             drawAxes(im)
         return im
     def saveImage(self,name=None):

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/View.py

@@ -10,7 +10,7 @@ from tkinter import ttk
 from PIL import Image, ImageTk
 import numpy as np
 import threading as th
-from CosmoSim.Image import drawAxes
+from .Image import drawAxes
 
 import sys
 

{cosmosim-2.8.0 → cosmosim-2.9.0}/src/CosmoSim/__init__.py

@@ -1,4 +1,4 @@
-# (C) 2022-24: Hans Georg Schaathun <georg@schaathun.net> 
+# (C) 2022-26: Hans Georg Schaathun <georg@schaathun.net> 
 
 """
 The CosmoSim package comprises several components, including scripts,
@@ -11,24 +11,37 @@ import threading as th
 import os, sys
 
 import traceback
+from .Helper.Parameters import Parameters 
 
-__version__ = "2.8.0"
+__version__ = "2.9.0"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec
 PsiSpec = cs.PsiSpec
 LightProfileSpec = cs.LightProfileSpec
+Point = cs.Point 
+
+class SphericalSource(cs.SphericalSource):
+    """Spherical source model.
+    This is a wrapper around the C++ class to provide default
+    arguments to the constructor.
+    """
+    def __init__( self, size, sigma, idx=0, lum=0,
+                 ltprf=LightProfileSpec.Gaussian ):
+        super().__init__( size, sigma, idx, lum, ltprf )
 
 class RouletteRegenerator(cs.RouletteRegenerator):
-    def __init__(self,*a,**kw):
+    def __init__(self,*a,verbose=1,**kw):
         super().__init__(*a,**kw)
+        self.verbose = verbose
         self.bgcolour = 0
     def makeSource(self,param):
         if param.get( "imagesize" ) is None:
             raise Exception( "Image size not specified" )
         self._src = makeSource(param)
         self.setSource( self._src )
-        print( "RouletteRegenerator.makeSource() returns" )
+        if self.verbose>1:
+            print( "RouletteRegenerator.makeSource() returns" )
     def getDistortedImage(self,reflines=False,critical=False,mask=False,showmask=False):
         """
         Return the Distorted Image from the simulator as a numpy array.
@@ -48,21 +61,21 @@ class RouletteRegenerator(cs.RouletteRegenerator):
             raise e
         if im.shape[2] == 1 : im.shape = im.shape[:2]
         return np.maximum(im,self.bgcolour)
-Point = cs.Point 
 
-def makeSourceConstellation(src,size):
+def makeSourceConstellation(src,size,verbose=1):
     ss = src.split(";")
     sl = [ x.split("/") for x in ss ]
-    print( "makeSourceConstellation: src=", src, "size=", size, "sl=", sl )
+    if verbose:
+        print( "makeSourceConstellation: src=", src, "size=", size, "sl=", sl )
     constellation = SourceConstellation(size)
     for s in sl:
         mode = sourceDict[s[0]]
         ltprf = lightProfileDict.get( s[0], LightProfileSpec.Gaussian ) 
         if mode == sourceDict.get( "Spherical" ):
-            constituent = cs.SphericalSource( size, float(s[3]), ltprf )
+            constituent = SphericalSource( size, float(s[3]), float(s[6]), float(s[7]), ltprf=ltprf )
         elif mode == sourceDict.get( "Ellipsoid" ):
             constituent = cs.EllipsoidSource( size, float(s[3]),
-                    float(s[4]), float(s[5])*np.pi/180, ltprf)
+                    float(s[4]), float(s[5])*np.pi/180, ltprf=ltprf)
         elif mode == sourceDict.get( "Triangle" ):
             constituent = cs.TriangleSource( size, float(s[3]), float(s[4])*np.pi/180 )
         elif mode == sourceDict.get( "Iamge (Einstein)" ):
@@ -71,29 +84,36 @@ def makeSourceConstellation(src,size):
             raise Exception( "Unknown Source Mode" )
 
         constellation.addSource( constituent, float(s[1]), float(s[2]))
-    print( "makeSourceConstellation() returns" )
+    if verbose>1:
+        print( "makeSourceConstellation() returns" )
     return constellation
 
-def makeSource(param):
+def makeSource(param,verbose=0):
     """
     Factory function to create a Source object given the parameter list.
     """
     size = int( param.get( "imagesize" ) )
     src = param.get("source")
     ltprf0 = param.get( "lightprofile", None )
-    print( f"[makeSource] src={src}, ltprf0={ltprf0}" )
+    if verbose:
+        print( f"[makeSource] src={src}, ltprf0={ltprf0}" )
     if src.find("/") < 0:
        mode = sourceDict[src]
        if ltprf0 is None:
            ltprf = lightProfileDict.get( src, LightProfileSpec.Gaussian ) 
        else:
            ltprf = lightProfileDict.get( ltprf0, LightProfileSpec.Gaussian ) 
-       print( f"[makeSource] mode={mode}, ltprf={ltprf}" )
+       if verbose:
+          print( f"[makeSource] mode={mode}, ltprf={ltprf}" )
        if mode == sourceDict.get( "Spherical" ):
-           r = cs.SphericalSource( size, float(param.get( "sigma" )), ltprf)
+           r = SphericalSource( size, float(param.get( "sigma" )),
+                  float(param.get("n_sersic",0)),
+                  float(param.get("luminosity",0)),
+                  ltprf=ltprf)
        elif mode == sourceDict.get( "Ellipsoid" ):
            r = cs.EllipsoidSource( size, float(param.get( "sigma" )),
-                   float(param.get( "sigma2" )), float(param.get( "theta" ))*np.pi/180, ltprf)
+                   float(param.get( "sigma2" )),
+                   float(param.get( "theta" ))*np.pi/180, ltprf)
        elif mode == sourceDict.get( "Triangle" ):
            r = cs.TriangleSource( size, float(param.get( "sigma" )),
                    float(param.get( "theta" ))*np.pi/180 )
@@ -103,8 +123,10 @@ def makeSource(param):
            raise Exception( "Unknown Source Mode" )
     else:
         r = makeSourceConstellation(src,size)
-        print( "makeSource() - makeSourceConstellation() has returned" )
-    print( "makeSource() returns" )
+        if verbose:
+            print( "makeSource() - makeSourceConstellation() has returned" )
+    if verbose>1:
+        print( "makeSource() returns" )
     return r 
 
 lensDict = {
@@ -211,9 +233,10 @@ def getSourceFileName():
     
 
 class SourceConstellation(cs.SourceConstellation):
-    def __init__(self,size):
+    def __init__(self,size,verbose=1):
         self._sources = []
-        print( "SourceConstellation.__init__" )
+        self.verbose = 1
+        if verbose: print( "SourceConstellation.__init__" )
         super().__init__(size)
     def addSource(self,src,*a):
         self._sources.append(src)
@@ -335,8 +358,8 @@ class CosmoSim(cs.CosmoSim):
         print( f"setModelMode({s})")
         # traceback.print_stack()
         return super().setModelMode( int( modelDict[s] ) ) 
-    def setConfigMode(self,s):
-        print( f"setConfigMode({s})")
+    def setConfigMode(self,s,verbose=0):
+        if verbose > 1: print( f"setConfigMode({s})")
         (model,lens,sampleMode) = configDict[s]
         super().setSampled( int( sampleMode ) ) 
         super().setLensMode( int( lens ) )