Commit 897c2f39 authored by Andreas Freise's avatar Andreas Freise
Browse files

starting cnversion to pykat2 and 3 compatibility

parent 6a372be9
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import os import os
import re import re
import pykat.exceptions as pkex import pykat.exceptions as pkex
......
...@@ -4,6 +4,10 @@ Created on Mon Jan 28 10:43:18 2013 ...@@ -4,6 +4,10 @@ Created on Mon Jan 28 10:43:18 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
class colours: class colours:
HEADER = '\033[95m' HEADER = '\033[95m'
...@@ -19,4 +23,4 @@ class colours: ...@@ -19,4 +23,4 @@ class colours:
self.OKGREEN = '' self.OKGREEN = ''
self.WARNING = '' self.WARNING = ''
self.FAIL = '' self.FAIL = ''
self.ENDC = '' self.ENDC = ''
\ No newline at end of file
...@@ -4,14 +4,18 @@ Created on Mon Jan 28 11:58:09 2013 ...@@ -4,14 +4,18 @@ Created on Mon Jan 28 11:58:09 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import numpy import numpy
from numpy import min,max from numpy import min,max
import pykat.external.six as six import pykat.external.six as six
if six.PY2: if six.PY2:
import exceptions import exceptions
from components import * from pykat.components import *
from structs import * from pykat.structs import *
from pykat.param import Param, putter from pykat.param import Param, putter
import pykat.exceptions as pkex import pykat.exceptions as pkex
from collections import namedtuple from collections import namedtuple
......
...@@ -4,7 +4,10 @@ Created on Mon Jan 28 11:10:01 2013 ...@@ -4,7 +4,10 @@ Created on Mon Jan 28 11:10:01 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
from pykat import USE_GUI, HAS_OPTIVIS, NoGUIException from pykat import USE_GUI, HAS_OPTIVIS, NoGUIException
......
...@@ -4,7 +4,11 @@ Created on Fri Feb 01 0split()9:09:10 2013 ...@@ -4,7 +4,11 @@ Created on Fri Feb 01 0split()9:09:10 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import pykat.external.six as six import pykat.external.six as six
if six.PY2: if six.PY2:
import exceptions import exceptions
...@@ -13,8 +17,10 @@ from pykat.node_network import * ...@@ -13,8 +17,10 @@ from pykat.node_network import *
from pykat.param import Param, AttrParam from pykat.param import Param, AttrParam
from pykat.SIfloat import SIfloat from pykat.SIfloat import SIfloat
import collections import pykat.external.six as six
import pykat.exceptions as pkex import pykat.exceptions as pkex
import collections
import warnings import warnings
import copy import copy
...@@ -63,7 +69,7 @@ class BaseDetector(object) : ...@@ -63,7 +69,7 @@ class BaseDetector(object) :
self._alternate_beam.append(False) self._alternate_beam.append(False)
self._requested_nodes.append(n) self._requested_nodes.append(n)
elif isinstance(nodes, str): elif isinstance(nodes, six.string_types):
# if we don't have a collection # if we don't have a collection
if nodes[-1]=='*': if nodes[-1]=='*':
self._alternate_beam.append(True) self._alternate_beam.append(True)
...@@ -151,7 +157,7 @@ class BaseDetector(object) : ...@@ -151,7 +157,7 @@ class BaseDetector(object) :
def _getScaleCmds(self, rtn): def _getScaleCmds(self, rtn):
if self.scale != None: if self.scale != None:
if isinstance(self.scale, str): if isinstance(self.scale, six.string_types):
rtn.append("scale {1} {0}".format(self.name, self.scale)) rtn.append("scale {1} {0}".format(self.name, self.scale))
elif isinstance(self.scale, (list, tuple)): elif isinstance(self.scale, (list, tuple)):
for s in self.scale: for s in self.scale:
...@@ -383,9 +389,11 @@ class pd(Detector1): ...@@ -383,9 +389,11 @@ class pd(Detector1):
fs = [self.__f1, self.__f2, self.__f3, self.__f4, self.__f5] fs = [self.__f1, self.__f2, self.__f3, self.__f4, self.__f5]
ps = [self.__phi1, self.__phi2, self.__phi3, self.__phi4, self.__phi5] ps = [self.__phi1, self.__phi2, self.__phi3, self.__phi4, self.__phi5]
print("-------------------------------------------------------")
for i in range(num_demods): for i in range(num_demods):
f = 'f{0}'.format(i+1) f = 'f{0}'.format(i+1)
print("i {0} fs {1} f {2} keys {3}".format(i,len(fs),f, kwargs.keys()))
if f in kwargs: if f in kwargs:
fs[i].value = kwargs[f] fs[i].value = kwargs[f]
...@@ -462,7 +470,7 @@ class pd(Detector1): ...@@ -462,7 +470,7 @@ class pd(Detector1):
# check if we are setting no phase that this is only on the last # check if we are setting no phase that this is only on the last
# demodulation phase. # demodulation phase.
raise pkex.BasePyKatException("Only last demodulation phase can be set to None") raise pkex.BasePyKatException("Only last demodulation phase can be set to None")
elif isinstance(value, str) and not isinstance(value,float) and value.lower() != "max": elif isinstance(value, six.string_types) and not isinstance(value,float) and value.lower() != "max":
raise pkex.BasePyKatException("Demodulation phase can only be set to a 'max' or a number (or None if the last demodulation phase)") raise pkex.BasePyKatException("Demodulation phase can only be set to a 'max' or a number (or None if the last demodulation phase)")
setattr(self, '_'+ self.__class__.__name__ +'__phi' + num, value) setattr(self, '_'+ self.__class__.__name__ +'__phi' + num, value)
......
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import pykat.external.six as six import pykat.external.six as six
if six.PY2: if six.PY2:
import exceptions import exceptions
......
...@@ -23,7 +23,11 @@ Contact at ddb@star.sr.bham.ac.uk ...@@ -23,7 +23,11 @@ Contact at ddb@star.sr.bham.ac.uk
@author: Daniel Brown @author: Daniel Brown
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import sys import sys
import os import os
import subprocess import subprocess
...@@ -52,6 +56,8 @@ from pykat.commands import Command, xaxis ...@@ -52,6 +56,8 @@ from pykat.commands import Command, xaxis
from pykat.SIfloat import * from pykat.SIfloat import *
from pykat.param import Param, AttrParam from pykat.param import Param, AttrParam
import pykat.external.six as six
import pykat.exceptions as pkex import pykat.exceptions as pkex
from pykat import USE_GUI, HAS_OPTIVIS, NoGUIException from pykat import USE_GUI, HAS_OPTIVIS, NoGUIException
...@@ -772,7 +778,7 @@ class kat(object): ...@@ -772,7 +778,7 @@ class kat(object):
# manually add the line to the block contents # manually add the line to the block contents
self.__blocks[self.__currentTag].contents.append(line) self.__blocks[self.__currentTag].contents.append(line)
if obj != None and not isinstance(obj, str): if obj != None and not isinstance(obj, six.string_types):
if self.hasNamedObject(obj.name): if self.hasNamedObject(obj.name):
getattr(self, obj.name).remove() getattr(self, obj.name).remove()
print("Removed existing object '{0}' of type {1} to add line '{2}'".format(obj.name, obj.__class__, line)) print("Removed existing object '{0}' of type {1} to add line '{2}'".format(obj.name, obj.__class__, line))
...@@ -1142,13 +1148,15 @@ class kat(object): ...@@ -1142,13 +1148,15 @@ class kat(object):
r.xlabel = hdr[0] r.xlabel = hdr[0]
r.ylabel = hdr[1] r.ylabel = hdr[1]
r.zlabels = map(str.strip, hdr[2:]) r.zlabels = [s.strip for s in hdr[2:]]
#r.zlabels = map(str.strip, hdr[2:])
else: else:
[r.x,r.y,hdr] = self.readOutFile(outfile) [r.x,r.y,hdr] = self.readOutFile(outfile)
r.xlabel = hdr[0] r.xlabel = hdr[0]
r.ylabels = map(str.strip, hdr[1:]) r.ylabels = [s.strip for s in hdr[1:]]
#r.ylabels = map(str.strip, hdr[1:]) // replaced 090415 adf
if save_kat: if save_kat:
if kat_name == None: if kat_name == None:
...@@ -1376,7 +1384,7 @@ class kat(object): ...@@ -1376,7 +1384,7 @@ class kat(object):
for key in self.__blocks: for key in self.__blocks:
objs = self.__blocks[key].contents objs = self.__blocks[key].contents
for obj in objs: for obj in objs:
if isinstance(obj, str): if isinstance(obj, six.string_types):
if fragment in obj: if fragment in obj:
print(" ** removing line '{0}'".format(obj)) print(" ** removing line '{0}'".format(obj))
objs.remove(obj) objs.remove(obj)
...@@ -1405,7 +1413,7 @@ class kat(object): ...@@ -1405,7 +1413,7 @@ class kat(object):
for key in self.__blocks: for key in self.__blocks:
objs = self.__blocks[key].contents objs = self.__blocks[key].contents
for obj in objs: for obj in objs:
if isinstance(obj, str): if isinstance(obj, six.string_types):
print(obj) print(obj)
found = True found = True
...@@ -1418,7 +1426,7 @@ class kat(object): ...@@ -1418,7 +1426,7 @@ class kat(object):
def writeBlock(): def writeBlock():
for obj in objs: for obj in objs:
if isinstance(obj, str): if isinstance(obj, six.string_types):
out.append(obj + '\n') out.append(obj + '\n')
elif isinstance(obj, Component) or isinstance(obj, Detector) or isinstance(obj, Command): elif isinstance(obj, Component) or isinstance(obj, Detector) or isinstance(obj, Command):
...@@ -1492,7 +1500,7 @@ class kat(object): ...@@ -1492,7 +1500,7 @@ class kat(object):
out.append("vacuum {0}\n".format(" ".join(objs))) out.append("vacuum {0}\n".format(" ".join(objs)))
elif isinstance(self.vacuum, str): elif isinstance(self.vacuum, six.string_types):
out.append("vacuum {0}\n".format(self.vacuum)) out.append("vacuum {0}\n".format(self.vacuum))
else: else:
pkex.BasePyKatException("Couldn't understand vacuum input list") pkex.BasePyKatException("Couldn't understand vacuum input list")
......
...@@ -4,7 +4,11 @@ Created on Sun Jan 27 10:02:41 2013 ...@@ -4,7 +4,11 @@ Created on Sun Jan 27 10:02:41 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
from pykat import USE_GUI, NoGUIException from pykat import USE_GUI, NoGUIException
if USE_GUI: if USE_GUI:
......
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals
import abc import abc
import pykat.exceptions as pkex import pykat.exceptions as pkex
import weakref import weakref
......
...@@ -4,6 +4,10 @@ Created on Sat Feb 02 10:35:04 2013 ...@@ -4,6 +4,10 @@ Created on Sat Feb 02 10:35:04 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import numpy as np import numpy as np
import matplotlib import matplotlib
...@@ -80,4 +84,4 @@ class pp(): ...@@ -80,4 +84,4 @@ class pp():
# for Palatino and other serif fonts use: # for Palatino and other serif fonts use:
#font = {'family':'serif','serif':['Palatino']} #font = {'family':'serif','serif':['Palatino']}
SCREEN_TITLE = True # show title on screen? SCREEN_TITLE = True # show title on screen?
PRINT_TITLE = False # show title in saved file? PRINT_TITLE = False # show title in saved file?
\ No newline at end of file
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import numpy as np import numpy as np
import pylab as pl import pylab as pl
...@@ -24,4 +29,4 @@ def plotReducedPerformanceData(perfdata, ordered=False): ...@@ -24,4 +29,4 @@ def plotReducedPerformanceData(perfdata, ordered=False):
pl.xlabel("Time [s]") pl.xlabel("Time [s]")
pl.title("Timing data for FINESSE") pl.title("Timing data for FINESSE")
return labels, times, fig return labels, times, fig
\ No newline at end of file
...@@ -4,7 +4,11 @@ Created on Mon Jan 28 12:00:29 2013 ...@@ -4,7 +4,11 @@ Created on Mon Jan 28 12:00:29 2013
@author: Daniel @author: Daniel
""" """
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
class Scale: class Scale:
linear = 'lin' linear = 'lin'
logarithmic = 'log' logarithmic = 'log'
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment