CosmoSim 2.6.3__tar.gz → 2.6.4__tar.gz

cosmosim-2.6.4/Datasets/dataset.toml

@@ -0,0 +1,34 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
+[simulator]
+configs = [ "raysie" ]
+size = 10
+nterms = 4
+
+[lens]
+chi = 50
+einstein-min = 1
+einstein-max = 39
+# orientation and ellipseratio are used for SIE lenses
+orientation-min = 0
+orientation-max = 180
+ellipseratio-min = 0.1
+ellipseratio-max = 1.0
+
+[source]
+mode = "SersicSphere"
+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"
+
+[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
+

cosmosim-2.6.4/Datasets/dataset2.toml

@@ -0,0 +1,34 @@
+# (C) 2026: Hans Georg Schaathun <georg@schaathun.net> 
+[simulator]
+configs = [ "raysie" ]
+size = 10
+nterms = 4
+
+[lens]
+chi = 50
+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
+
+[source]
+mode = "SersicSphere"
+sigma-min = 1.25
+sigma-max = 20
+sigma2-min = 1.25
+sigma2-max = 20
+# source.theta is the rotation of the source (relevant for non-spherical sources)
+theta-min = 0
+theta-max = 180
+position = "polar"
+
+[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 = 75
+

{cosmosim-2.6.3 → cosmosim-2.6.4}/PKG-INFO

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

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim/__init__.py

@@ -12,7 +12,7 @@ import os, sys
 
 import traceback
 
-__version__ = "2.6.3"
+__version__ = "2.6.4"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim/datagen.py

@@ -80,6 +80,8 @@ class SimImage:
         self.name = name
         self.param = param
         self.directory = self.param.get( "directory" )
+        if self.directory:
+            os.makedirs( self.directory, exist_ok=True )
         self.outcols = outcols
     def getData(self):
         sim = self.sim

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim/dataset.py

@@ -35,10 +35,18 @@ def srcmode(toml):
     if isinstance(r, str): r = [ r ] 
     return r
 def uniform(toml,key,rng=(0,50)):
-    if key in toml: return toml[key]
-    mn = toml.get( f"{key}-min", rng[0] )
-    mx = toml.get( f"{key}-max", rng[1] )
-    return random.uniform(mn,mx)
+    if key in toml:
+        return toml[key]
+    if rng:
+        mn = toml.get( f"{key}-min", rng[0] )
+        mx = toml.get( f"{key}-max", rng[1] )
+        return random.uniform(mn,mx)
+    try:
+        mn = toml.get( f"{key}-min" )
+        mx = toml.get( f"{key}-max" )
+        return random.uniform(mn,mx)
+    except:
+        return None
 
 def getline(idx,toml):
 
@@ -53,6 +61,8 @@ def getline(idx,toml):
 
     # Lens
     einsteinR = uniform( toml["lens"], "einstein", (10,50) )
+    orientation = uniform( toml["lens"], "orientation", rng=None )
+    ellipseratio = uniform( toml["lens"], "ellipseratio", rng=None )
 
     if coor == "polar":
         # Polar Source Co-ordinates
@@ -80,9 +90,11 @@ def getline(idx,toml):
     cfg = random.choice( configs(toml) )
     return pd.Series(
         data=[ idx,f"image-{idx:04}.png", src, cfg, chi, R, phi,
-               einsteinR, sigma, sigma2, theta, nterms, x, y ],
+               einsteinR, ellipseratio, orientation, 
+               sigma, sigma2, theta, nterms, x, y ],
         index=[ "index", "filename", "source", "config", "chi", 
-          "R", "phi", "einsteinR", "sigma", "sigma2", "theta", "nterms", "x", "y" ]
+               "R", "phi", "einsteinR", "ellipseratio", "orientation",
+               "sigma", "sigma2", "theta", "nterms", "x", "y" ]
         )
     # return f'"{idx:04}","image-{idx:04}.png",{src},{cfg},{chi},' \
     #      + f'{R},{phi},{einsteinR},{sigma},{sigma2},{theta},{nterms},{x},{y}'

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim/roulettegen.py

@@ -51,8 +51,10 @@ def setAmplitudes( rsim, row, coefs ):
     maxm = coefs.getNterms()
     for m in range(maxm+1):
         for s in range((m+1)%2, m+2, 2):
-            alpha = row[f"alpha[{m}][{s}]"]
-            beta = row[f"beta[{m}][{s}]"]
+            print( "row is",  type( row ) )
+            alpha = row.get( f"alpha[{m}][{s}]", 0.0 )
+            beta = row.get( f"beta[{m}][{s}]", 0.0 )
+            print( "alpha/beta are",  type( alpha ), type( beta ) )
             print( f"alpha[{m}][{s}] = {alpha}\t\tbeta[{m}][{s}] = {beta}." )
             rsim.setAlphaXi( m, s, alpha )
             rsim.setBetaXi( m, s, beta )
@@ -104,7 +106,7 @@ def main(args):
             sys.stdout.flush()
 
             setAmplitudes( rsim, row, coefs )
-            print( "index", row["index"] )
+            print( "filename", row["filename"] )
             sys.stdout.flush()
                     
             param.setRow( row )
@@ -130,4 +132,6 @@ if __name__ == "__main__":
           epilog = '')
 
     args = parser.parse_args()
+    if args.directory:
+        os.makedirs( args.directory, exist_ok=True )
     main(args)

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim.egg-info/PKG-INFO

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

{cosmosim-2.6.3 → cosmosim-2.6.4}/src/CosmoSim.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ setup.py
 Datasets/.gitignore
 Datasets/README.md
 Datasets/dataset.toml
+Datasets/dataset2.toml
 Datasets/debug.csv
 Datasets/mask.csv
 Datasets/performance.py

cosmosim-2.6.3/Datasets/dataset.toml

@@ -1,26 +0,0 @@
-[simulator]
-configs = ["p", "r", "ss", "pss", "fs", "rs"]
-size = 10
-nterms = 5
-
-[lens]
-chi = 50
-einstein-min = 10
-einstein-max = 50
-
-[source]
-mode = "SersicSphere"
-sigma-min = 1
-sigma-max = 60
-sigma2-min = 1
-sigma2-max = 40
-theta-min = 0
-theta-max = 179
-position = "polar"
-
-[position]
-phi-min = 0
-phi-max = 359
-r-min = "einsteinR"
-r-max = 100
-