diff --git a/pykat/__init__.py b/pykat/__init__.py index 3008f8b854cdea48a960f2090521cf3f60f5616e..9b14f735d2213da106e9b1cd22c2b5be53a8cd38 100644 --- a/pykat/__init__.py +++ b/pykat/__init__.py @@ -12,7 +12,7 @@ import components import detectors import commands -from pykat.utilities.optics.gaussian_beams import beam_param +from pykat.optics.gaussian_beams import beam_param diff --git a/pykat/commands.py b/pykat/commands.py index bd21e8ce16d7d910f78212a8c5df42c65be9ab33..1ecce9a528b650c2e52697c7e8e41267939e30c5 100644 --- a/pykat/commands.py +++ b/pykat/commands.py @@ -15,7 +15,7 @@ from structs import * from pykat.param import Param, putter import pykat.exceptions as pkex from collections import namedtuple -from pykat.utilities.optics.gaussian_beams import beam_param +from pykat.optics.gaussian_beams import beam_param class Command(object): __metaclass__ = abc.ABCMeta diff --git a/pykat/node_network.py b/pykat/node_network.py index 115c2b933b150826e80b22890d8dc0b6b432e7bf..973d42c05c4e88d474ceab180ca4f0a60aeea625 100644 --- a/pykat/node_network.py +++ b/pykat/node_network.py @@ -14,7 +14,7 @@ import pykat.exceptions as pkex from pykat.components import Component, NodeGaussSetter from pykat.detectors import BaseDetector as Detector -from pykat.utilities.optics.gaussian_beams import beam_param +from pykat.optics.gaussian_beams import beam_param class NodeNetwork(object): def __init__(self, kat): diff --git a/pykat/utilities/optics/ABCD.py b/pykat/optics/ABCD.py similarity index 100% rename from pykat/utilities/optics/ABCD.py rename to pykat/optics/ABCD.py diff --git a/pykat/utilities/optics/gaussian_beams.py b/pykat/optics/gaussian_beams.py similarity index 100% rename from pykat/utilities/optics/gaussian_beams.py rename to pykat/optics/gaussian_beams.py diff --git a/pykat/utilities/optics/__init__.py b/pykat/utilities/optics/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000