CosmoSim 3.0.0b1__tar.gz → 3.0.0b2__tar.gz

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

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

{cosmosim-3.0.0b1 → cosmosim-3.0.0b2}/src/CosmoSim/CLI/Arguments.py

@@ -77,7 +77,7 @@ class Parameters:
         self._row[key] = v
 
 skel = { "simulator" : { "configs" : {}, "imagesize": 512 }
-         , "source" : {}
+        , "source" : { "sigma" : 10, "sigma2" : 20, "theta" : 45 }
          , "lens" : {}
          , "dataset" : {}
          , "annotation" : {}
@@ -224,8 +224,8 @@ class CosmoParser(argparse.ArgumentParser):
             help="simulation model")
     self.add_argument('-S', '--source',
             default="Spherical", help="source model")
-    self.add_argument('-G', '--sampled', action='store_true',
-            default=False, help="Sample the lens model")
+    self.add_argument('-G', '--sampled', action=argparse.BooleanOptionalAction,
+            default=None, help="Sample the lens model")
 
     # Model Parameters
     self.add_argument('-x', '--x', type=float, default=0, help="x coordinate")

{cosmosim-3.0.0b1 → cosmosim-3.0.0b2}/src/CosmoSim/__init__.py

@@ -15,7 +15,7 @@ Parameters = Arguments.Parameters
 
 import traceback
 
-__version__ = "3.0.0b1"
+__version__ = "3.0.0b2"
 
 ModelSpec = cs.ModelSpec
 SourceSpec = cs.SourceSpec

{cosmosim-3.0.0b1 → cosmosim-3.0.0b2}/src/CosmoSim/__main__.py

@@ -3,7 +3,7 @@ from . import __version__
 import os
 
 from .roulettegen import rgen
-from .datagen import datagen,makeSingle,setupSim
+from .datagen import datagen,makeSingle
 
 from .CLI.Arguments import CosmoParser,Parameters
 

{cosmosim-3.0.0b1 → cosmosim-3.0.0b2}/src/CosmoSim/datagen.py

@@ -80,12 +80,21 @@ class SimImage(GenericSim):
                    "reletaX", "reletaY",
                    "offsetX", "offsetY",
                    "xiX", "xiY" ]
+        r1 = pd.Series(
+                { "filename" : self.param.get( "filename" )
+                , "source" : self.param.get( "source" )
+                , "x" : self.param.get( "x" )
+                , "y" : self.param.get( "y" )
+                , "sigma" : self.param.get( "sigma" )
+                , "sigma2" : self.param.get( "sigma2" )
+                , "theta" : self.param.get( "theta" )
+                } )
         r2 = pd.Series(
               [ centrepoint[0], centrepoint[1], releta[0], releta[1],
                offset[0], offset[1], xioffset[0], xioffset[1] ],
               index=relcols ) 
         r3 = pd.Series( ab, index=getMSheaders(maxm)) 
-        r1 = pd.concat( [ self.row, r2, r3 ] )
+        r1 = pd.concat( [ r1, r2, r3 ] )
         if self.verbose > 1:
             print( f"New row (verbosity={self.verbose})" )
             print( r1 )
@@ -193,51 +202,6 @@ def makeSingle(param=None,name=None,outcols=None,verbose=0):
     print( "makeSingle() returns" )
     return imsim
 
-def setupSim(args):
-    print( "[setupSim] Instantiate Simulator ... " )
-    if args.amplitudes:
-       sim = CosmoSim(fn=args.amplitudes)
-    elif args.nterms:
-       sim = CosmoSim(maxm=int(args.nterms))
-    else:
-       sim = CosmoSim()
-    print( "[datagen.py] Simulator initialised" )
-    if args.phi:
-        sim.setPolar( float(args.x), float(args.phi) )
-    else:
-        sim.setXY( float(args.x), float(args.y) )
-    if args.sampled:
-        sim.setSampled( 1 )
-    else:
-        sim.setSampled( 0 )
-
-    if args.config:
-        sim.setConfigMode( args.config )
-    elif args.cluster:
-        print( "setCluster from arguments" )
-        sim.setCluster( args.cluster )
-    elif args.lens:
-        sim.setLensMode( args.lens)
-
-    if args.model:
-        sim.setModelMode( args.model)
-    if args.chi:
-        sim.setCHI( float(args.chi) )
-    if args.einsteinradius:
-        sim.setEinsteinR( float(args.einsteinradius) )
-    if args.ratio:
-        sim.setRatio( float(args.ratio) )
-    if args.orientation:
-        sim.setOrientation( float(args.orientation) )
-    if args.imagesize:
-        sim.setImageSize( int(args.imagesize) )
-        sim.setResolution( int(args.imagesize) )
-    if args.nterms:
-        sim.setNterms( int(args.nterms) )
-
-    sim.setMaskMode( args.mask )
-    return( sim )
-
 def datagen(args,param=None):
 
     if args.rnd:

{cosmosim-3.0.0b1 → cosmosim-3.0.0b2}/src/CosmoSim.egg-info/PKG-INFO

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