CosmoSim 2.8.1__tar.gz → 2.9.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.8.1
+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.1 → 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.1 → 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.1 → 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.1 → 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.1 → 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.8.1 → cosmosim-2.9.0}/src/CosmoSim/Helper/Parameters.py

@@ -5,9 +5,9 @@ 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`) or
-    a flat `dict` structure (`cfg`) as well as a nested `dict` (`hcfg`)
-    as given by a TOML file.  Only selected parameters are used from the
+    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
@@ -17,27 +17,25 @@ class Parameters:
     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,hcfg=None):
+    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." )
-        elif cfg:
-            self._args = cfg
         else:
             self._args = {}
         self._row = {}
-        if hcfg:
-            cfg1 = hcfg["simulator"]
+        if cfg:
+            cfg1 = cfg["simulator"]
             if "cropsize" not in self._args:
-                self._args.cropsize = cfg1.get( "cropsize", 256 )
+                self._args["cropsize"] = cfg1.get( "cropsize", 256 )
             if "imagesize" not in self._args:
-                self._args.imagesize = cfg1.get( "imagesize", 512 )
+                self._args["imagesize"] = cfg1.get( "imagesize", 512 )
             if "source" not in self._args:
                 try:
-                    self._args.source = hcfg["source"]["mode"]
+                    self._args["source"] = cfg["source"]["mode"]
                 except:
-                    self._args.source = None
+                    self._args["source"] = None
     def setRow(self,row):
         self._row = row
     def get(self,key,default=None,verbose=0):

{cosmosim-2.8.1 → 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.1 → 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
@@ -81,8 +79,6 @@ class GenericSim:
             self.row = row
             self.name = name
         elif self.verbose > 1: print( "[initSim] row is None" )
-        if self.name is None:
-            self.name = self.param.get( "name" )
         if self.verbose>1: print( "[initSim] item name:", self.name )
 
         self.runSim()

{cosmosim-2.8.1 → 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.1 → cosmosim-2.9.0}/src/CosmoSim/__init__.py

@@ -13,7 +13,7 @@ import os, sys
 import traceback
 from .Helper.Parameters import Parameters 
 
-__version__ = "2.8.1"
+__version__ = "2.9.0"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec
@@ -21,6 +21,15 @@ 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,verbose=1,**kw):
         super().__init__(*a,**kw)
@@ -63,10 +72,10 @@ def makeSourceConstellation(src,size,verbose=1):
         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)" ):
@@ -97,10 +106,14 @@ def makeSource(param,verbose=0):
        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 )

cosmosim-2.9.0/src/CosmoSim/__main__.py

@@ -0,0 +1,3 @@
+from . import __version__
+
+print( "CosmoSim version", __version__ )

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/CosmoSim/bindings.cpp

@@ -58,7 +58,7 @@ PYBIND11_MODULE(CosmoSimPy, m) {
         .def("getImage", &Source::getImage)
         ;
     py::class_<SphericalSource,Source>(m, "SphericalSource")
-        .def(py::init<int,double,LightProfileSpec>())
+        .def(py::init<int,double,double,double,LightProfileSpec>())
         ;
     py::class_<EllipsoidSource,Source>(m, "EllipsoidSource")
         .def(py::init<int,double,double,double,LightProfileSpec>())

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/CosmoSim/datagen.py

@@ -22,7 +22,7 @@ from .Arguments import CosmoParser
 from . import Parameters
 import pandas as pd
 
-defaultoutcols = [ "index", "filename", "source", "lens", "chi", "R", "phi", "einsteinR", "sigma", "sigma2", "theta", "x", "y" ]
+defaultoutcols = [ "index", "filename", "source", "lens", "chi", "R", "phi", "einsteinR", "sigma", "sigma2", "theta", "n_sersic", "luminosity", "x", "y" ]
 
 def setParameters(sim,row,verbose=1):
     if verbose > 2:
@@ -92,7 +92,7 @@ class SimImage(GenericSim):
         else:
             centrepoint = (0,0)
         maxm = self.param.get( "nterms" )
-        xireference = self.param.get( "xireference" )
+        xireference = self.param.get( "xireference", True )
         if self.verbose > 0:
             print( "[datagen.py] Finding Alpha/beta; centrepoint=", centrepoint )
         # r = pd.Series([ row[x] for x in self.outcols ], index=self.outcols )
@@ -217,7 +217,7 @@ def makeSingle(sim,param=None,name=None,row=None,outcols=None):
     if param.get( "join" ): imsim.join()
     if param.get( "family" ): imsim.family()
     if param.get( "psiplot" ): imsim.psiplot()
-    if param.get( "kappaplot" ): imsim.psiplot()
+    if param.get( "kappaplot" ): imsim.kappaplot()
     if param.get( "apparent" ): imsim.getApparent()
     if param.get( "actual" ): imsim.getActual()
     print( "makeSingle() returns" )
@@ -286,7 +286,7 @@ def main(args):
         print( "columns:", outcols )
         dfs = []
         for index,row in frame.iterrows():
-            imsim = makeSingle(sim,param,row=row,outcols=outcols)
+            imsim = makeSingle(sim,param,name=args.name,row=row,outcols=outcols)
             if args.outfile:
                 dfs.append( imsim.getData() )
         df = pd.DataFrame( dfs )

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/CosmoSim/dataset.py

@@ -47,17 +47,37 @@ def uniform(toml,key,rng=(0,50)):
         return random.uniform(mn,mx)
     except:
         return None
+    
+def exponential(toml,key,rng=(0,50),lam=0.8):
+    if key in toml:
+        return toml[key]
+    lambd = toml.get( f"{key}-lambda", lam )
+    x = random.expovariate(lambd)
+    u = 1 - np.exp(-lambd * x)
+
+    if rng:
+        mn = toml.get( f"{key}-min", rng[0] )
+        mx = toml.get( f"{key}-max", rng[1] )
+        return mn + (mx - mn) * u
+    try:
+        mn = toml.get( f"{key}-min" )
+        mx = toml.get( f"{key}-max" )
+        return mn + (mx - mn) * u
+    except:
+        return None
 
 def getline(idx,toml):
 
     nterms = toml["simulator"].get( "nterms", 16 )
-    chi = toml["lens"].get( "chi", random.uniform(30,70) )
+    chi = uniform(toml["lens"], "chi", (30,70) )
 
     # Source
     sigma = uniform( toml["source"], "sigma", (1,60) )
     sigma2 = uniform( toml["source"], "sigma2", (1,40) )
     theta = uniform( toml["source"], "theta", (0,179) )
     coor = toml["source"].get( "position", "cartesian" )
+    n_sersic = uniform(toml["source"], "n_sersic", (1,5))
+    luminosity = exponential(toml["source"], "luminosity", (1,20), 2.0)
 
     # Lens
     einsteinR = uniform( toml["lens"], "einstein", (10,50) )
@@ -91,10 +111,10 @@ def getline(idx,toml):
     return pd.Series(
         data=[ idx,f"image-{idx:06}.png", src, cfg, chi, R, phi,
                einsteinR, ellipseratio, orientation, 
-               sigma, sigma2, theta, nterms, x, y ],
+               sigma, sigma2, theta, n_sersic, luminosity, nterms, x, y ],
         index=[ "index", "filename", "source", "config", "chi", 
                "R", "phi", "einsteinR", "ellipseratio", "orientation",
-               "sigma", "sigma2", "theta", "nterms", "x", "y" ]
+               "sigma", "sigma2", "theta", "n_sersic", "luminosity", "nterms", "x", "y" ]
         )
     # return f'"{idx:04}","image-{idx:04}.png",{src},{cfg},{chi},' \
     #      + f'{R},{phi},{einsteinR},{sigma},{sigma2},{theta},{nterms},{x},{y}'

cosmosim-2.9.0/src/CosmoSim/defaults.toml

@@ -0,0 +1,38 @@
+# This file is intended to document default parameters.
+# It is incomplete and unused at the moment, and must be
+# completed as part of the refactoring into using the TOML
+# structure for parameters throughout
+
+[simulator]
+nterms = 5
+imagesize = 512
+cropsize = 192
+xireference = true
+centred = true
+
+
+[simulator.config]
+mode = 0   # This used to be just simulator -> config
+lens = "SIE"
+model = "Raytrace"
+sampled = false
+
+[lens]
+chi = 50
+einsteinradius = 20
+orientation = 0
+ellipseratio = 0.6
+
+[source]
+mode = "Spherical" 
+sigma = 20
+sigma2 = 10
+theta = 45
+
+[dataset]
+directory = "./"
+
+[annotation] 
+# not yet in TOML
+reflines = false
+criticalcurves = false

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/CosmoSim/roulettegen.py

@@ -74,9 +74,13 @@ class Resim(GenericSim):
                 print( "xi", row["xiX"], row["xiY"], row["sigma"] )
             pt = (0,0)
         else:
+            try:
+                pt = ( row["offsetX"], row["offsetY"] )
+            except:
+                raise RuntimeError( "offsetX/offsetY missing from dataset [no-xireference-mode]" )
             if self.verbose:
                 print( "Offset", row["offsetX"], row["offsetY"], row["sigma"] )
-            pt = ( row["offsetX"], row["offsetY"] )
+                print( row )
         rsim.setCentrePy( *pt )
         print( "Initialised simulator at point", pt )
 
@@ -123,6 +127,23 @@ class Resim(GenericSim):
         self.coefs = coefs
         self.cols = cols
         self.frame = frame
+
+def processResim( frame, sim=None, args=None
+                 , cfg=None, maxcount=2**30 ):
+
+    count = 1
+    for index,row in frame.iterrows():
+        print( "[roulettegen.py] Processing", index )
+        param = Parameters( args=args, cfg=cfg )
+
+        imsim = Resim( sim, param=param, row=row )
+        imsim.saveImage()
+
+        if param.get( "actual" ): imsim.getActual()
+        if param.get( "apparent" ): imsim.getApparent()
+
+        count += 1
+        if count > maxcount: break
     
 def main(args):
     """
@@ -134,31 +155,18 @@ def main(args):
     else:
         raise Exception( "No CSV file given; the --csvfile option is mandatory." )
 
-    count = 1
     if args.maxcount is None:
         maxcount = 2**30
     else:
         maxcount = int(args.maxcount)
-    param = Parameters(args)
 
     # Masking is not implemented in the Resim class.
     sim = RouletteRegenerator()
     sim.setMaskMode( args.mask )
     if not args.maskradius is None:
         sim.setMaskRadius( float(args.maskradius) )
-        
-    for index,row in frame.iterrows():
-        print( "[roulettegen.py] Processing", index )
-        param = Parameters( args )
 
-        imsim = Resim( sim, param=param, row=row )
-        imsim.saveImage()
-
-        if args.actual: imsim.getActual()
-        if args.apparent: imsim.getApparent()
-
-        count += 1
-        if count > maxcount: break
+    processResim( frame, sim=sim, args=args, maxcount=maxcount )
 
     print( "[roulettegen.py] Done" )
 

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/CosmoSim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.8.1
+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.1 → cosmosim-2.9.0}/src/CosmoSim.egg-info/SOURCES.txt

@@ -598,9 +598,11 @@ src/CosmoSim/RouletteAmplitudes.py
 src/CosmoSim/Simulator.py
 src/CosmoSim/View.py
 src/CosmoSim/__init__.py
+src/CosmoSim/__main__.py
 src/CosmoSim/bindings.cpp
 src/CosmoSim/datagen.py
 src/CosmoSim/dataset.py
+src/CosmoSim/defaults.toml
 src/CosmoSim/einstein.png
 src/CosmoSim/roulettegen.py
 src/CosmoSim/roulettestatistics.py

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/drafts/LensWrapper.py

@@ -183,7 +183,7 @@ void LensWrapper::initSource( ) {
    // if ( src ) delete src ;
    switch ( srcmode ) {
        case CSIM_SOURCE_SPHERE:
-         src = new SphericalSource( size, sourceSize ) ;
+         src = new SphericalSource( size, sourceSize, n_sersic, luminosity) ;
          break ;
        case CSIM_SOURCE_ELLIPSE:
          src = new EllipsoidSource( size, sourceSize,

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/simlib/EllipsoidSource.cpp

@@ -2,6 +2,7 @@
 
 #include "cosmosim/Simulator.h"
 #include <thread>
+#include <stdexcept>
 
 EllipsoidSource::EllipsoidSource( int sz, double sig1, double sig2, double thet, LightProfileSpec lightprf) :
         sigma1(sig1),
@@ -22,10 +23,11 @@ void EllipsoidSource::drawSource(int begin, int end, cv::Mat& dst) {
             int x = col - dst.cols/2;
             int y = row - dst.rows/2;
             if (lightprofile == LightProfileSpec::CSIM_LIGHT_GAUSSIAN) {
-            auto value = (uchar)round(255 * exp( 0.5*(-(x*x)/(sigma1*sigma1) - (y*y)/(sigma2*sigma2) ) ));
-            dst.at<uchar>(row, col) = value;
-            }
-            else if (lightprofile == LightProfileSpec::CSIM_LIGHT_SERSIC) {
+              auto value = (uchar) round (
+		    255 * exp( 0.5*(-(x*x)/(sigma1*sigma1) 
+			  - (y*y)/(sigma2*sigma2) ) ) );
+              dst.at<uchar>(row, col) = value;
+            } else if (lightprofile == LightProfileSpec::CSIM_LIGHT_SERSIC) {
                 auto q = sigma2/sigma1;
                 int n = 4;  // Sersic index
                 auto re = 10*sigma1; // effective radius
@@ -36,7 +38,9 @@ void EllipsoidSource::drawSource(int begin, int end, cv::Mat& dst) {
                     value = 255;
                 }
                 dst.at<uchar>(row, col) = (uchar)value;
-            }  
+            }  else {
+	       throw std::runtime_error( "Unknown light profile." );
+	    }
         }
     }
 }

{cosmosim-2.8.1 → cosmosim-2.9.0}/src/simlib/SIE.cpp

@@ -6,11 +6,13 @@
 #include "cosmosim/Lens.h"
 #include "simaux.h"
 
+/*
 cv::Point2d SIE::getXi( cv::Point2d chieta ) {
    return chieta + cv::Point2d( 
          psiXvalue(chieta.x, chieta.y ),
          psiYvalue(chieta.x, chieta.y ) ) ;
 }
+*/
 
 double SIE::psifunctionPolar( double R, double phi ) const {
    /* ellipseratio = f */