CosmoSim 3.0.4b1__tar.gz → 3.0.5__tar.gz

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 3.0.4b1
+Version: 3.0.5
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -18,7 +18,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sympy>=1.13
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.0
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: pandas

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/RegressionTest/amplitudes/.gitignore

@@ -1,3 +1,4 @@
 50.*
 *.new
 *.baseline
+*.txt

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/RegressionTest/amplitudes/Makefile

@@ -14,9 +14,9 @@ P=../../python
 	sort $< > $@
 sis%.txt:
 	echo $*
-	python3 $P/amplitudes.py --output $@ --lens SIS $* 
+	python3 -m CosmoSim.Roulettes --output $@ --lens SIS $* 
 sie%.txt:
-	python3 $P/sieamplitudes.py --output $@ --lens SIE $* 
+	python3 -m CosmoSim.Roulettes.sie --output $@ --lens SIE $* 
 %.status: %.new %.baseline
 	diff $^ && echo Regression test passes > $@
 

{cosmosim-3.0.4b1/python → cosmosim-3.0.5/RegressionTest/bin}/compare.py

@@ -2,6 +2,10 @@
 
 """
 Utility script to compare images.
+
+The script quantitatively compares two images.
+This is used by the regression tests, but may have other
+uses for evaluation of experiments.
 """
 
 import cv2 as cv

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/RegressionTest/bin/config.sh

@@ -3,7 +3,7 @@ echo $0
 echo $1
 
 rootdir=`( while test ! -d .git ; do cd .. ; done ; pwd )`
-export PATH=$rootdir/python/:$PATH
+export PATH=$rootdir/RegressionTest/bin/:$PATH
 export PYTHONPATH=$rootdir/src:$PYTHONPATH
 
 echo rootdir: $rootdir

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/pyproject.toml

@@ -7,6 +7,7 @@ requires = [
     "cmake>=3.15",
     "ninja>=1.13",
     "cascadict>=0.8",
+    "pybind11>=2.12",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -31,7 +32,7 @@ classifiers = [
 license = "MIT"
 license-files = ["LICENSE"]
 keywords=[ 'cosmology', 'gravitational lensing', "simulation" ]
-dependencies=["sympy>=1.13", "numpy", "matplotlib", "opencv-python", "pandas", "toml", "cascadict" ]
+dependencies=["sympy>=1.13", "numpy>=2.0", "matplotlib", "opencv-python", "pandas", "toml", "cascadict" ]
 
 [tool.setuptools.dynamic]
 version = {attr = "CosmoSim.__version__"}

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

@@ -103,6 +103,7 @@ paramap = {
         "n_sersic" : ( "source", "n_sersic" ), 
         "luminosity" : ( "source", "luminosity" ), 
 
+        "amplitudes" : ( "lens", "amplitudefile" ),
         "einsteinradius" : ( "lens", "einsteinradius" ),
         "orientation" : ( "lens", "orientation" ),
         "ratio" : ( "lens", "ellipseratio" ), # relabelled

cosmosim-3.0.5/src/CosmoSim/Makefile

@@ -0,0 +1,27 @@
+all: pm50.txt sis50.txt sie05.txt
+
+sis: sis50.txt sis200.txt
+sis100.txt sis50.txt sie05.txt:
+
+P=./Roulettes
+
+%.txt: %.raw
+	sort $< > $@
+
+sis%.raw:  $P/__main__.py
+	time python3 -m CosmoSim.Roulettes --output $@ $* 8
+pm%.raw:  $P/__main__.py
+	time python3 -m CosmoSim.Roulettes --lens PM --output $@ $* 8
+
+sie%.raw: $P/sie.py 
+	time -m CosmoSim.Roulettes.sie --output $@ $* 7
+sie%.tex: $P/sie.py 
+	time -m CosmoSim.Roulettes.sie --tex $@ $* 7
+
+%.pdf: %.tex
+	pdflatex $<
+
+clean:
+	rm -f *.log *.raw
+cleanall: clean
+	rm -f *.txt

cosmosim-3.0.5/src/CosmoSim/Roulettes/__init__.md

@@ -0,0 +1,7 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net>
+
+"""
+This submodule is used to generate the formulas for roulette
+amplitudes.  It does not depend on the CosmoSim package or other
+C++ code.
+"""

cosmosim-3.0.4b1/python/amplitudes.py → cosmosim-3.0.5/src/CosmoSim/Roulettes/__main__.py

@@ -17,8 +17,8 @@ import time
 import argparse
 
 import sympy
-from libamplitudes import *
-from sympy import symbols, sqrt, diff, sin, cos, asin, atan2, asinh
+from .libamplitudes import *
+from sympy import symbols, sqrt, diff, sin, cos, asin, atan2, asinh, Rational
 
 def func(n, m, s, alpha, beta, x, y, rdict):
     """
@@ -29,9 +29,10 @@ def func(n, m, s, alpha, beta, x, y, rdict):
     while s > 0 and m < n:
         m += 1
         s -= 1
-        c = (m + 1) / (m + 1 - s) 
         if s == 0:
-            c = 1/2
+            c = Rational(1,2)
+        else:
+            c = Rational(m + 1, m + 1 - s) 
         # start calculate
         alpha_ = sympy.factor(c * (diff(alpha, x) + diff(beta, y)))
         beta_ = sympy.factor(c * (diff(beta, x) - diff(alpha, y)))
@@ -79,7 +80,7 @@ def main(lens="SIS",n=50,nproc=None,fn=None):
                 beta = - beta
             else:
                 # This is the base case (m+1,s+1) of the inner recursion
-                c = (m + 1.0) / (m + s + 1.0) 
+                c = Rational(m + 1, m + 1 + s) 
                 # Should there not be an extra factor 2 for s==1 above?
                 # - maybe it does not matter because s=m+1 and m>1.
                 alpha_ = sympy.factor(c * (diff(alpha, x) - diff(beta, y)))

cosmosim-3.0.4b1/python/sieamplitudes.py → cosmosim-3.0.5/src/CosmoSim/Roulettes/sie.py

@@ -16,7 +16,7 @@ import argparse
 import queue
 
 import sympy
-from libamplitudes import *
+from .libamplitudes import *
 from sympy import symbols, diff, sin, cos, asin, atan2, asinh, binomial
 
 def firstworker(q,resDict,maxm=6):
@@ -39,10 +39,13 @@ 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 ):
+def secondworker(q,psidiff,diff1,vars,circular=False ):
     print ( os.getpid(),"working" )
     cont = True
-    theta = symbols("p",real=True)
+    if circular:
+        theta = 0
+    else:
+        theta = symbols("p",real=True)
     x,y = vars
     x1,y1 = symbols("x1 y1",real=True)
     while cont:
@@ -66,11 +69,8 @@ def secondworker(q,psidiff,diff1,vars ):
       except queue.Empty:
         print ( "II.", os.getpid(), "completes" )
         cont = False
-
     print ( "II.", os.getpid(),"returning" )
 
-
-
 def thirdworker(q,ampdict,indict, var=[] ):
     print ( os.getpid(),"working" )
     cont = True
@@ -100,12 +100,13 @@ def thirdworker(q,ampdict,indict, var=[] ):
     print ( "III.", os.getpid(),"returning" )
 
 class RouletteManager():
-    def __init__(self,psivec=None,thirdworker=thirdworker):
+    def __init__(self,psivec=None,secondworker=secondworker,thirdworker=thirdworker):
        self.mgr = mp.Manager()      
        if psivec == None:
            self.psivec = psiSIE()
        else:
            self.psivec = psivec
+       self.secondworker = secondworker
        self.thirdworker = thirdworker
 
     def getDict(self,n=50,nproc=None):
@@ -179,6 +180,7 @@ 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.')
@@ -191,6 +193,8 @@ def main(f=thirdworker):
                     help='Simply differentiate psi')
     parser.add_argument('--lens', default="SIE",
                     help='Lens model')
+    parser.add_argument('--circular', default=False,action="store_true",
+                    help='Circular (symmetric) lens')
     parser.add_argument('--tex', 
                     help='TeX output file')
     args = parser.parse_args()
@@ -204,7 +208,10 @@ def main(f=thirdworker):
 
     psivec = zeroth( args.lens )
     
-    mgr = RouletteManager( psivec=psivec,thirdworker=f )
+    if args.circular:
+        mgr = RouletteManager( psivec=psivec,secondworker=cworker,thirdworker=f )
+    else:
+        mgr = RouletteManager( psivec=psivec,thirdworker=f )
     alphabeta = mgr.getAmplitudes(n,nproc )
 
     if args.output:

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

@@ -19,7 +19,7 @@ Parameters = Arguments.Parameters
 
 import traceback
 
-__version__ = "3.0.4b1"
+__version__ = "3.0.5"
 
 class SphericalSource(cs.SphericalSource):
     """Spherical source model.

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/src/CosmoSim/datagen.py

@@ -34,7 +34,8 @@ class SimImage(GenericSim):
         if self.verbose: print( f"[SimImage] init (verbose={self.verbose}) ..." )
 
         if sim is None:
-            self.sim = CosmoSim(verbose=self.verbose)
+            self.sim = CosmoSim( fn=param.get( ( "lens","amplitudefile" ) )
+                               , verbose=self.verbose )
         else:
             self.sim = sim
         msk = self.param.get( "mask", None )
@@ -226,7 +227,7 @@ def datagen(args,param=None):
     outcols = list(frame.columns)
     print( "columns:", outcols )
     dfs = []
-    sim = CosmoSim(verbose=args.verbose)
+    sim = CosmoSim(fn=args.amplitudes,verbose=args.verbose)
     for index,row in frame.iterrows():
         if args.verbose:
             print( "[datagen] Processing", index )

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/src/CosmoSim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 3.0.4b1
+Version: 3.0.5
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -18,7 +18,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sympy>=1.13
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.0
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: pandas

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/src/CosmoSim.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ RegressionTest/amplitudes/sie-short.slurm
 RegressionTest/amplitudes/sie-time.slurm
 RegressionTest/amplitudes/sim.slurm
 RegressionTest/amplitudes/time.slurm
+RegressionTest/bin/compare.py
 RegressionTest/bin/compareimages.sh
 RegressionTest/bin/config.sh
 RegressionTest/bin/makeimages.sh
@@ -1117,12 +1118,6 @@ include/cosmosim/PixMapLens.h
 include/cosmosim/Roulette.h
 include/cosmosim/Simulator.h
 include/cosmosim/Source.h
-python/.gitignore
-python/README.md
-python/amplitudes.py
-python/compare.py
-python/libamplitudes.py
-python/sieamplitudes.py
 src/CMakeLists.txt
 src/CosmoSim/.gitignore
 src/CosmoSim/CosmoSim.cpp
@@ -1143,7 +1138,6 @@ src/CosmoSim/pm50.txt
 src/CosmoSim/roulettegen.py
 src/CosmoSim/roulettestatistics.py
 src/CosmoSim/sie05.txt
-src/CosmoSim/sis100.txt
 src/CosmoSim/sis50.txt
 src/CosmoSim.egg-info/PKG-INFO
 src/CosmoSim.egg-info/SOURCES.txt
@@ -1157,6 +1151,11 @@ src/CosmoSim/CLI/__pycache__/Simulator.cpython-313.pyc
 src/CosmoSim/GUI/Controller.py
 src/CosmoSim/GUI/View.py
 src/CosmoSim/GUI/__main__.py
+src/CosmoSim/Roulettes/.gitignore
+src/CosmoSim/Roulettes/__init__.md
+src/CosmoSim/Roulettes/__main__.py
+src/CosmoSim/Roulettes/libamplitudes.py
+src/CosmoSim/Roulettes/sie.py
 src/CosmoSim/__pycache__/Dictionary.cpython-313.pyc
 src/CosmoSim/__pycache__/Image.cpython-313.pyc
 src/CosmoSim/__pycache__/RouletteAmplitudes.cpython-313.pyc

{cosmosim-3.0.4b1 → cosmosim-3.0.5}/src/CosmoSim.egg-info/requires.txt

@@ -1,5 +1,5 @@
 sympy>=1.13
-numpy
+numpy>=2.0
 matplotlib
 opencv-python
 pandas

cosmosim-3.0.4b1/python/README.md

@@ -1,12 +0,0 @@
-# Python scripts
-
-These scripts do not depend on the CosmoSim package or other
-C++ code.
-
-Most of the scripts, including amplitudes.py are used to compute
-the roulette amplitudes and produce the *.txt files included
-in the package distribution (under src/CosmoSim).
-
-The compare.py scripts quantitatively compares two images.
-This is used by the regression tests, but may have other
-uses for evaluation of experiments.

cosmosim-3.0.4b1/src/CosmoSim/Makefile

@@ -1,27 +0,0 @@
-all: sis100.txt sis50.txt sie05.txt
-
-sis: sis100.txt sis50.txt sis200.txt
-sis100.txt sis50.txt sie05.txt:
-
-P=../../python/
-
-%.txt: %.raw
-	sort $< > $@
-
-sis%.raw:  $P/amplitudes.py
-	time python3 $< --output $@ $* 8
-pm%.raw:  $P/amplitudes.py
-	time python3 $< --lens PM --output $@ $* 8
-
-sie%.raw: $P/sieamplitudes.py 
-	time python3 $< --output $@ $* 7
-sie%.tex: $P/sieamplitudes.py 
-	time python3 $< --tex $@ $* 7
-
-%.pdf: %.tex
-	pdflatex $<
-
-clean:
-	rm -f *.log *.raw
-cleanall: clean
-	rm -f *.txt