Merge pull request #71 from andrewpaulreeves/master

Move to setuptools to fix installation issues
AOtools · Apr 18, 2017 · 1bdc02c · 1bdc02c
2 parents 4dbcc0f + fdf28b3
commit 1bdc02c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup, find_packages
 import versioneer
 
 
@@ -15,18 +15,7 @@
     cmdclass=versioneer.get_cmdclass(),
     author='Andrew Reeves',
     author_email='[email protected]',
-    packages=[  'soapy', 
-                'soapy.wfs', 
-                'soapy.aotools',
-                'soapy.aotools.centroiders',
-                'soapy.aotools.circle',
-                'soapy.aotools.interp',
-                'soapy.aotools.phasescreen',
-                'soapy.aotools.turbulence',
-                'soapy.aotools.wfs',
-                'soapy.aotools.fft',
-                'soapy.pyqtgraph'
-                ],
+    packages=find_packages(),
     scripts=['bin/soapy'],
     description='A tomographic astronomical adaptive optics simulation with realistic laser guide star propagation.',
     long_description=open('README.md').read(),

diff --git a/soapy/DM.py b/soapy/DM.py
@@ -359,7 +359,7 @@ def makeIMatShapes(self):
                 self.acts, self.simConfig.pupilSize, self.simConfig.pupilSize))
 
         actSpacing = self.simConfig.pupilSize/(self.dmConfig.nxActuators-1)
-        width = actSpacing/2.
+        width = actSpacing * self.dmConfig.gauss_width
 
         for i in xrange(self.acts):
             x,y = self.activeActs[i]*actSpacing

diff --git a/soapy/confParse.py b/soapy/confParse.py
@@ -924,7 +924,10 @@ class in the ``DM`` module.
                              optically conjugated.               ``0``
         ``diameter``         float: Diameter covered by DM in 
                              metres. If ``None`` if telescope 
-                             diameter.                           ``None`` 
+                             diameter.                           ``None``
+        ``gauss_width``      float: Width of gaussian influence
+                             functions in units of actuator
+                              spacing.                           ``1``
         ==================== =================================   ===========
     """
 
@@ -944,7 +947,8 @@ class in the ``DM`` module.
                     ("interpOrder", 2),
                     ("gaussWidth", 0.5),
                     ("altitude", 0.),
-                    ("diameter", None)
+                    ("diameter", None),
+                    ("gauss_width", 0.7),
                     ]
 
     calculatedParams = [