From dd8297611ee9485d9d50f77afe08188330b4efa2 Mon Sep 17 00:00:00 2001
From: Daniel Toyra <dtoyra@star.sr.bham.ac.uk>
Date: Sun, 15 May 2016 20:40:06 +0100
Subject: [PATCH] Removed RcRemoved as input to surfacemap __init__()
---
pykat/optics/maps.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pykat/optics/maps.py b/pykat/optics/maps.py
index 8a33ed7..d086ee1 100644
--- a/pykat/optics/maps.py
+++ b/pykat/optics/maps.py
@@ -43,7 +43,7 @@ class MirrorROQWeights:
class surfacemap(object):
def __init__(self, name, maptype, size=None, center=None, step_size=1.0, scaling=1.0e-9, data=None,
- notNan=None, RcRemoved=None, zOffset=None, xyOffset=(.0,.0)):
+ notNan=None, zOffset=None, xyOffset=(.0,.0)):
'''
size, center, step_size, xyOffset are all tuples of the form (x, y),
i.e., (col, row).
@@ -70,7 +70,7 @@ class surfacemap(object):
self.center = center
self.step_size = step_size
self.scaling = scaling
- self.RcRemoved = RcRemoved
+ self._RcRemoved = None
# Offset of fitted sphere. Proably unnecessary to have here.
self.zOffset = zOffset
self.__interp = None
@@ -1794,8 +1794,8 @@ def read_map(filename, mapFormat='finesse', scaling=1.0e-9, mapType='phase', fie
step = tuple(map(g, f.readline().split(':')[1].strip().split()))
scaling = float(f.readline().split(':')[1].strip())
- data = np.loadtxt(filename, dtype=np.float64,ndmin=2,comments='%')
-
+ data = np.loadtxt(filename, dtype=np.float64,ndmin=2,comments='%')
+
return surfacemap(name, maptype, size, center, step, scaling, data)
elif mapFormat.lower() == 'ligo' or mapFormat.lower() == 'zygo':
--
GitLab