Skip to content

Commit 4388c69

Browse files
Clean up code after review
1 parent 5cdc614 commit 4388c69

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

softioc/device.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,11 @@ def _process(self, record):
223223
if record.PACT:
224224
return EPICS_OK
225225

226-
# Ignore memoized value, retrieve it from the VAL field directly later
226+
# Ignore memoized value, retrieve it from the VAL field instead
227+
value = self._read_value(record)
227228
_, severity, alarm = self._value
228-
229229
self.process_severity(record, severity, alarm)
230230

231-
value = self._read_value(record)
232231
if not self.__always_update and \
233232
self._compare_values(value, self._value[0]):
234233
# If the value isn't making a change then don't do anything.
@@ -288,12 +287,7 @@ def set(self, value, process=True,
288287
self.__enable_write = True
289288

290289
def get(self):
291-
if self._value[0] is None:
292-
# Before startup complete if no value set return default value
293-
value = self._default_value()
294-
else:
295-
value = self._value[0]
296-
return self._epics_to_value(value)
290+
return self._epics_to_value(self._value[0])
297291

298292

299293
def _Device(Base, record_type, ctype, dbf_type, epics_rc, mlst = False):

0 commit comments

Comments
 (0)