CosmoSim 3.0.2__tar.gz → 3.0.4b1__tar.gz

{cosmosim-3.0.2 → cosmosim-3.0.4b1}/Datasets/cluster.toml

@@ -22,6 +22,8 @@ ellipseratio-max = 1.0
 
 [lens.cluster]
 count = 4
+
+# The other parameters are early drafts
 maxrelativesize = 10
 mindistance = [ 0, 1, 1 ] # Sum of Einstein radiuses
 maxdistance = [ 0, 10 ] # 10 times largest Einstein radiues in cluster

{cosmosim-3.0.2 → cosmosim-3.0.4b1}/Datasets/dataset.toml

@@ -1,34 +1,36 @@
 # (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
 [simulator]
 configs = [ "raysie" ]
-size = 10
+size = 24000
 nterms = 4
+imagesize = 512
+cropsize = 256
+centred = true
 
 [lens]
-chi = 50
-einstein-min = 1
-einstein-max = 39
+# Einstein radius 0.1" .. 3.0"
+einstein-min = 2.5
+einstein-max = 75
 # orientation and ellipseratio are used for SIE lenses
 orientation-min = 0
 orientation-max = 180
 ellipseratio-min = 0.1
-ellipseratio-max = 1.0
+ellipseratio-max = 0.9
 
 [source]
 mode = "SersicSphere"
+n_sersic-min = 1
+n_sersic-max = 5
+luminosity-min = 10
+luminosity-max = 20
+luminosity-lambda = 2.0
+# sigma (source size) 0.04"..0.2"
 sigma-min = 1
-sigma-max = 10
-sigma2-min = 1
-sigma2-max = 10
-# source.theta is the rotation of the source (relevant for non-spherical sources)
-theta-min = 0
-theta-max = 180
-position = "polar"
+sigma-max = 5
+position = "relative"
 
 [position]
 # (phi,r) is the source position in polar co-ordinates, angle in degrees
 phi-min = 0
 phi-max = 360
-r-min = 1
-r-max = 10
-
+r-relativemax = 1.2

cosmosim-3.0.4b1/Datasets/experimentbatch.toml

@@ -0,0 +1,31 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
+# This configures training of a machine learning model for CosmoAI
+[settings]
+device = "cuda"
+models = [
+    "regnet_y_32gf", 
+    "wide_resnet50_2",
+    "resnet50",
+]
+problem = "problem.toml"
+
+[hyperparameters.array]
+learning-rate = [ 1e-3, 5e-4, 1e-4 ]
+batch-size = [ 32, 64, 96 ]
+# batch-size = [ 32, 64, 96 ]
+weight-decay = [ 1e-4, 4e-5, 1e-5 ]
+
+[training]
+num-epochs = 50
+patience = 10
+
+[dataset]
+directory = "images"
+training.filename = "training.csv"
+testing.filename = "testing.csv"
+validation.filename = "validation.csv"
+
+[output]
+dirbase = "experiment%%"
+# Predictions are placed in the output directory using the
+# same filenames as the input files (training/testing/validation).

cosmosim-3.0.4b1/Datasets/problem.toml

@@ -0,0 +1,20 @@
+[problem]
+filename = "roulette.csv"
+dataset =  "dataset.toml"
+variables = [ "sigma", "xiX", "xiY" ]
+nterms = 4 
+
+[dataset]
+roulette = "resimulation"
+
+[dataset.training]
+filename = "training.csv"
+size = 16000
+
+[dataset.validation]
+filename = "validation.csv"
+size = 4000
+
+[dataset.testing]
+filename = "testing.csv"
+size = 4000

{cosmosim-3.0.2 → cosmosim-3.0.4b1}/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.4b1/PKG-INFO

@@ -0,0 +1,155 @@
+Metadata-Version: 2.4
+Name: CosmoSim
+Version: 3.0.4b1
+Summary: Simulator of Gravitational Lenses
+Author: Hans Georg Schaathun et al
+Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/CosmoAI-AES/CosmoSim
+Project-URL: Issues, https://github.com/CosmoAI-AES/CosmoSim/issues
+Keywords: cosmology,gravitational lensing,simulation
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: C++
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: sympy>=1.13
+Requires-Dist: numpy
+Requires-Dist: matplotlib
+Requires-Dist: opencv-python
+Requires-Dist: pandas
+Requires-Dist: toml
+Requires-Dist: cascadict
+Dynamic: author
+Dynamic: license-file
+
+---
+title: The CosmoAI project
+---
+
+# The CosmoSim software
+
+This project provides a simulator for gravitational lensing based on
+Chris Clarkson's Roulettes framework.  The code is experimental,
+and intended for research, with many loose ends.  If you think it
+may be useful, we shall be happy to discuss collaboration and help
+you get started.
+
+The core team is
++ [Dr.  Ben David Normann]() - computer science and mathematics
++ [Hans Georg Schaathun]() - cosmology  and mathematics
+Documentation is being written at 
+[https://cosmoai-aes.github.io/](https://cosmoai-aes.github.io/),
+but it still incomplete and fragmented.
+
+## Installation Guide
+
+CosmoSim is set up to build python packages (wheels) that
+can be installed with pip.  
+```sh
+pip install CosmoSim
+```
+
+We successfully build CosmoSim for 
+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),
+```
+pip install build
+python -m build
+```
+This is highly dependent on the local configuration, and may fail
+for a number of reasons.  If it succeeds, the binary file for the
+python module appears under src/CosmoSim.
+
+If you can build, pip can also install the package from the working
+directory.  Again, from the root of the repo,
+```
+pip install .
+```
+
+For non-standard building, see [BUILD.md](BUILD.md).
+
+## Running the GUI
+
+```sh
+python3 -m CosmoSim.GUI
+```
+
+The GUI tool is hopefully quite self-explanatory.  
+The images shown are the actual source on the left and the distorted (lensed)
+image on the right.
+
+
+## The Command Line Interface (CLI)
+
+An illustrative test set can be generated by the following command.
+
+```sh
+mkdir images
+python3 -m CosmoSim -CR -Z 400 --csvfile Datasets/debug.csv --directory images
+```
+
+This generates a range of images in the newly created images directory.
+
+The flags may be changed; `-C` centres det distorted image in the centre
+of the image (being debugged); `-Z` sets the image size; `-R` prints an
+axes cross.
+
+Further documentation and examples are found on the 
+[web site](https://cosmoai-aes.github.io/),
+
+
+## Versions
+
++ The imortant git branches are
+    - develop is the current state of the art
+    - pypitest is used for final testing with automatic deployment
+      to the PyPI test index.
+    - master should be the last stable version
++ Releases
+    - v-test-* are test releases, used to debug workflows.  Please ignore.
+    - see the releases on githun and CHANGELOG.md
++ Prior to v2.0.0 some releases have been tagged, but not registered
+as releases in github.
+    - v0.1.0, v0.2.0, v1.0.0 are versions made by the u/g students
+      Spring 2022.
+    - v1.0.1 is cleaned up to be able to build v1.0.0
+
+## Caveats
+
+The simulator makes numerical calculations and there will always
+be approximation errors.
+
+1.  The images generated from the same parameters have changed slightly
+    between version.  Some changes are because some unfortunate uses of
+    integers and single-precision numbers have later been avoided, and some 
+    simply because the order of calculation has changed.
+1.  The SIS model is implemented in two versions, one rotating
+    to have the source on the x-axis and one working directly with
+    arbitrary position.  Difference are not perceptible by visual
+    comparison, but the difference image shows noticeable difference.
+
+
+## Contributors
+
+The initial prototype was an undergraduate
+[final year project](https://ntnuopen.ntnu.no/ntnu-xmlui/handle/11250/3003634)
+by Ingebrigtsen, Remøy, Westbø, Nedreberg, and Austnes (2022).
+The software includes both a GUI simulator for interactive experimentation, 
+and a command line interface for batch generation of datasets.
+
++ **Idea and Current Maintainance** Hans Georg Schaathun <hasc@ntnu.no>
++ **Mathematical Models** Ben David Normann
++ **Initial Prototype** Simon Ingebrigtsen, Sondre Westbø Remøy,
+  Einar Leite Austnes, and Simon Nedreberg Runde
++ **Other Contributors** Lars Ivar Hatledal, Oda Hjemli
+
+
+

cosmosim-3.0.4b1/README.md

@@ -0,0 +1,126 @@
+---
+title: The CosmoAI project
+---
+
+# The CosmoSim software
+
+This project provides a simulator for gravitational lensing based on
+Chris Clarkson's Roulettes framework.  The code is experimental,
+and intended for research, with many loose ends.  If you think it
+may be useful, we shall be happy to discuss collaboration and help
+you get started.
+
+The core team is
++ [Dr.  Ben David Normann]() - computer science and mathematics
++ [Hans Georg Schaathun]() - cosmology  and mathematics
+Documentation is being written at 
+[https://cosmoai-aes.github.io/](https://cosmoai-aes.github.io/),
+but it still incomplete and fragmented.
+
+## Installation Guide
+
+CosmoSim is set up to build python packages (wheels) that
+can be installed with pip.  
+```sh
+pip install CosmoSim
+```
+
+We successfully build CosmoSim for 
+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),
+```
+pip install build
+python -m build
+```
+This is highly dependent on the local configuration, and may fail
+for a number of reasons.  If it succeeds, the binary file for the
+python module appears under src/CosmoSim.
+
+If you can build, pip can also install the package from the working
+directory.  Again, from the root of the repo,
+```
+pip install .
+```
+
+For non-standard building, see [BUILD.md](BUILD.md).
+
+## Running the GUI
+
+```sh
+python3 -m CosmoSim.GUI
+```
+
+The GUI tool is hopefully quite self-explanatory.  
+The images shown are the actual source on the left and the distorted (lensed)
+image on the right.
+
+
+## The Command Line Interface (CLI)
+
+An illustrative test set can be generated by the following command.
+
+```sh
+mkdir images
+python3 -m CosmoSim -CR -Z 400 --csvfile Datasets/debug.csv --directory images
+```
+
+This generates a range of images in the newly created images directory.
+
+The flags may be changed; `-C` centres det distorted image in the centre
+of the image (being debugged); `-Z` sets the image size; `-R` prints an
+axes cross.
+
+Further documentation and examples are found on the 
+[web site](https://cosmoai-aes.github.io/),
+
+
+## Versions
+
++ The imortant git branches are
+    - develop is the current state of the art
+    - pypitest is used for final testing with automatic deployment
+      to the PyPI test index.
+    - master should be the last stable version
++ Releases
+    - v-test-* are test releases, used to debug workflows.  Please ignore.
+    - see the releases on githun and CHANGELOG.md
++ Prior to v2.0.0 some releases have been tagged, but not registered
+as releases in github.
+    - v0.1.0, v0.2.0, v1.0.0 are versions made by the u/g students
+      Spring 2022.
+    - v1.0.1 is cleaned up to be able to build v1.0.0
+
+## Caveats
+
+The simulator makes numerical calculations and there will always
+be approximation errors.
+
+1.  The images generated from the same parameters have changed slightly
+    between version.  Some changes are because some unfortunate uses of
+    integers and single-precision numbers have later been avoided, and some 
+    simply because the order of calculation has changed.
+1.  The SIS model is implemented in two versions, one rotating
+    to have the source on the x-axis and one working directly with
+    arbitrary position.  Difference are not perceptible by visual
+    comparison, but the difference image shows noticeable difference.
+
+
+## Contributors
+
+The initial prototype was an undergraduate
+[final year project](https://ntnuopen.ntnu.no/ntnu-xmlui/handle/11250/3003634)
+by Ingebrigtsen, Remøy, Westbø, Nedreberg, and Austnes (2022).
+The software includes both a GUI simulator for interactive experimentation, 
+and a command line interface for batch generation of datasets.
+
++ **Idea and Current Maintainance** Hans Georg Schaathun <hasc@ntnu.no>
++ **Mathematical Models** Ben David Normann
++ **Initial Prototype** Simon Ingebrigtsen, Sondre Westbø Remøy,
+  Einar Leite Austnes, and Simon Nedreberg Runde
++ **Other Contributors** Lars Ivar Hatledal, Oda Hjemli
+
+
+

cosmosim-3.0.4b1/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.2 → cosmosim-3.0.4b1}/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.4b1/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.2 → cosmosim-3.0.4b1}/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.2 → cosmosim-3.0.4b1}/python/amplitudes.py

@@ -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.2 → cosmosim-3.0.4b1}/python/compare.py

@@ -1,5 +1,9 @@
 #! /usr/bin/env python3
 
+"""
+Utility script to compare images.
+"""
+
 import cv2 as cv
 import sys
 import os

{cosmosim-3.0.2 → cosmosim-3.0.4b1}/python/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.2 → cosmosim-3.0.4b1}/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 )