diff --git a/script/test/MultipleXES2.py b/script/test/MultipleXES2.py index 54b464c..6761216 100644 --- a/script/test/MultipleXES2.py +++ b/script/test/MultipleXES2.py @@ -1,24 +1,24 @@ -positions = [ ("test1" ,10,0), \ - ("test2" ,-1,1.5), \ - ("test3" ,-17,1.5), \ - ("test4" ,15,11), \ - ("test5" ,-3,11), \ - ("test6" ,-16,12), \ - ("test7" ,10.2,0.2), \ - ("test8" ,-1.2,1.7), \ - ("test9" ,-17.2,1.7), \ - ("test10" ,15.2,11.2), \ - ("test11" ,-3.2,11.2), \ - ("test12" ,-16.2,12.2)] - +positions = [ ("SrTaO2N" ,2.8,1), \ + ("KTaO3" ,-13.2,1), \ + ("BaTaO2N" ,2.8,8.0), \ + ("BaTaO" ,-13.2,10), \ + ("SrTaO2N-2" ,3.0,1.2), \ + ("KTaO3-2" ,-13.4,1.2), \ + ("BaTaO2N-2" ,3.0,8.2), \ + ("BaTaO-2" ,-13.4,10.2), \ + ("SrTaO2N-3" ,2.6,1.1), \ + ("KTaO3-3" ,-13.0,1.1), \ + ("BaTaO2N-3" ,2.6,8.1), \ + ("BaTaO-3" ,-13.4,10.2) ] + for pos in positions: caput("X10DA-ES1-MA1:TRX", pos[1]) caput("X10DA-ES1-MA1:TRY", pos[2] ) set_exec_pars(name = pos[0], reset = True) - run_fda("users/20190827_Craig/RXES_sampleTest2.xml") - caput("X10DA-OP-MO3:BraggEAO.VAL", 5.05) - run_fda("users/20190827_Craig/XES_test.xml") + run_fda("users/20190827_Craig/RXES_Ta.xml") + caput("X10DA-OP-MO3:BraggEAO.VAL", 9.99) + run_fda("users/20190827_Craig/XES_test_Ta.xml")