From 2c73e72037f5db7307252e87d1ef790a2fc38e54 Mon Sep 17 00:00:00 2001
From: gobbo_a <gobbo_a@sf-lc.psi.ch>
Date: Wed, 15 Nov 2017 14:02:54 +0100
Subject: [PATCH] Startup

---
 devices/cam1.properties          |  2 +-
 devices/cam2.properties          |  2 +-
 devices/cam3.properties          |  2 +-
 script/Tools/save_camera_data.py |  5 +++--
 script/local.py                  | 18 +++++++++---------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/devices/cam1.properties b/devices/cam1.properties
index 58e80df..b362142 100644
--- a/devices/cam1.properties
+++ b/devices/cam1.properties
@@ -1,4 +1,4 @@
-#Wed Nov 15 11:06:12 CET 2017
+#Wed Nov 15 14:02:48 CET 2017
 colormap=Temperature
 colormapAutomatic=true
 colormapMax=30000.0
diff --git a/devices/cam2.properties b/devices/cam2.properties
index d91eabd..c147201 100644
--- a/devices/cam2.properties
+++ b/devices/cam2.properties
@@ -1,4 +1,4 @@
-#Tue Nov 14 18:25:46 CET 2017
+#Wed Nov 15 14:02:48 CET 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=255.0
diff --git a/devices/cam3.properties b/devices/cam3.properties
index 0643247..527c316 100644
--- a/devices/cam3.properties
+++ b/devices/cam3.properties
@@ -1,4 +1,4 @@
-#Tue Nov 14 18:25:47 CET 2017
+#Wed Nov 15 14:02:49 CET 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=255.0
diff --git a/script/Tools/save_camera_data.py b/script/Tools/save_camera_data.py
index 1677537..4d074d0 100644
--- a/script/Tools/save_camera_data.py
+++ b/script/Tools/save_camera_data.py
@@ -8,7 +8,7 @@ import datetime
 
 
 if get_exec_pars().source == CommandSource.ui:
-    camera_name = "SARBD02-DSCR050_sp1" # "SLG-LCAM-C041_sp"
+    camera_name = "SARBD02-DSCR050" # "SLG-LCAM-C041_sp"
     shared = True
     images = 1
     interval = -1
@@ -23,7 +23,8 @@ else:
 run("Tools/CameraTools")        
 set_exec_pars(name="camera_snapshot")
 
-cam_server.start(camera_name, shared)
+
+cam_server.start(camera_name + "_sp1" if shared else camera_name, shared)
   
 if roi is not None and len(roi.strip())>0:
     roi = json.loads(roi)   
diff --git a/script/local.py b/script/local.py
index c7657fc..98513e1 100755
--- a/script/local.py
+++ b/script/local.py
@@ -310,15 +310,15 @@ def wait_cam_server_background(background, timeout = 10000):
 
 
 def get_camera_type(camera_name):
-    if camera_name.contains("LCAM"): return "LASER"
-    if camera_name.contains("DSCR") or \
-       camera_name.contains("DSRM") or \
-       camera_name.contains("DLAC"): return "ELECTRONS"
-    if camera_name.contains("PROF") or \
-       camera_name.contains("PPRM") or \
-       camera_name.contains("PSSS") or \
-       camera_name.contains("PSCR") or \
-       camera_name.contains("PSRD"): return "ELECTRONS"
+    if "LCAM" in camera_name: return "LASER"
+    if "DSCR" in camera_name or \
+       "DSRM" in camera_name or \
+       "DLAC" in camera_name: return "ELECTRONS"
+    if "PROF" in camera_name or \
+       "PPRM" in camera_name or \
+       "PSSS" in camera_name or \
+       "PSCR" in camera_name or \
+       "PSRD" in camera_name: return "ELECTRONS"
     return "UNKNOWN"