diff --git a/config/config.properties b/config/config.properties index c3380fe..69f30e7 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,22 +1,33 @@ -#Wed Nov 25 16:15:14 CET 2020 -hostName=null -userManagement=true +#Fri Dec 18 12:26:22 CET 2020 imageSourcesFile={config}/imaging.properties -instanceName=SIM autoSaveScanData=true simulation=false +commandExecutionEvents=true +logDaysToLive=7 +dataScanSaveOutput=false +userAuthenticator= +logLevelConsole=Off +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +notifiedTasks=EigerAbsSpec|Eiger2Img +parallelInitialization=true +scanStreamingPort=-1 +saveConsoleSessionFiles=false +devicePoolFile={config}/devices.properties +versionTrackingManual=true +hostName=null +userManagement=true +instanceName=SIM dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{seq}%04d_{name} serverEnabled=false -commandExecutionEvents=true -logDaysToLive=7 dataScanReleaseRecords=false depthDimension=0 dataScanPreserveTypes=false -dataScanSaveOutput=false logLevel=Info dataScanFlushRecords=true logPath={logs}/{date}_{time} @@ -24,19 +35,10 @@ dataLayout=table deviceUpdateStrategyFile={config}/update.properties terminalEnabled=false notificationLevel=Completion -userAuthenticator= -logLevelConsole=Off terminalPort=3579 tasksFile={config}/tasks.properties -scanStreamerPort=-1 -dataScanSaveScript=false -dataScanSaveSetpoints=false -parallelInitialization=true -scanStreamingPort=-1 createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot -devicePoolFile={config}/devices.properties -versionTrackingManual=true versionTrackingRemote=git@git.psi.ch\:pshell_config/x11ma.git dataProvider=txt saveCommandStatistics=false diff --git a/config/mail.properties b/config/mail.properties index 157fcdc..d4ab309 100644 --- a/config/mail.properties +++ b/config/mail.properties @@ -1,9 +1,9 @@ -#Mon Dec 14 22:10:27 CET 2020 +#Fri Dec 18 12:27:08 CET 2020 auth=None port=0 usr= smsSuffix=@sms.switch.ch host=smtpint.psi.ch from=pshell.sim@psi.ch -to=armin.kleibert@psi.ch +to=alexgobbo@gmail.com pwd= diff --git a/config/settings.properties b/config/settings.properties index df3914b..1ac0232 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Fri Dec 18 11:36:05 CET 2020 +#Fri Dec 18 13:35:02 CET 2020 HARMONIC_ID_1=1 RSYNC_USER= OUTLIERS_THRESHOLD=1000000000 diff --git a/plugins/Eiger.java b/plugins/Eiger.java index e0c587f..c28d99d 100644 --- a/plugins/Eiger.java +++ b/plugins/Eiger.java @@ -254,13 +254,18 @@ public class Eiger extends Panel { } } } catch (Exception ex){ - + showException(ex); } }//GEN-LAST:event_comboDepthActionPerformed private void buttonTriggerDetectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTriggerDetectorActionPerformed try { - evalAsync("eiger.start()"); + evalAsync("eiger.start()").handle((ret,ex)->{ + if (ex!=null){ + showException((Exception)ex); + } + return ret; + }); } catch (Exception ex) { showException(ex); } @@ -273,6 +278,7 @@ public class Eiger extends Panel { mode.write(value); } } catch (Exception ex){ + showException(ex); } }//GEN-LAST:event_comboModeActionPerformed @@ -282,13 +288,18 @@ public class Eiger extends Panel { exposure.write((Double)spinnerExpusure.getValue()); } } catch (Exception ex){ - + showException(ex); } }//GEN-LAST:event_spinnerExpusureStateChanged private void buttonStopDetectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStopDetectorActionPerformed try { - evalAsync("eiger.stop()"); + evalAsync("eiger.start()").handle((ret,ex)->{ + if (ex!=null){ + showException((Exception)ex); + } + return ret; + }); } catch (Exception ex) { showException(ex); }