zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zebra:0.7.1
Branches Tags
zebra:main
zebra:0.7.11 zebra:0.7.10 zebra:0.7.9 zebra:0.7.8 zebra:0.7.7 zebra:0.7.6 zebra:0.7.5 zebra:0.7.4 zebra:0.7.3 zebra:0.7.2 zebra:0.7.1 zebra:0.7.0 zebra:0.6.5 zebra:0.6.4 zebra:0.6.3 zebra:0.6.2 zebra:0.6.1 zebra:0.6.0 zebra:0.5.2 zebra:0.5.1 zebra:0.5.0 zebra:0.4.0 zebra:0.3.2 zebra:0.3.1 zebra:0.3.0 zebra:0.2.2 zebra:0.2.1 zebra:0.2.0 zebra:0.1.3 zebra:0.1.2 zebra:0.1.1 zebra:0.1.0
..
compare: zebra:0.7.2
Branches Tags
zebra:main
zebra:0.7.11 zebra:0.7.10 zebra:0.7.9 zebra:0.7.8 zebra:0.7.7 zebra:0.7.6 zebra:0.7.5 zebra:0.7.4 zebra:0.7.3 zebra:0.7.2 zebra:0.7.1 zebra:0.7.0 zebra:0.6.5 zebra:0.6.4 zebra:0.6.3 zebra:0.6.2 zebra:0.6.1 zebra:0.6.0 zebra:0.5.2 zebra:0.5.1 zebra:0.5.0 zebra:0.4.0 zebra:0.3.2 zebra:0.3.1 zebra:0.3.0 zebra:0.2.2 zebra:0.2.1 zebra:0.2.0 zebra:0.1.3 zebra:0.1.2 zebra:0.1.1 zebra:0.1.0

2 Commits
0.7.1 ... 0.7.2

Author SHA1 Message Date
Ivan Usov
45b091f90b Updating for version 0.7.2 2022-10-10 09:14:48 +02:00
Ivan Usov
20fc969d60 Allow comma separator between motor steps values 2022-09-30 15:55:32 +02:00
2 changed files with 3 additions and 2 deletions
Expand all files Collapse all files

2
pyzebra/__init__.py
View File

@@ -6,4 +6,4 @@ from pyzebra.utils import *
from pyzebra.xtal import * from pyzebra.xtal import *
from pyzebra.sxtal_refgen import * from pyzebra.sxtal_refgen import *
__version__ = "0.7.1" __version__ = "0.7.2"

3
pyzebra/ccl_io.py
View File

@@ -204,7 +204,8 @@ def parse_1D(fileobj, data_type):
match = re.search("Scanning Variables: (.*), Steps: (.*)", next(fileobj)) match = re.search("Scanning Variables: (.*), Steps: (.*)", next(fileobj))
motors = [motor.lower() for motor in match.group(1).split(", ")] motors = [motor.lower() for motor in match.group(1).split(", ")]
steps = [float(step) for step in match.group(2).split()] # Steps can be separated by " " or ", "
steps = [float(step.strip(",")) for step in match.group(2).split()]
match = re.search("(.*) Points, Mode: (.*), Preset (.*)", next(fileobj)) match = re.search("(.*) Points, Mode: (.*), Preset (.*)", next(fileobj))
if match.group(2) != "Monitor": if match.group(2) != "Monitor":