CosmoSim 2.8.1__tar.gz → 3.0.0b1__tar.gz

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.8.1
+Version: 3.0.0b1
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -22,6 +22,8 @@ Requires-Dist: numpy
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: pandas
+Requires-Dist: toml
+Requires-Dist: cascadict
 Dynamic: author
 Dynamic: license-file
 

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/RegressionTest/bin/makeimages.sh

@@ -19,4 +19,4 @@ mkdir -p $dir
 test $csv || csv=debug.csv
 echo $csv
 
-python -m CosmoSim.datagen $opts -Z 400 --directory="$dir" --csvfile $csv  || exit 1
+python -m CosmoSim $opts -Z 400 --directory="$dir" --csvfile $csv  || exit 1

cosmosim-3.0.0b1/RegressionTest/new-roulette/baseline.config

@@ -0,0 +1 @@
+baseline20260528

cosmosim-3.0.0b1/RegressionTest/raytrace/baseline.config

@@ -0,0 +1 @@
+baseline20260528

cosmosim-3.0.0b1/RegressionTest/roulette/baseline.config

@@ -0,0 +1 @@
+baseline20260528

cosmosim-3.0.0b1/RegressionTest/roulettegen/baseline.config

@@ -0,0 +1 @@
+baseline20260528

cosmosim-3.0.0b1/RegressionTest/roulettegen/makeimages.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+dir=`date "+%Y%m%d"`
+mkdir -p $dir
+. ../bin/config.sh
+python -m CosmoSim -n 10 -Z 600 --roulette roulette.csv -D $dir 

cosmosim-3.0.0b1/RegressionTest/roulettegen-old/baseline.config

@@ -0,0 +1 @@
+baseline20260528

cosmosim-3.0.0b1/RegressionTest/roulettegen-old/makeimages.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+dir=`date "+%Y%m%d"`
+mkdir -p $dir
+. ../bin/config.sh
+python3 -m CosmoSim -n 10 -Z 600 --roulette roulette.csv -D $dir --no-xireference

cosmosim-3.0.0b1/Setup/testvenv.sh

@@ -0,0 +1,19 @@
+# (C) 2025: Hans Georg Schaathun <hg@schaathun.net>
+
+D=/tmp/venv/test
+
+mkdir -p $D
+
+if test -r $D/bin/activate
+then
+   . $D/bin/activate
+else
+   mkdir -p venv
+   python -m venv $D
+   . $D/bin/activate
+
+   sh Setup/build.sh
+
+   pip install jupytext jupyterlab 
+   pip install -e .
+fi

cosmosim-3.0.0b1/Setup/venv.sh

@@ -0,0 +1,11 @@
+# (C) 2025: Hans Georg Schaathun <hg@schaathun.net>
+
+if test -r venv/run/bin/activate
+then
+   . venv/run/bin/activate
+else
+   mkdir -p venv
+   python -m venv venv/run
+   . venv/run/bin/activate
+   pip install -r requirements.txt
+fi

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/include/cosmosim/Lens.h

@@ -138,7 +138,7 @@ public:
     virtual double psiXvalue( double, double ) const ;
     virtual double psiYvalue( double, double ) const ;
 
-    virtual cv::Point2d getXi( cv::Point2d ) ;
+    // virtual cv::Point2d getXi( cv::Point2d ) ;
 
     virtual double criticalXi( double ) const ;
     virtual cv::Point2d caustic( double ) const ;

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/include/cosmosim/Source.h

@@ -51,11 +51,11 @@ class SourceConstellation : public Source {
 class SphericalSource : public Source {
 
 private:
-    double sigma ;
+    double sigma, n_sersic, luminosity;
     LightProfileSpec lightprofile;
 
 public:
-    SphericalSource(int,double,LightProfileSpec) ;
+    SphericalSource(int,double,double,double,LightProfileSpec) ;
 
 protected:
     virtual void drawSource(int, int, cv::Mat &) ;

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/pyproject.toml

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

{cosmosim-2.8.1 → cosmosim-3.0.0b1}/requirements.txt

@@ -8,3 +8,4 @@ conan
 twine
 build
 cibuildwheel
+cascadict