result from merge with gerrit

secop subdir only

Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1

secop/persistent.py

@@ -55,7 +55,7 @@ class MyClass(PersistentMixin, ...):
 import os
 import json
 
-from secop.lib import getGeneralConfig
+from secop.lib import generalConfig
 from secop.datatypes import EnumType
 from secop.params import Parameter, Property, Command
 from secop.modules import HasAccessibles
@@ -69,7 +69,7 @@ class PersistentParam(Parameter):
 class PersistentMixin(HasAccessibles):
     def __init__(self, *args, **kwds):
         super().__init__(*args, **kwds)
-        persistentdir = os.path.join(getGeneralConfig()['logdir'], 'persistent')
+        persistentdir = os.path.join(generalConfig.logdir, 'persistent')
         os.makedirs(persistentdir, exist_ok=True)
         self.persistentFile = os.path.join(persistentdir, '%s.%s.json' % (self.DISPATCHER.equipment_id, self.name))
         self.initData = {}
@@ -103,6 +103,7 @@ class PersistentMixin(HasAccessibles):
                 try:
                     value = pobj.datatype.import_value(self.persistentData[pname])
                     pobj.value = value
+                    pobj.readerror = None
                     if not pobj.readonly:
                         writeDict[pname] = value
                 except Exception as e:
@@ -144,6 +145,6 @@ class PersistentMixin(HasAccessibles):
 
     @Command()
     def factory_reset(self):
-        """reset to initial values, forget persistent data"""
+        """reset to values from config / default values"""
         self.writeDict.update(self.initData)
         self.writeInitParams()