Merge branch 'master' of gitlab.aei.uni-hannover.de:finesse/pykat

test/test_deepcopying_references.py → test/test_scripts/structural/test_deepcopying_references.py

@@ -30,10 +30,10 @@ assert(kat0.o1.f1 is not kat1.o1.f1)
 assert(kat0.o1.f1 == kat1.o1.f1)
 
 kat0.o1.f1 *= 2
-kat0.o1.phi1 *= 2
+kat0.o1.phase1 *= 2
 
 assert(isinstance(kat0.o1.f1, pykat.param.Param))
-assert(isinstance(kat0.o1.phi1, pykat.param.Param))
+assert(isinstance(kat0.o1.phase1, pykat.param.Param))
 assert(kat0.o1.f1 != kat1.o1.f1)
 
 kat1.o1.num_demods = 2

test/test_properties.py → test/test_scripts/structural/test_properties.py

@@ -15,8 +15,8 @@ assert(kat.pdr.f1 == 100)
 assert(type(kat.pdr.f1) is pykat.param.Param)
 
 kat.pdr.phi1 = "10u" 
-assert(kat.pdr.phi1 == 1e-5)
-assert(type(kat.pdr.phi1) is pykat.param.Param)
+assert(kat.pdr.phase1 == 1e-5)
+assert(type(kat.pdr.phase1) is pykat.param.Param)
 
 kat.m1.R = "10000u"
 assert(kat.m1.R == 0.01)
@@ -27,7 +27,7 @@ kat = deepcopy(kat)
 kat.m1.R = 0.9
 assert(kat.m1.R == 0.9)
 
-kat.pdr.phi1 = 20
-assert(kat.pdr.phi1 == 20)
+kat.pdr.phase1 = 20
+assert(kat.pdr.phase1 == 20)
 
-print "PASSED"
+print("PASSED")
\ No newline at end of file