From dfdce45aef062be2d5d0be5b5c89a4a6fdacd8f9 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 25 Jan 2019 11:43:31 +0100 Subject: [PATCH] Closedown --- config/mail.properties | 2 +- config/mail.properties~ | 2 +- script/MultiRegion.py | 2 +- script/local.py | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/mail.properties b/config/mail.properties index c9618681..dc502453 100644 --- a/config/mail.properties +++ b/config/mail.properties @@ -5,5 +5,5 @@ host=smtpint.psi.ch port=0 pwd= smsSuffix=@sms.switch.ch -to=matthias.muntwiler@psi.ch;daria.sostina@psi.ch +to=matthias.muntwiler@psi.ch usr= diff --git a/config/mail.properties~ b/config/mail.properties~ index c33dc5a4..c9618681 100644 --- a/config/mail.properties~ +++ b/config/mail.properties~ @@ -5,5 +5,5 @@ host=smtpint.psi.ch port=0 pwd= smsSuffix=@sms.switch.ch -to=matthias.muntwiler@psi.ch;daria.sostina@psi.ch;oliver.groening@empa.ch;samuel.stolz@empa.ch +to=matthias.muntwiler@psi.ch;daria.sostina@psi.ch usr= diff --git a/script/MultiRegion.py b/script/MultiRegion.py index 44df876c..43ba4424 100644 --- a/script/MultiRegion.py +++ b/script/MultiRegion.py @@ -38,7 +38,7 @@ close_shutter_at_end: close beam shutter and turn off analyser at the end of the print("11") dir() -from local import trig_scienta +#from local import trig_scienta print("12") diff --git a/script/local.py b/script/local.py index e941a487..4b68b2f6 100644 --- a/script/local.py +++ b/script/local.py @@ -452,3 +452,5 @@ def get_plot_snapshots(title = None, file_type = "jpg", temp_path = get_context( p.saveSnapshot(file_name , file_type) ret.append(file_name) return ret + +import MultiRegion