CosmoSim 3.0.3__tar.gz → 3.0.4__tar.gz

{cosmosim-3.0.3 → cosmosim-3.0.4}/MANIFEST.in

@@ -4,7 +4,7 @@ exclude __pycache__
 recursive-exclude .github/ *
 recursive-exclude Legacy/ *
 recursive-exclude Notes/ *
-recursive-exclude test/ *
+recursive-exclude Test/ *
 recursive-exclude _skbuild/ *
 recursive-exclude build/ *
 recursive-exclude tmp/ *

{cosmosim-3.0.3 → cosmosim-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 3.0.3
+Version: 3.0.4
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -55,9 +55,8 @@ pip install CosmoSim
 ```
 
 We successfully build CosmoSim for 
-Linux/x86_64 and MacOS/arm, for python 3.11 trough 3.14, and 3.14.t
-Building on Windows (amd64, python 3.11-3.14) sometimes works,
-but currently not.
+Linux/x86_64, MacOS/arm, and Windows/amd64, for python 3.11 through 3.14
+(the free-threaded 3.14t build is available on Linux and macOS).
 
 To build locally from source, you can run (from the root of
 the repo),

{cosmosim-3.0.3 → cosmosim-3.0.4}/README.md

@@ -26,9 +26,8 @@ pip install CosmoSim
 ```
 
 We successfully build CosmoSim for 
-Linux/x86_64 and MacOS/arm, for python 3.11 trough 3.14, and 3.14.t
-Building on Windows (amd64, python 3.11-3.14) sometimes works,
-but currently not.
+Linux/x86_64, MacOS/arm, and Windows/amd64, for python 3.11 through 3.14
+(the free-threaded 3.14t build is available on Linux and macOS).
 
 To build locally from source, you can run (from the root of
 the repo),

{cosmosim-3.0.3 → cosmosim-3.0.4}/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.3/python → cosmosim-3.0.4/RegressionTest/bin}/compare.py

@@ -1,5 +1,13 @@
 #! /usr/bin/env python3
 
+"""
+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
 import sys
 import os

{cosmosim-3.0.3 → cosmosim-3.0.4}/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.4/RegressionTest/raytrace/debug.csv

@@ -0,0 +1,35 @@
+index,filename,source,model,lens,sampled,x,y,einsteinR,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
+ss024,sampled-raytrace-sis-s024.png,s,Raytrace,SIS,true,-60,-50,50.0,5,0,0,16
+ss025,sampled-raytrace-sis-s025.png,s,Raytrace,SIS,true,-20,-3,96.0,27,0,0,16
+ss026,sampled-raytrace-sis-s026.png,s,Raytrace,SIS,true,-30,-25,40.0,20,0,0,16
+sf021,sampled-raytrace-sis-t021.png,t,Raytrace,SIS,true,24,-68,96.0,21,0,0,16
+sf022,sampled-raytrace-sis-t022.png,t,Raytrace,SIS,true,35,-29,6.0,43,0,0,16
+sf023,sampled-raytrace-sis-t023.png,t,Raytrace,SIS,true,57,-47,100.0,47,0,0,16
+sf024,sampled-raytrace-sis-t024.png,t,Raytrace,SIS,true,-60,-50,50.0,5,0,0,16
+sf025,sampled-raytrace-sis-t025.png,t,Raytrace,SIS,true,-20,-3,96.0,27,0,0,16
+sf026,sampled-raytrace-sis-t026.png,t,Raytrace,SIS,true,-30,-25,40.0,20,0,0,16
+s021,raytrace-sis-s021.png,s,Raytrace,SIS,false,24,-68,96.0,21,0,0,16
+s022,raytrace-sis-s022.png,s,Raytrace,SIS,false,35,-29,6.0,43,0,0,16
+s023,raytrace-sis-s023.png,s,Raytrace,SIS,false,57,-47,100.0,47,0,0,16
+s024,raytrace-sis-s024.png,s,Raytrace,SIS,false,-60,-50,50.0,5,0,0,16
+s025,raytrace-sis-s025.png,s,Raytrace,SIS,false,-20,-3,96.0,27,0,0,16
+s026,raytrace-sis-s026.png,s,Raytrace,SIS,false,-30,-25,40.0,20,0,0,16
+f021,raytrace-sis-t021.png,t,Raytrace,SIS,false,24,-68,96.0,21,0,0,16
+f022,raytrace-sis-t022.png,t,Raytrace,SIS,false,35,-29,6.0,43,0,0,16
+f023,raytrace-sis-t023.png,t,Raytrace,SIS,false,57,-47,100.0,47,0,0,16
+f024,raytrace-sis-t024.png,t,Raytrace,SIS,false,-60,-50,50.0,5,0,0,16
+f025,raytrace-sis-t025.png,t,Raytrace,SIS,false,-20,-3,96.0,27,0,0,16
+f026,raytrace-sis-t026.png,t,Raytrace,SIS,false,-30,-25,40.0,20,0,0,16
+e01,raytrace-sis-e06.png,e,Raytrace,SIS,false,24,-68,96.0,21,10,30,16
+e02,raytrace-sis-e07.png,e,Raytrace,SIS,false,35,-29,6.0,43,10,30,16
+e03,raytrace-sis-e08.png,e,Raytrace,SIS,false,57,-47,100.0,47,10,30,16
+e04,raytrace-sis-e09.png,e,Raytrace,SIS,false,-60,-50,50.0,5,10,30,16
+e05,raytrace-sis-e10.png,e,Raytrace,SIS,false,-20,-3,96.0,27,10,30,16
+e06,sampled-raytrace-sis-e06.png,e,Raytrace,SIS,true,24,-68,96.0,21,10,30,16
+e07,sampled-raytrace-sis-e07.png,e,Raytrace,SIS,true,35,-29,6.0,43,10,30,16
+e08,sampled-raytrace-sis-e08.png,e,Raytrace,SIS,true,57,-47,100.0,47,10,30,16
+e09,sampled-raytrace-sis-e09.png,e,Raytrace,SIS,true,-60,-50,50.0,5,10,30,16
+e10,sampled-raytrace-sis-e10.png,e,Raytrace,SIS,true,-20,-3,96.0,27,10,30,16

{cosmosim-3.0.3 → cosmosim-3.0.4}/Setup/README.md

@@ -7,10 +7,6 @@ scenarioes which have been tried and tested.
   as the dynamic library file for python
 + `idunbuild.sh` - build for the NTNU HPC cluster (idun)
     + This is analogous to `build.sh`
-+ `pypi.sh` - build the python wheel for the local platform
-    + The resulting wheel is not 
-+ `cibuildwheel.sh` - local build with `cibuildwheel`
-    + This is intended for testing prior to CI deployment
 
 
 ## Auxiliary scripts

cosmosim-3.0.4/Setup/conan_win_profile.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+"""Patch the skbuild-conan conan profile for Windows wheel builds.
+
+CosmoSim's C++ only uses ``cv::imread`` (OpenCV imgcodecs, i.e. PNG/JPEG), so
+OpenCV's video I/O is dead weight.  OpenCV's conan recipe defaults
+``with_ffmpeg=True``, which compiles ffmpeg + libaom-av1 from source on MSVC --
+the slow, intermittently failing step behind the historically "erratic" Windows
+wheel builds.  Disabling it removes that whole subtree; ``cv::imread`` keeps
+working via the default ``with_png``/``with_jpeg`` backends.
+
+skbuild-conan (v1.5.0) exposes no way to pass conan *options* through
+``setup()`` (only requirements/settings), so we inject an ``[options]`` section
+into the profile it uses.  skbuild-conan resolves the wheel build with the
+``skbuild_conan_py`` profile and, if that profile already exists, reuses it
+verbatim -- so the options we append here apply to the real dependency
+resolution.  This script is invoked from ``[tool.cibuildwheel.windows]``
+``before-all`` in ``pyproject.toml`` after ``conan profile detect``.
+
+Using ``conan profile path`` (rather than a hard-coded ``~/.conan2`` path) keeps
+this correct even if ``CONAN_HOME`` is overridden on the runner.
+"""
+
+import subprocess
+import sys
+
+PROFILE = "skbuild_conan_py"
+
+# Only the load-bearing option: drop the ffmpeg/libaom-av1 source build.
+OPTIONS = [
+    "opencv/*:with_ffmpeg=False",
+]
+
+
+def main() -> int:
+    path = subprocess.run(
+        ["conan", "profile", "path", PROFILE],
+        check=True,
+        capture_output=True,
+        text=True,
+    ).stdout.strip()
+
+    block = "\n[options]\n" + "\n".join(OPTIONS) + "\n"
+    with open(path, "a", encoding="utf-8") as fh:
+        fh.write(block)
+
+    print(f"Patched conan profile '{PROFILE}' at {path} with:{block}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{cosmosim-3.0.3 → cosmosim-3.0.4}/pyproject.toml

@@ -41,17 +41,22 @@ Homepage = "https://github.com/CosmoAI-AES/CosmoSim"
 Issues = "https://github.com/CosmoAI-AES/CosmoSim/issues"
 
 [tool.cibuildwheel]
-build = [ "*-manylinux_x86_64", "*-manylinux_i686", "*-macosx_*", "*-win_*64" ]
-skip = [ "cp314t-win_*64" ]
+# "*-win_amd64" (not "*-win_*64"): the latter also matches "*-win_arm64",
+# which we do not cross-compile here.
+build = [ "*-manylinux_x86_64", "*-manylinux_i686", "*-macosx_*", "*-win_amd64" ]
+skip = [ "cp314t-win_amd64" ]
 
 [tool.cibuildwheel.windows]
+# CosmoSim's C++ only uses cv::imread (imgcodecs), so OpenCV video I/O is not
+# needed.  Disable opencv's with_ffmpeg so the wheel build does NOT compile the
+# flaky ffmpeg + libaom-av1 source tree on MSVC (the cause of the historically
+# erratic Windows builds).  skbuild-conan cannot pass conan options directly, so
+# the option is injected into the skbuild_conan_py profile it reuses; see
+# Setup/conan_win_profile.py.
 before-all = [
     "pipx install conan",
-    "conan profile detect --name skbuild_conan_py ",
-    "echo 'CONAN START' ",
-    "conan install --profile:all=skbuild_conan_py --requires=libaom-av1/3.6.1",
-    "conan install --profile:all=skbuild_conan_py --requires=ffmpeg/7.1.1 --build=missing",
-    "echo 'CONAN DONE' "
+    "conan profile detect --name skbuild_conan_py --force",
+    "python Setup/conan_win_profile.py",
     ]
 [tool.cibuildwheel.linux]
 before-all = [ "yum -y install libva-devel libvdpau-devel xkeyboard-config-devel libfontenc-devel libXaw-devel libXcomposite-devel libXcursor-devel libXdmcp-devel libXtst-devel libXinerama-devel libxkbfile-devel libXrandr-devel libXres-devel libXScrnSaver-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel libXdamage-devel libXxf86vm-devel libXv-devel xcb-util-devel libuuid-devel xcb-util-cursor-devel perl perl-IPC-Cmd perl-Digest-SHA",

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

@@ -135,44 +135,6 @@ paramap = {
         "index" : ( "management", "index" ),
         }
 
-"""
-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
-    "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, 
-"""
-
 def getConfig( data, verbose=0 ):
       cfg = skel.copy()
       if verbose: print( "[getConfig]", data )

{cosmosim-3.0.3 → cosmosim-3.0.4}/src/CosmoSim/CLI/Simulator.py

@@ -2,20 +2,22 @@
 # (C) 2026: Hans Georg Schaathun <georg@schaathun.net>
 
 """
-Simulator class to manage bulk image generation.
+Abstract simulator class to manage bulk image generation.
 
 Different subclasses are required for different backend simulators, like
 `RouletteRegenerator` and `CosmoSim`.
 The `GenericSim` superclass contains shared methods.
 
-The constructor may takes a data row, typically a pandas Series object,
-reconfigures the backend simulator, and generates the distorted image.
+Subclasses shoulded override the constructor, calling the superclass constructor
+first and `initSim()` last.  In the middle, the `self.sim` must be set with a
+backend simulator.
+
+The `setParameters()` method must also be overridden.
+
+The `initSim` method reconfigures the backend simulator, and generates the 
+distorted image.
 Since the object retains much of the simulation data, extensive information
 and annotated images may be retrieved as well.
-
-The constructor may take a backend simulator instance as parameter.  This saves
-the cost of reinstantiation in bulk simulation, and it also leaves the possibility
-to set defaults in advance.
 """
 
 import cv2 as cv
@@ -37,7 +39,7 @@ class GenericSim:
     def __init__(self,param=None,name=None,outcols=None,verbose=1):
         """
         Normally the constructor should be overridden, calling the superclass
-        constructor first.
+        constructor first and `initSim()` last.
         """
         if verbose is None: verbose=1
         self.verbose = verbose

{cosmosim-3.0.3 → cosmosim-3.0.4}/src/CosmoSim/CosmoSim.cpp

@@ -46,19 +46,6 @@ CosmoSim::~CosmoSim() {
    }
 }
 
-PsiFunctionLens *CosmoSim::getLens( int lensmode ) { 
-   switch ( lensmode ) {
-      case CSIM_PSI_SIE:
-         return new SIE() ;
-      case CSIM_PSI_SIS:
-         return new SIS() ;
-      case CSIM_PSI_CLUSTER:
-         return new ClusterLens() ;
-      default:
-         throw NotImplemented() ;
-   }
-} ;
-
 cv::Point2d CosmoSim::getRelativeEta( double x, double y ) {
    // Input (x,y) is the centre point $\nu$
    return sim->getRelativeEta( cv::Point2d( x,y ) ) ; 
@@ -127,6 +114,7 @@ void CosmoSim::diagnostics() {
 
 void CosmoSim::setFile( int key, std::string fn ) {
     filename[key] = fn ;
+    if (DEBUG) std::cout << "[CosmoSim.cpp] setFile " << fn << " (" << key << ")\n" ;
 } 
 std::string CosmoSim::getFile( int key ) {
     return filename[key] ;
@@ -191,9 +179,10 @@ void CosmoSim::initLens() {
           lens = psilens = new SIS() ;
           psilens->setFile(filename[CSIM_PSI_SIS]) ;
           break ;
-       case CSIM_NOPSI_PM:
+       case CSIM_PSI_PM:
           lens = psilens = new PointMass() ;
-          if (DEBUG>1) std::cout << "CSIM_NOPSI_PM\n" ;
+          psilens->setFile(filename[CSIM_PSI_PM]) ;
+          if (DEBUG>1) std::cout << "CSIM_PSI_PM\n" ;
           break ;
        case CSIM_NOPSI:
           if (DEBUG) std::cout << "[initLens] Point Mass or No Lens (" 

{cosmosim-3.0.3 → cosmosim-3.0.4}/src/CosmoSim/CosmoSim.h

@@ -25,7 +25,7 @@ enum ModelSpec { CSIM_MODEL_RAYTRACE,
 enum PsiSpec    { CSIM_PSI_SIS,
                   CSIM_PSI_SIE,
                   CSIM_PSI_CLUSTER,
-                  CSIM_NOPSI_PM,
+                  CSIM_PSI_PM,
                   CSIM_NOPSI } ;
 
 class CosmoSim {
@@ -34,7 +34,7 @@ private:
     int modelmode=CSIM_MODEL_POINTMASS_EXACT ;
     double ellipseratio=0.5, orientation=0, einsteinR=20 ;
     int sampledlens = 0, modelchanged = 1 ;
-    int lensmode=CSIM_NOPSI_PM ;
+    int lensmode=CSIM_PSI_PM ;
     int srcmode=CSIM_SOURCE_SPHERE, sourceSize=20, sourceSize2=10,
         sourceTheta=0, n_sersic=5, luminosity = 10 ;
     double xPos=10, yPos=0, rPos=10, thetaPos=0; ;
@@ -58,8 +58,6 @@ public:
     CosmoSim();
     ~CosmoSim();
 
-    PsiFunctionLens *getLens( int ) ;
-
     void setFile(int,std::string) ;
     std::string getFile(int) ;
     void setXY(double, double) ;

cosmosim-3.0.4/src/CosmoSim/Dictionary.py

@@ -0,0 +1,90 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
+
+from . import CosmoSimPy as cs
+
+"""
+The module provides dictionaries of the different model identifiers,
+both lens, simulator, and source models.  They are used as lookup tables
+for the different strings used in configuration files and command line 
+arguments.
+"""
+
+ModelSpec = cs.ModelSpec
+SourceSpec = cs.SourceSpec
+PsiSpec = cs.PsiSpec
+LightProfileSpec = cs.LightProfileSpec
+Point = cs.Point 
+
+lensDict = {
+        "SIS" : PsiSpec.SIS,
+        "PM" : PsiSpec.PM,
+        "Cluster" : PsiSpec.Cluster,
+        "SIE" : PsiSpec.SIE,
+        }
+modelDict = {
+        "Raytrace" : ModelSpec.Raytrace,
+        "Roulette" : ModelSpec.Roulette,
+        "RouletteRegenerator" : ModelSpec.RouletteRegenerator,
+        "Point Mass (exact)" : ModelSpec.PointMassExact,
+        "Point Mass (roulettes)" : ModelSpec.PointMassRoulettes,
+
+        "ray" : ModelSpec.Raytrace,
+        "rou" : ModelSpec.Roulette,
+        "pmx" : ModelSpec.PointMassExact,
+        "pmr" : ModelSpec.PointMassRoulettes,
+        }
+modelValues = {
+        "Point Mass (exact)" : (ModelSpec.PointMassExact,PsiSpec.PM,False),
+        "Point Mass (roulettes)" : (ModelSpec.PointMassRoulettes,PsiSpec.PM,False),
+        "Sampled Roulette SIS" : (ModelSpec.Roulette,PsiSpec.SIS,True),
+        "Sampled Roulette SIE" : (ModelSpec.Roulette,PsiSpec.SIE,True),
+        "Sampled Raytrace SIS" : (ModelSpec.Raytrace,PsiSpec.SIS,True),
+        "Sampled Raytrace SIE" : (ModelSpec.Raytrace,PsiSpec.SIE,True),
+        "Roulette SIS" : (ModelSpec.Roulette,PsiSpec.SIS,False),
+        "Roulette SIE" : (ModelSpec.Roulette,PsiSpec.SIE,False),
+        "Raytrace SIS" : (ModelSpec.Raytrace,PsiSpec.SIS,False),
+        "Raytrace SIE" : (ModelSpec.Raytrace,PsiSpec.SIE,False),
+        }
+configDict = modelValues.copy()
+configDict["p"] = configDict["Point Mass (exact)"]
+configDict["r"] = configDict["Point Mass (roulettes)"]
+configDict["ss"] = configDict["Sampled Roulette SIS"]
+configDict["pss"] = configDict["Sampled Raytrace SIS"]
+configDict["fs"] = configDict["Roulette SIS"]
+configDict["rs"] = configDict["Raytrace SIS"]
+configDict["srousie"] = configDict["Sampled Roulette SIE"]
+configDict["sraysie"] = configDict["Sampled Raytrace SIE"]
+configDict["rousie"] = configDict["Roulette SIE"]
+configDict["raysie"] = configDict["Raytrace SIE"]
+
+# Note that the source names are looked up in two dictionaries,
+# both the `sourceDict` and the `lightProfileDict`.
+sourceDict = {
+        "Spherical" : SourceSpec.Sphere,
+        "Ellipsoid" : SourceSpec.Ellipse,
+        "SersicSphere" : SourceSpec.Sphere,
+        "SersicEllipsoid" : SourceSpec.Ellipse,
+        "Image (Einstein)" : SourceSpec.Image,
+        "Triangle" : SourceSpec.Triangle,
+        "s" : SourceSpec.Sphere,
+        "e" : SourceSpec.Ellipse,
+        "t" : SourceSpec.Triangle,
+        }
+sourceValues = {
+        "Spherical" : SourceSpec.Sphere,
+        "Ellipsoid" : SourceSpec.Ellipse,
+        "Image (Einstein)" : SourceSpec.Image,
+        "Triangle" : SourceSpec.Triangle,
+        }
+lightProfileDict = {
+        "Gaussian" : LightProfileSpec.Gaussian,
+        "Sersic" : LightProfileSpec.Sersic,
+        "Spherical" : LightProfileSpec.Gaussian,
+        "Ellipsoid" : LightProfileSpec.Gaussian,
+        "SersicSphere" : LightProfileSpec.Sersic,
+        "SersicEllipsoid" : LightProfileSpec.Sersic,
+        # "g" : LightProfileSpec.Gaussian,
+        # "s" : LightProfileSpec.Sersic,
+        }
+
+

{cosmosim-3.0.3 → cosmosim-3.0.4}/src/CosmoSim/Image.py

@@ -20,6 +20,8 @@ def showImages(ims,size=(1,3),titles=None):
     (x,y) = size
     fig = plt.figure(figsize=(5*y, 5*x))
     fig.tight_layout(pad=0.0)
+    if titles is None:
+        titles = [ None for _ in ims ]
     for (i,(im,t)) in enumerate(zip(ims,titles)):
         fig.add_subplot(x, y, i+1)
         imshow(im,t)

cosmosim-3.0.4/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 $< --output $@ $* 8
+pm%.raw:  $P/__main__.py
+	time python3 $< --lens PM --output $@ $* 8
+
+sie%.raw: $P/sie.py 
+	time python3 $< --output $@ $* 7
+sie%.tex: $P/sie.py 
+	time python3 $< --tex $@ $* 7
+
+%.pdf: %.tex
+	pdflatex $<
+
+clean:
+	rm -f *.log *.raw
+cleanall: clean
+	rm -f *.txt

cosmosim-3.0.4/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.3/python/amplitudes.py → cosmosim-3.0.4/src/CosmoSim/Roulettes/__main__.py

@@ -17,7 +17,7 @@ import time
 import argparse
 
 import sympy
-from libamplitudes import *
+from .libamplitudes import *
 from sympy import symbols, sqrt, diff, sin, cos, asin, atan2, asinh
 
 def func(n, m, s, alpha, beta, x, y, rdict):
@@ -31,7 +31,7 @@ def func(n, m, s, alpha, beta, x, y, rdict):
         s -= 1
         c = (m + 1) / (m + 1 - s) 
         if s == 0:
-            c /= 2
+            c = 1/2
         # start calculate
         alpha_ = sympy.factor(c * (diff(alpha, x) + diff(beta, y)))
         beta_ = sympy.factor(c * (diff(beta, x) - diff(alpha, y)))
@@ -132,5 +132,7 @@ if __name__ == "__main__":
         alphabeta = main(lens=args.lens,n=args.n,nproc=args.nproc,fn=args.output)
         if args.output:
            ampPrint(alphabeta,args.output)
-        if args.tex:
+        elif args.tex:
            texPrint(alphabeta,args.tex)
+        else:
+            ampPrint(alphabeta)

{cosmosim-3.0.3/python → cosmosim-3.0.4/src/CosmoSim/Roulettes}/libamplitudes.py

@@ -17,7 +17,7 @@ import time
 import argparse
 
 import sympy
-from sympy import symbols, sqrt, diff, sin, cos, asin, atan2, asinh, pi
+from sympy import symbols, sqrt, diff, sin, cos, asin, atan2, asinh, pi, log
 
 def identity(f): return f
 
@@ -50,6 +50,15 @@ def psiSIS():
     alpha = sympy.factor(diff(psi, x))
     beta = sympy.factor(diff(psi, y))
     return (psi,alpha,beta,x,y)
+def psiPM():
+    print( "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)
+    alpha = sympy.factor(diff(psi, x))
+    beta = sympy.factor(diff(psi, y))
+    return (psi,alpha,beta,x,y)
 def psiSIE():
     print( "psiSIE()" )
     # g is the Einstein radius and (x,y) coordinates in the lens plane
@@ -79,19 +88,26 @@ def zeroth(lens="SIS"):
         return psiSIS()
     if lens == "SIE":
         return psiSIE()
+    if lens == "PM":
+        return psiPM()
     raise "Unknown lens model"
 
-def ampPrint(alphabeta,fn):
-    print( "ampPrint" )
-    with open(fn, 'w') as f:
-        print( "Opened file", fn ) 
-        for (m,s) in alphabeta.keys():
-
+def ampWrite(alphabeta,f):
+    for (m,s) in alphabeta.keys():
             alpha,beta = alphabeta[(m,s)]
             res = f'{m}:{s}:{alpha}:{beta}'
             print ( f'{m}:{s}' )
             f.write(str(res) + '\n')
-        f.close()
+    f.close()
+def ampPrint(alphabeta,fn=None):
+    if fn is None:
+        ampWrite(alphabeta,sys.stdout)
+    else:
+        print( "ampPrint" )
+        with open(fn, 'w') as f:
+            print( "Opened file", fn ) 
+            ampWrite(alphabeta,f)
+
 
 def latex(x): return sympy.latex(sympy.simplify(x))
 def texPrint(alphabeta,fn,latex=latex,opt="12pt,paper=a4"):

cosmosim-3.0.3/python/sieamplitudes.py → cosmosim-3.0.4/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):