CosmoSim 2.6.0__tar.gz → 2.6.2__tar.gz

{cosmosim-2.6.0 → cosmosim-2.6.2}/Datasets/dataset.toml

@@ -9,7 +9,7 @@ einstein-min = 10
 einstein-max = 50
 
 [source]
-mode = "e"
+mode = "SersicSphere"
 sigma-min = 1
 sigma-max = 60
 sigma2-min = 1

{cosmosim-2.6.0 → cosmosim-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.6.0
+Version: 2.6.2
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -271,5 +271,7 @@ and a command line interface for batch generation of datasets.
 + **Mathematical Models** Ben David Normann
 + **Initial Prototype** Simon Ingebrigtsen, Sondre Westbø Remøy,
   Einar Leite Austnes, and Simon Nedreberg Runde
++ **Other Contributors** Oda Hjemli
+
 
 

{cosmosim-2.6.0 → cosmosim-2.6.2}/README.md

@@ -244,5 +244,7 @@ and a command line interface for batch generation of datasets.
 + **Mathematical Models** Ben David Normann
 + **Initial Prototype** Simon Ingebrigtsen, Sondre Westbø Remøy,
   Einar Leite Austnes, and Simon Nedreberg Runde
++ **Other Contributors** Oda Hjemli
+
 
 

{cosmosim-2.6.0 → cosmosim-2.6.2}/src/CosmoSim/__init__.py

@@ -12,7 +12,7 @@ import os, sys
 
 import traceback
 
-__version__ = "2.6.0"
+__version__ = "2.6.2"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec
@@ -150,7 +150,11 @@ lightProfileDict = {
         # "s" : LightProfileSpec.Sersic,
         }
 
-def getMS(maxm): return [ (m,s) for m in range(maxm+1)
+def getMS(minm,maxm=None):
+    if maxm is None:
+        maxm = minm
+        minm = 0
+    return [ (m,s) for m in range(minm,maxm+1)
                                     for s in range(1-m%2,m+2,2) ]
 def getMSheaders(maxm): 
     r = [ ( f"alpha[{m}][{s}]", f"beta[{m}][{s}]") for (m,s) in getMS(maxm) ]

{cosmosim-2.6.0 → cosmosim-2.6.2}/src/CosmoSim/dataset.py

@@ -15,6 +15,7 @@ import numbers
 
 import random 
 import argparse
+import pandas as pd
 
 def isnumeric(x): return isinstance(x, numbers.Number )
 
@@ -30,19 +31,19 @@ def configs(toml):
     if isinstance(r, str): r = [ r ] 
     return r
 def srcmode(toml):
-    r = toml["lens"].get( "mode", [ "e" ] )
+    r = toml["source"].get( "mode", [ "e" ] )
     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.randint(mn,mx)
+    return random.uniform(mn,mx)
 
 def getline(idx,toml):
 
     nterms = toml["simulator"].get( "nterms", 16 )
-    chi = toml["lens"].get( "chi", random.randint(30,70) )
+    chi = toml["lens"].get( "chi", random.uniform(30,70) )
 
     # Source
     sigma = uniform( toml["source"], "sigma", (1,60) )
@@ -61,7 +62,7 @@ def getline(idx,toml):
         if not isnumeric(rmin): rmin = einsteinR
         if not isnumeric(rmax): rmax = 2.5*rmin
 
-        R =  random.randint(rmin,rmax)
+        R =  random.uniform(rmin,rmax)
 
         # Cartesian Co-ordinates
         x = R*np.cos(np.pi*phi/180)
@@ -77,14 +78,20 @@ def getline(idx,toml):
 
     src = random.choice( srcmode(toml) )
     cfg = random.choice( configs(toml) )
-    return f'"{idx:04}","image-{idx:04}.png",{src},{cfg},{chi},' \
-         + f'{R},{phi},{einsteinR},{sigma},{sigma2},{theta},{nterms},{x},{y}'
+    return pd.Series(
+        data=[ idx,f"image-{idx:04}.png", src, cfg, chi, R, phi,
+               einsteinR, sigma, sigma2, theta, nterms, x, y ],
+        index=[ "index", "filename", "source", "config", "chi", 
+          "R", "phi", "einsteinR", "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}'
 
 header = ( "index,filename,source,config,chi,"
          + "R,phi,einsteinR,sigma,sigma2,theta,nterms,x,y\n"
          )
 
-def datasetgen(infile,outfile):
+def datasetgen(infile,outfile=None):
     with open(infile, 'rb') as f:
         toml = tl.load(f)
     tomldefaults(toml)
@@ -92,13 +99,11 @@ def datasetgen(infile,outfile):
     print(configs(toml))
     print(srcmode(toml))
 
-    with open(outfile, 'w') as f:
-      f.write(header)
-      n = toml["simulator"].get( "size", 10000 )
-      for i in range(n):
-        l = getline(i+1,toml)
-        f.write(l)
-        f.write("\n")
+    n = toml["simulator"].get( "size", 10000 )
+    df = pd.DataFrame( [ getline(i+1,toml) for i in range(n) ] )
+    if outfile:
+        df.to_csv( outfile, float_format="%.4f", index=False )
+    return df
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(

{cosmosim-2.6.0 → cosmosim-2.6.2}/src/CosmoSim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CosmoSim
-Version: 2.6.0
+Version: 2.6.2
 Summary: Simulator of Gravitational Lenses
 Author: Hans Georg Schaathun et al
 Author-email: Hans Georg Schaathun <georg+github@schaathun.net>
@@ -271,5 +271,7 @@ and a command line interface for batch generation of datasets.
 + **Mathematical Models** Ben David Normann
 + **Initial Prototype** Simon Ingebrigtsen, Sondre Westbø Remøy,
   Einar Leite Austnes, and Simon Nedreberg Runde
++ **Other Contributors** Oda Hjemli
+