CosmoSim 2.8.0__tar.gz → 2.8.1__tar.gz

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

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

@@ -0,0 +1,51 @@
+# (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`) 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
+    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,hcfg=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 "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 = hcfg["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.8.1}/src/CosmoSim/Simulator.py

@@ -31,7 +31,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 +41,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 +70,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 +80,18 @@ class GenericSim:
                 name = row["filename"].split(".")[0]
             self.row = row
             self.name = name
-        elif self.verbose: print( "[initSim] row is None" )
+        elif self.verbose > 1: 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 )
+        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 +99,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 +118,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 +131,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.8.1}/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,28 @@ import threading as th
 import os, sys
 
 import traceback
+from .Helper.Parameters import Parameters 
 
-__version__ = "2.8.0"
+__version__ = "2.8.1"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec
 PsiSpec = cs.PsiSpec
 LightProfileSpec = cs.LightProfileSpec
+Point = cs.Point 
 
 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,12 +52,12 @@ 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]]
@@ -71,24 +75,27 @@ 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)
        elif mode == sourceDict.get( "Ellipsoid" ):
@@ -103,8 +110,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 +220,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 +345,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 ) ) 

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

@@ -19,7 +19,7 @@ from .Image import centreImage, drawAxes, crop, annotatePoint, annotateCircle, t
 from . import getMSheaders,CosmoSim,__version__
 
 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" ]
@@ -69,9 +69,15 @@ class SimImage(GenericSim):
     def __init__(self,sim=None,row=None,**kw):
         super().__init__(**kw)
 
-        if sim is None: sim = CosmoSim()
+        if sim is None:
+            sim = CosmoSim()
+            msk = self.param.get( "mask" )
+            if msk is not None:
+                sim.setMaskMode( msk )
         self.sim = sim
         self.initSim(row)
+        if self.verbose>2:
+            print( "[SimImage] Verbosity", self.verbose )
 
     def setParameters(self,row):
         """
@@ -81,7 +87,7 @@ class SimImage(GenericSim):
         return setParameters(self.sim,row)
     def getData(self):
         sim = self.sim
-        if self.param( "centred" ):
+        if self.param.get( "centred" ):
             centrepoint = self.centrepoint
         else:
             centrepoint = (0,0)
@@ -94,8 +100,12 @@ class SimImage(GenericSim):
         offset = sim.getOffset(centrepoint=centrepoint)
         xioffset = sim.getXiOffset(centrepoint)
         if xireference:
+            if self.verbose>1:
+                print( "[xireference=True] nterms =", maxm )
             ab = sim.getAlphaBetas(maxm)
         else:
+            if self.verbose>1:
+                print( "[xireference=False] nterms =", maxm )
             ab = sim.getAlphaBetas(maxm,pt=centrepoint)
         relcols = [ "centreX", "centreY",
                    "reletaX", "reletaY",

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

@@ -12,7 +12,7 @@ import numpy as np
 import pandas as pd
 
 from .Image import drawAxes
-from .Parameters import Parameters
+from . import Parameters
 from .datagen import crop
 
 from .Arguments import CosmoParser
@@ -33,13 +33,12 @@ class Resim(GenericSim):
         """
         Note that `args` overrides Boolean parameters.
         """
-        print( "[Resim]", kw.get( "param" )  )
         super().__init__(**kw)
-        if self.verbose: print( "[Resim.__init__]" )
+        if self.verbose>2: print( "[Resim.__init__]" )
         if sim is None: sim = RouletteRegenerator()
         self.xireference = self.param.get( "xireference" )
         self.nterms = self.param.get( "nterms" )
-        if self.verbose: print( "[Resim] nterms =", self.nterms )
+        if self.verbose>1: print( "[Resim] nterms =", self.nterms )
 
         self.sim = sim
         self.loadData( row )
@@ -56,7 +55,7 @@ class Resim(GenericSim):
                   print( "Image shape", (m,n) )
                   raise e
     def runSim( self ):
-        if self.verbose: print( "[Resim.runSim]" )
+        if self.verbose>2: print( "[Resim.runSim]" )
         self.sim.makeSource( self.param )
         self.sim.update()
     def getDistortedImage(self):
@@ -66,33 +65,36 @@ class Resim(GenericSim):
         Reset the parameters in the backend simulator, using the
         give data row.
         """
-        if self.verbose: print( "[setParameters]" )
+        if self.verbose>2: print( "[setParameters]" )
         maxm = self.coefs.getNterms()
         rsim = self.sim
         
         if self.xireference:
-            print( "xi", row["xiX"], row["xiY"], row["sigma"] )
+            if self.verbose:
+                print( "xi", row["xiX"], row["xiY"], row["sigma"] )
             pt = (0,0)
         else:
-            print( "Offset", row["offsetX"], row["offsetY"], row["sigma"] )
+            if self.verbose:
+                print( "Offset", row["offsetX"], row["offsetY"], row["sigma"] )
             pt = ( row["offsetX"], row["offsetY"] )
         rsim.setCentrePy( *pt )
         print( "Initialised simulator at point", pt )
 
         for m in range(maxm+1):
             for s in range((m+1)%2, m+2, 2):
-                print( "row is",  type( row ) )
+                if self.verbose>1: print( "row is",  type( row ) )
                 alpha = row.get( f"alpha[{m}][{s}]", 0.0 )
                 beta = row.get( f"beta[{m}][{s}]", 0.0 )
-                print( "alpha/beta are",  type( alpha ), type( beta ) )
-                print( f"alpha[{m}][{s}] = {alpha}\t\tbeta[{m}][{s}] = {beta}." )
+                if self.verbose>1:
+                    print( "alpha/beta are",  type( alpha ), type( beta ) )
+                    print( f"alpha[{m}][{s}] = {alpha}\t\tbeta[{m}][{s}] = {beta}." )
                 rsim.setAlphaXi( m, s, alpha )
                 rsim.setBetaXi( m, s, beta )
         self.param.setRow( row )
-        if self.verbose:
+        if self.verbose>1:
             print( "Source spec:", self.param.get( "source" ) )
     def loadData( self, csvfile ):
-        if self.verbose: print( "[loadData]" )
+        if self.verbose>2: print( "[loadData]" )
         if isinstance(csvfile,pd.DataFrame):
             print( "Received dataframe for resimulation" )
             frame = csvfile
@@ -105,16 +107,18 @@ class Resim(GenericSim):
             print( "Load CSV file:", csvfile )
             frame = pd.read_csv(csvfile,index_col="filename")
             cols = frame.columns
-        print( "columns:", cols )
+        if self.verbose>1: print( "columns:", cols )
     
         coefs = RouletteAmplitudes(cols)
-        print( "Number of roulette terms: ", coefs.getNterms() )
+        if self.verbose:
+            print( "Number of roulette terms: ", coefs.getNterms() )
         if self.nterms:
-            print( "[Resim.loadData()] Set nterms from self", int(self.nterms) )
+            if self.verbose:
+                print( "[Resim.loadData()] Set nterms from self", int(self.nterms) )
             self.sim.setNterms( int(self.nterms) )
         else:
             nterms = coefs.getNterms() 
-            print( "[Resim.loadData()] Set nterms from coefs", nterms )
+            if self.verbose: print( "[Resim.loadData()] Set nterms from coefs", nterms )
             self.sim.setNterms( nterms )
         self.coefs = coefs
         self.cols = cols

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

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

@@ -594,7 +594,6 @@ src/CosmoSim/CosmoSimPy.cpython-313-x86_64-linux-gnu.so
 src/CosmoSim/GUI.py
 src/CosmoSim/Image.py
 src/CosmoSim/Makefile
-src/CosmoSim/Parameters.py
 src/CosmoSim/RouletteAmplitudes.py
 src/CosmoSim/Simulator.py
 src/CosmoSim/View.py
@@ -613,9 +612,10 @@ src/CosmoSim.egg-info/SOURCES.txt
 src/CosmoSim.egg-info/dependency_links.txt
 src/CosmoSim.egg-info/requires.txt
 src/CosmoSim.egg-info/top_level.txt
+src/CosmoSim/Helper/Parameters.py
+src/CosmoSim/Helper/__pycache__/Parameters.cpython-313.pyc
 src/CosmoSim/__pycache__/Arguments.cpython-313.pyc
 src/CosmoSim/__pycache__/Image.cpython-313.pyc
-src/CosmoSim/__pycache__/Parameters.cpython-313.pyc
 src/CosmoSim/__pycache__/Simulator.cpython-313.pyc
 src/CosmoSim/__pycache__/__init__.cpython-313.pyc
 src/CosmoSim/__pycache__/datagen.cpython-313.pyc

{cosmosim-2.8.0 → cosmosim-2.8.1}/src/simlib/RouletteModel.cpp

@@ -1,5 +1,7 @@
 /* (C) 2023: Hans Georg Schaathun <georg@schaathun.net> */
 
+#define DEBUG 1
+
 #include "cosmosim/Roulette.h"
 #include "simaux.h"
 
@@ -9,7 +11,7 @@
 RouletteModel::RouletteModel() :
    SimulatorModel::SimulatorModel()
 { 
-    std::cout << "Instantiating RouletteModel ... \n" ;
+    if (DEBUG) std::cout << "Instantiating RouletteModel ... \n" ;
 }
 
 void RouletteModel::setLens( Lens *l ) {