diff --git a/script/test/MultipleXES2.py b/script/test/MultipleXES2.py index 6761216..e42c1b9 100644 --- a/script/test/MultipleXES2.py +++ b/script/test/MultipleXES2.py @@ -1,24 +1,43 @@ -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) ] - +positions = [ ("Nb Foil calib", "Nb foil XAS", "Nb foil XES" , 10,1), \ + ("CaNbO2N calib", "CaNbO2N XAS", "CaNbO2N XES" , -3,1), \ + ("Ca2Nb2O7 calib", "Ca2Nb2O7 XAS", "Ca2Nb2O7 XES" , -14,1), \ + ("Nb2O5 calib", "Nb2O5 XAS", "Nb2O5 XES" , -5,9), \ + ("LiNbO3 calib", "LiNbO3 XAS", "LiNbO3 XES" , -14,9), \ + ("Nb Foilv2 calib", "Nb Foilv2 XAS", "Nb Foilv2 XES" , 10.2,1.2), \ + ("CaNbO2Nv2 calib", "CaNbO2Nv2 XAS", "CaNbO2Nv2 XES" , -3.2,1.2), \ + ("Ca2Nb2O7v2 calib", "Ca2Nb2O7v2 XAS", "Ca2Nb2O7v2 XES" , -14.2,1.2), \ + ("Nb2O5v2 calib", "Nb2O5v2 XAS", "Nb2O5v2 XES" , -5.2,9.2), \ + ("LiNbO3v2 calib", "LiNbO3v2 XAS", "LiNbO3v2 XES" , -14.2,9.2), \ + ("Nb Foilv3 calib", "Nb foilv3 XAS", "Nb foilv3 XES" , 9.8,0.8), \ + ("CaNbO2Nv3 calib", "CaNbO2Nv3 XAS", "CaNbO2Nv3 XES" , -2.8,0.8), \ + ("Ca2Nb2O7v3 calib", "Ca2Nb2O7v3 XAS", "Ca2Nb2O7v3 XES" , -13.8,0.8), \ + ("Nb2O5v3 calib", "Nb2O5v3 XAS", "Nb2O5v3 XES" , -4.8,8.8), \ + ("LiNbO3v3 calib", "LiNbO3v3 XAS", "LiNbO3v3 XES" , -13.8,8.8), \ + ("Nb Foilv4 calib", "Nb foilv4 XAS", "Nb foilv4 XES" , 10.3,1.3), \ + ("CaNbO2Nv4 calib", "CaNbO2Nv4 XAS", "CaNbO2Nv4 XES" , -3.3,1.3), \ + ("Ca2Nb2O7v4 calib", "Ca2Nb2O7v4 XAS", "Ca2Nb2O7v4 XES" , -14.3,1.3), \ + ("Nb2O5v4 calib", "Nb2O5v4 XAS", "Nb2O5v4 XES" , -5.3,9.3), \ + ("LiNbO3v4 calib", "LiNbO3v4 XAS", "LiNbO3v4 XES" , -14.3,9.3), \ + ("Nb Foilv5 calib", "Nb foilv5 XAS", "Nb foilv5 XES" , 9.7,0.7), \ + ("CaNbO2Nv5 calib", "CaNbO2Nv5 XAS", "CaNbO2Nv5 XES" , -2.7,0.7), \ + ("Ca2Nb2O7v5 calib", "Ca2Nb2O7v5 XAS", "Ca2Nb2O7v5 XES" , -13.7,0.7), \ + ("Nb2O5v5 calib", "Nb2O5v5 XAS", "Nb2O5v5 XES" , -4.7,8.7), \ + ("LiNbO3v5 calib", "LiNbO3v5 XAS", "LiNbO3v5 XES" , -13.7,8.7) ] + + + + + for pos in positions: - caput("X10DA-ES1-MA1:TRX", pos[1]) - caput("X10DA-ES1-MA1:TRY", pos[2] ) + caput("X10DA-ES1-MA1:TRX", pos[3]) + caput("X10DA-ES1-MA1:TRY", pos[4] ) set_exec_pars(name = pos[0], reset = True) - 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") + run_fda("users/20190827_Craig/RXES_Nb_calib.xml") + set_exec_pars(name = pos[1], reset = True) + run_fda("users/20190827_Craig/RXES_Nb_XAS.xml") + set_exec_pars(name = pos[2], reset = True) + run_fda("users/20190827_Craig/XES_Nb.xml")