diff --git a/Readme.md b/Readme.md index e3a69c1..44f220c 100644 --- a/Readme.md +++ b/Readme.md @@ -118,15 +118,15 @@ ssh gac-cristall@saresc-cons-03 pw: ValToira_2021 ``` - - - - - - - - +4.10.22 final test: +------------------- ``` +zamofing_t@ganymede:~$ ssh gac-cristall@saresc-cons-03 +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX/ +conda activate /sf/cristallina/applications/conda/envs/crmx38 +python swissmx.py +``` + ----------------------------------- SCRATCH ----------------------------------- -0.952 diff --git a/app_config.py b/app_config.py index d46aa91..4398f1c 100644 --- a/app_config.py +++ b/app_config.py @@ -439,6 +439,13 @@ verbose bits: parent=param.parent() par_nm=parent.name() nm=param.name() + if par_nm in (AppCfg.DAQ_BS_CH, AppCfg.DAQ_PV_CH, AppCfg.DAQ_DET, AppCfg.DAQ_LOC): + # this hack must be doneto force a new allocation of a jungfrau object + _log.info('delete jungfrau object if existing') + try: + del app._jungfrau + except AttributeError: + pass if par_nm==AppCfg.GEO_BEAM_SZ: v = np.array(tuple(map(lambda x: x.value(),parent.children()))) cfg.setValue(par_nm,v) @@ -459,7 +466,7 @@ verbose bits: except TypeError: _log.warning(f'failed to parse {AppCfg.GEO_CAM_PARAM}:{d}') cfg.setValue(par_nm, d) - elif nm in(AppCfg.GEO_CAM_TRF): + elif nm == AppCfg.GEO_CAM_TRF: s=param.value() #https://docs.python.org/3/library/re.html#simulating-scanf + no grouping trf=np.array(tuple(map(float,re.findall('[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?',s)))).reshape(3,3) diff --git a/swissmx.py b/swissmx.py index f787552..4f8c207 100755 --- a/swissmx.py +++ b/swissmx.py @@ -2036,6 +2036,12 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) mft._tree.setData(grp.childItems()) def module_fix_target_del_all_obj(self): + app=QApplication.instance() + geo=app._geometry + try: #remove plane fitter if it esists + del geo._fitPlane + except AttributeError: + pass mft=self._moduleFixTarget vb=self.vb grp=self._goTracked