CosmoSim 3.0.5__tar.gz → 3.1.0__tar.gz

{cosmosim-3.0.5 → cosmosim-3.1.0}/PKG-INFO

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

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/amplitudes/Makefile

@@ -1,6 +1,6 @@
 # (C) 2023: Hans Georg Schaathun <georg@schaathun.net> 
 
-all: sie05.status sis50.status
+all: sie05.status sis50.status pm50.status
 
 sie05.new sis50.new:
 sie05.baseline:
@@ -12,13 +12,16 @@ P=../../python
 	sort $< > $@
 %.new: %.txt
 	sort $< > $@
+pm%.txt:
+	echo $*
+	python3 -m CosmoSim.Roulettes --output $@ --lens PM $* 
 sis%.txt:
 	echo $*
 	python3 -m CosmoSim.Roulettes --output $@ --lens SIS $* 
 sie%.txt:
 	python3 -m CosmoSim.Roulettes.sie --output $@ --lens SIE $* 
 %.status: %.new %.baseline
-	diff $^ && echo Regression test passes > $@
+	( diff $^ && echo Regression test succeeds || echo Amplitudes discrepancy ) > $@
 
 clean:
 	rm -f 50.* *.txt *.new

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/dataset.csv

@@ -1,4 +1,4 @@
-index,filename,source,lens,x,y,einsteinR,ellipseratio,orientation,sigma,sigma2,theta
+index,filename,source,lens,x,y,einsteinradius,ellipseratio,orientation,sigma,sigma2,theta
 sie01,sie01.png,e,SIE,50,0,96,0.5,0,20,30,0
 sie02,sie02.png,e,SIE,50,0,96,0.5,30,20,30,0
 sie03,sie03.png,e,SIE,50,0,96,0.5,60,20,30,0

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/debug2026june/debug.csv

@@ -1,3 +1,3 @@
-index,filename,source,config,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,x,y,einsteinradius,sigma,sigma2,theta,nterms
 r01,r01.png,s,ss,24,-68,96.0,21,0,0,16
 r04,r04.png,s,ss,30,-30,40,10,10,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/exactpm/debug.csv

@@ -1,4 +1,4 @@
-index,filename,source,config,chi,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,chi,x,y,einsteinradius,sigma,sigma2,theta,nterms
 pm01,exactpm-s01.png,s,p,50,24,-68,96.0,21,0,0,16
 pm02,exactpm-s02.png,s,p,50,35,-29,6.0,43,0,0,16
 0003,exactpm-s03.png,s,p,50,57,-47,100.0,47,0,0,16

cosmosim-3.1.0/RegressionTest/new-roulette/baseline.config

@@ -0,0 +1 @@
+baseline20260630

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/old-sampled/sampled.csv

@@ -1,4 +1,4 @@
-index,filename,source,config,chi,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,chi,x,y,einsteinradius,sigma,sigma2,theta,nterms
 sss01,sampled-roulette-sis-s01.png,s,ss,50,24,-68,96.0,21,0,0,16
 sss04,sampled-roulette-sis-s04.png,s,ss,50,-60,-50,50.0,5,0,0,16
 sss05,sampled-roulette-sis-s05.png,s,ss,50,-20,-3,96.0,27,0,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/raytrace/debug.csv

@@ -1,4 +1,4 @@
-index,filename,source,model,lens,sampled,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,model,lens,sampled,x,y,einsteinradius,sigma,sigma2,theta,nterms
 ss021,sampled-raytrace-sis-s021.png,s,Raytrace,SIS,true,24,-68,96.0,21,0,0,16
 ss022,sampled-raytrace-sis-s022.png,s,Raytrace,SIS,true,35,-29,6.0,43,0,0,16
 ss023,sampled-raytrace-sis-s023.png,s,Raytrace,SIS,true,57,-47,100.0,47,0,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/rotatedsis/debug.csv

@@ -1,4 +1,4 @@
-index,filename,source,config,chi,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,chi,x,y,einsteinradius,sigma,sigma2,theta,nterms
 "s001",rotatedsis-s001.png,s,s,50, 24,-68,48,21,0,0,16
 "s003",rotatedsis-s003.png,s,s,50, 57,-47,50,47,0,0,16
 "s004",rotatedsis-s004.png,s,s,50,-60,-50,25, 5,0,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/roulette/debug.csv

@@ -1,4 +1,4 @@
-index,filename,source,config,chi,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,chi,x,y,einsteinradius,sigma,sigma2,theta,nterms
 ss01,roulette-sis-s01.png,s,fs,50,24,-68,96.0,21,0,0,16
 ss03,roulette-sis-s03.png,s,fs,50,57,-47,100.0,47,0,0,16
 ss04,roulette-sis-s04.png,s,fs,50,-60,-50,50.0,5,0,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/RegressionTest/roulettepm/debug.csv

@@ -1,4 +1,4 @@
-index,filename,source,config,chi,x,y,einsteinR,sigma,sigma2,theta,nterms
+index,filename,source,config,chi,x,y,einsteinradius,sigma,sigma2,theta,nterms
 r001,roulettepm-s001.png,s,r,50,24,-68,96.0,21,0,0,16
 r002,roulettepm-s002.png,s,r,50,35,-29,6.0,43,0,0,16
 r003,roulettepm-s003.png,s,r,50,57,-47,100.0,47,0,0,16

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/CLI/Arguments.py

@@ -108,7 +108,6 @@ paramap = {
         "orientation" : ( "lens", "orientation" ),
         "ratio" : ( "lens", "ellipseratio" ), # relabelled
         "ellipseratio" : ( "lens", "ellipseratio" ), # duplicate
-        "einsteinR" : ( "lens", "einsteinR" ), 
         "cluster" : ( "lens", "cluster" ), 
 
         "sigma" :  ( "source", "sigma" ),
@@ -303,8 +302,8 @@ def setParameters(sim,row,verbose=1):
     if row.get("sampled",None) != None:
         if verbose>1: print( row )
         sim.setSampled( row.get( "sampled" ) )
-    if row.get("einsteinR",None) != None:
-        sim.setEinsteinR( row.get( "einsteinR" ) )
+    if row.get("einsteinradius",None) != None:
+        sim.setEinsteinR( row.get( "einsteinradius" ) )
     if row.get("ellipseratio",None) != None:
         sim.setRatio( row.get( "ellipseratio" ) )
     if row.get("orientation",None) != None:

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/CosmoSim.cpp

@@ -63,14 +63,14 @@ double CosmoSim::getAlphaXi( int m, int s ) {
 
    // cv::Point2d xi = lens->getXi( sim->getEta() ) ;
    cv::Point2d xi = sim->getXi() ;
-   if (DEBUG) std::cout << "[getAlphaXi] xi = " << xi << std::endl ;
+   if (DEBUG>1) std::cout << "[getAlphaXi] xi = " << xi << std::endl ;
    return getAlpha( xi.x, xi.y, m, s ) ;
 
 }
 double CosmoSim::getBetaXi( int m, int s ) {
    // cv::Point2d xi = lens->getXi( sim->getEta() ) ;
    cv::Point2d xi = sim->getXi( ) ;
-   if (DEBUG) std::cout << "[getBetaXi] xi = " << xi << std::endl ;
+   if (DEBUG>1) std::cout << "[getBetaXi] xi = " << xi << std::endl ;
    return getBeta( xi.x, xi.y, m, s ) ;
 }
 double CosmoSim::getAlpha(

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/Makefile

@@ -8,8 +8,13 @@ P=./Roulettes
 %.txt: %.raw
 	sort $< > $@
 
+sis%sie.raw:  $P/__main__.py
+	time python3 -m CosmoSim.Roulettes.sie --circular --lens SIS --output $@ $* 8
+pm%sie.raw:  $P/__main__.py
+	time python3 -m CosmoSim.Roulettes.sie --circular --lens PM --output $@ $* 8
+
 sis%.raw:  $P/__main__.py
-	time python3 -m CosmoSim.Roulettes --output $@ $* 8
+	time python3 -m CosmoSim.Roulettes --lens SIS --output $@ $* 8
 pm%.raw:  $P/__main__.py
 	time python3 -m CosmoSim.Roulettes --lens PM --output $@ $* 8
 

cosmosim-3.1.0/src/CosmoSim/Roulettes/Parser.py

@@ -0,0 +1,75 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
+
+"""
+Evaluate roulette amplitudes using `sympy` in python.
+
+This module has been created for debugging, to validate calculations made in
+C++.  It seems to be easier to compute with arbitrary precision in python/sympy
+than in C++/symengine.
+"""
+
+import sympy
+from sympy.parsing.sympy_parser import parse_expr
+
+import numpy as np
+import pandas as pd
+from .. import getMS
+
+def eval1(expr,x,y,g,precision=64):
+    """
+    Evaluate the expression `expr` substituting for `x`, `y`, and `g` in 
+    high precision.
+
+    This is a sketch.
+    """
+    x0,y0,g0 = sympy.symbols("x,y,g")
+    return expr.evalf( precision, subs={ x0: x, y0: y, g0: g } )
+
+
+class RouletteParser:
+    """ Parse, manage, and evaluate algebraic expressions for roulette amplitudes.
+    """
+    def __init__(self,fn,g=None,verbose=1):
+        self.verbose = verbose
+        with open(fn, 'r') as f:
+            if verbose: print( "Opened file", fn ) 
+            c = f.read()
+        cs = [ x.split(":") for x in c.split( "\n" ) if x != "" ]
+        print( cs[:2] )
+        self.alpha = {}
+        self.beta = {}
+        self.einstein = g
+        for x in cs:
+            try:
+                m,s,a,b = x
+                m = int( m )
+                s = int( s )
+                a = parse_expr( a )
+                b = parse_expr( b )
+            except:
+                print( x )
+                raise RuntimeException( "Parse error in amplitudes file." )
+            self.alpha[(m,s)] = a
+            self.beta[(m,s)] = b
+    def getAlpha(self,x,y,g,m,s):
+         """get `alpha[m][s]` for Einstein radius `g` at the point (`x`,`y`). """
+         return eval1(self.alpha[(m,s)],x,y,g)
+    def getBeta(self,x,y,g,m,s):
+         """get `beta[m][s]` for Einstein radius `g` at the point (`x`,`y`). """
+         return eval1(self.beta[(m,s)],x,y,g)
+    def getAlphaBetas(self,pt,g=None,maxm=5):
+        """
+        Get the roulette amplitudes for a given point in the source plane.
+        """
+        if self.verbose>1:
+            print ( "[getAlphaBetas] pt=", pt, "in Planar Co-ordinates"  )
+        try:
+            (x,y) = (pt[0],pt[1])
+        except:
+            (x,y) = np.array(pt)
+        # Scaling is done in getAlpha/getBeta
+        if g is None:
+            g = self.einstein
+        ab1 = { f"alpha[{m}][{s}]" : self.getAlpha(x,y,g,m,s) for (m,s) in getMS(maxm) }
+        ab2 = { f"beta[{m}][{s}]" : self.getBeta(x,y,g,m,s) for (m,s) in getMS(maxm) }
+        return pd.concat( [ pd.Series( ab1 ), pd.Series( ab2 ) ] )

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/Roulettes/libamplitudes.py

@@ -55,7 +55,7 @@ def psiPM():
     # g is the Einstein radius and (x,y) coordinates in the lens plane
     x, y = symbols('x, y', real=True)
     g = symbols("g", positive=True, real=True)
-    psi = g ** 2 * log(x ** 2 + y ** 2)
+    psi = g ** 2 * log( sqrt ( x ** 2 + y ** 2 ) )
     alpha = sympy.factor(diff(psi, x))
     beta = sympy.factor(diff(psi, y))
     return (psi,alpha,beta,x,y)

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/Roulettes/sie.py

@@ -39,13 +39,10 @@ def firstworker(q,resDict,maxm=6):
         # `q.task_done()` is called.  Hence the queue will not be
         # empty if the current job should spawn new ones. 
     print ( "I.", os.getpid(),"returning" )
-def secondworker(q,psidiff,diff1,vars,circular=False ):
-    print ( os.getpid(),"working" )
+def secondworker(q,psidiff,diff1,vars):
+    print ( "secondworker", os.getpid(),"working" )
     cont = True
-    if circular:
-        theta = 0
-    else:
-        theta = symbols("p",real=True)
+    theta = symbols("p",real=True)
     x,y = vars
     x1,y1 = symbols("x1 y1",real=True)
     while cont:
@@ -70,6 +67,29 @@ def secondworker(q,psidiff,diff1,vars,circular=False ):
         print ( "II.", os.getpid(), "completes" )
         cont = False
     print ( "II.", os.getpid(),"returning" )
+def cworker(q,psidiff,diff1,vars):
+    print ( "cworker", os.getpid(),"working" )
+    cont = True
+    x,y = vars
+    while cont:
+      try:
+        m,n = q.get(False)   # does not block
+        res = sum( [
+                  binomial( m, i )*
+                  binomial( n, j )*
+                  1**(m-i+j)*
+                  0**(n-j+i)*
+                  (-1)**i
+                  * diff1[(m+n-i-j,j+i)]
+                  for i in range(m+1) for j in range(n+1) ] ) 
+        res = sympy.expand( res )    # This is too slow
+        # res = sympy.simplify( res )  # This is too slow
+        print( "II. (circular)", os.getpid(), m, n )
+        psidiff[(m,n)] = res
+      except queue.Empty:
+        print ( "II. (circular)", os.getpid(), "completes" )
+        cont = False
+    print ( "II. (circular)", os.getpid(),"returning" )
 
 def thirdworker(q,ampdict,indict, var=[] ):
     print ( os.getpid(),"working" )
@@ -92,12 +112,14 @@ def thirdworker(q,ampdict,indict, var=[] ):
         if s == 0:
                a /= 2
         print( "III (Chris).", os.getpid(), m, s )
+        sys.stdout.flush()
         ampdict[(m,s)] = (a,b)
       except queue.Empty:
         print ( "III.", os.getpid(), "completes" )
         cont = False
 
     print ( "III.", os.getpid(),"returning" )
+    sys.stdout.flush()
 
 class RouletteManager():
     def __init__(self,psivec=None,secondworker=secondworker,thirdworker=thirdworker):
@@ -140,9 +162,9 @@ class RouletteManager():
 
         for k in self.diff1.keys():
            q.put( k )
-        pool = mp.Pool(nproc, secondworker,(q,psidiff,self.diff1,self.vars))
+        # All jobs are submitted before the Pool starts
+        pool = mp.Pool(nproc, self.secondworker,(q,psidiff,self.diff1,self.vars))
 
-        q.close()
         pool.close()
         pool.join()
 
@@ -170,7 +192,6 @@ class RouletteManager():
                q.put((m,s))
         pool = mp.Pool(nproc, self.thirdworker,(q,rdict,self.psidiff,self.vars))
 
-        q.close()
         pool.close()
         pool.join()
 
@@ -180,7 +201,6 @@ class RouletteManager():
         print( "Time spent:", time.time() - start)
         return rdict
 
-def cworker(*a,**kw): return secondworker( *a, circular=True, **kw )
 
 def main(f=thirdworker):
     parser = argparse.ArgumentParser(description='Generate roulette amplitude formulæ for CosmoSim.')

{cosmosim-3.0.5 → cosmosim-3.1.0}/src/CosmoSim/__init__.py

@@ -10,6 +10,7 @@ to make the python API more streamlined.
 
 import CosmoSim.CosmoSimPy as cs
 import numpy as np
+import pandas as pd
 import threading as th
 import os, sys
 from .CLI import Arguments
@@ -19,7 +20,7 @@ Parameters = Arguments.Parameters
 
 import traceback
 
-__version__ = "3.0.5"
+__version__ = "3.1.0"
 
 class SphericalSource(cs.SphericalSource):
     """Spherical source model.
@@ -154,11 +155,6 @@ def getMS(minm,maxm=None):
         minm = 0
     return [ (m,s) for m in range(minm,maxm+1)
                                     for s in range(1-m%2,m+2,2) ]
-def getMSheaders(maxm): 
-    if maxm is None:
-        raise RuntimeError( "None argument to getMSheaders()." )
-    r = [ ( f"alpha[{m}][{s}]", f"beta[{m}][{s}]") for (m,s) in getMS(maxm) ]
-    return [ x for p in r for x in p ]
 
 maxmlist = [ 50, 100, 200 ]
 def getFileName(maxm):
@@ -241,6 +237,7 @@ class CosmoSim(cs.CosmoSim):
         if self.verbose > 2:
             print ( "[getOffset] r=", a )
         return (a[0],a[1])
+
     def getAlphaBetas(self,maxm=2,pt=None):
         """
         Get the roulette amplitudes for a given point in the source plane.
@@ -248,14 +245,18 @@ class CosmoSim(cs.CosmoSim):
         if self.verbose>1:
             print ( "[getAlphaBetas] pt=", pt, "in Planar Co-ordinates"  )
         if pt == None:
-           r = [ (self.getAlphaXi(m,s),self.getBetaXi(m,s)) for (m,s) in getMS(maxm) ]
+           ab1 = { f"alpha[{m}][{s}]" : self.getAlphaXi(m,s) 
+                   for (m,s) in getMS(maxm) }
+           ab2 = { f"beta[{m}][{s}]" : self.getBetaXi(m,s) 
+                   for (m,s) in getMS(maxm) }
         else:
             (x,y) = pt
             # Scaling is done in getAlpha/getBeta
-            r = [ (self.getAlpha(x,y,m,s),self.getBeta(x,y,m,s)) 
-                    for (m,s) in getMS(maxm) ]
-        return [ x for p in r for x in p ]
-
+            ab1 = { f"alpha[{m}][{s}]" : self.getAlpha(x,y,m,s) 
+                    for (m,s) in getMS(maxm) }
+            ab2 = { f"beta[{m}][{s}]" : self.getBeta(x,y,m,s) 
+                    for (m,s) in getMS(maxm) }
+        return pd.concat( [ pd.Series( ab1 ), pd.Series( ab2 ) ] )
     def close(self):
         """
         Terminate the worker thread.
@@ -407,4 +408,3 @@ class CosmoSim(cs.CosmoSim):
             raise e
         if im.shape[2] == 1 : im.shape = im.shape[:2]
         return np.maximum(im,self.bgcolour)
-