Skip to content

Commit d81bc2a

Browse files
committed
correct error in bl.py
1 parent fc1519f commit d81bc2a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

include/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define OSCARS_VMAJOR 2
55
#define OSCARS_VMINOR 0
6-
#define OSCARS_REVISION 19
6+
#define OSCARS_REVISION 20
77
#define OSCARS_RELEASE NULL
88

99
#endif

oscars/bl.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,13 @@ def __init__ (self, facility, beamline, device, current=None, base_path=None, gp
129129
self.phase_mode = None
130130
if 'general' in self.config:
131131
g = self.config['general']
132-
if 'name' in g: self.name = g['name'] else self.name = self.device
132+
133+
# Try to grab name
134+
if 'name' in g:
135+
self.name = g['name']
136+
else:
137+
self.name = self.device
138+
133139
if 'default_mode' in g: self.phase_mode = g['default_mode']
134140
else:
135141
self.phase_mode = 'planar'

0 commit comments

Comments
 (0)