From 6048ab2c3400ff9a6dff5980d6ba0afe6d7305fd Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-02.psi.ch>
Date: Thu, 17 Dec 2020 09:30:42 +0100
Subject: [PATCH]

---
 config/plugins.properties                    | 4 ++--
 config/settings.properties                   | 2 +-
 devices/image.properties                     | 4 ++--
 plugins/{Eiger.form => DataAcquisition.form} | 0
 plugins/{Eiger.java => DataAcquisition.java} | 4 ++--
 plugins/{Experiment.form => Settings.form}   | 0
 plugins/{Experiment.java => Settings.java}   | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename plugins/{Eiger.form => DataAcquisition.form} (100%)
 rename plugins/{Eiger.java => DataAcquisition.java} (98%)
 rename plugins/{Experiment.form => Settings.form} (100%)
 rename plugins/{Experiment.java => Settings.java} (99%)

diff --git a/config/plugins.properties b/config/plugins.properties
index cc2997e..a690305 100644
--- a/config/plugins.properties
+++ b/config/plugins.properties
@@ -4,7 +4,7 @@ DelayScanBase.java=enabled
 EnergyScan_TBT.java=enabled
 DelayScan.java=enabled
 EnergyScan.java=enabled
-Eiger.java=enabled
+DataAcquisition.java=enabled
 Beamline.java=enabled
-Experiment.java=enabled
+Settings.java=enabled
 Test.java=disabled
diff --git a/config/settings.properties b/config/settings.properties
index 6ff1692..1d8a79a 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Wed Dec 16 10:44:12 CET 2020
+#Thu Dec 17 09:26:47 CET 2020
 HARMONIC_ID_1=1
 RSYNC_USER=
 OUTLIERS_THRESHOLD=1000000000
diff --git a/devices/image.properties b/devices/image.properties
index 8a3f660..4144a4f 100644
--- a/devices/image.properties
+++ b/devices/image.properties
@@ -1,4 +1,4 @@
-#Wed Nov 25 21:29:46 CET 2020
+#Wed Dec 16 18:09:54 CET 2020
 spatialCalOffsetY=NaN
 spatialCalOffsetX=NaN
 colormapLogarithmic=false
@@ -6,7 +6,7 @@ scale=1.0
 grayscale=false
 spatialCalScaleX=NaN
 spatialCalScaleY=NaN
-colormapMax=2000.0
+colormapMax=2.0
 rescaleOffset=0.0
 roiWidth=-1
 colormap=Grayscale
diff --git a/plugins/Eiger.form b/plugins/DataAcquisition.form
similarity index 100%
rename from plugins/Eiger.form
rename to plugins/DataAcquisition.form
diff --git a/plugins/Eiger.java b/plugins/DataAcquisition.java
similarity index 98%
rename from plugins/Eiger.java
rename to plugins/DataAcquisition.java
index 79fe6f9..b363b3d 100644
--- a/plugins/Eiger.java
+++ b/plugins/DataAcquisition.java
@@ -42,7 +42,7 @@ import javax.swing.table.DefaultTableModel;
 /**
  *
  */
-public class Eiger extends Panel {
+public class DataAcquisition extends Panel {
 
     public enum Switching {
         Normal,
@@ -77,7 +77,7 @@ public class Eiger extends Panel {
     final DefaultTableModel modelRegions;
     final DefaultTableModel modelRois;
 
-    public Eiger() {
+    public DataAcquisition() {
         initComponents();
         SwingUtils.setEnumCombo(comboSwitch, Switching.class, true);
         comboSwitch.setSelectedIndex(1);
diff --git a/plugins/Experiment.form b/plugins/Settings.form
similarity index 100%
rename from plugins/Experiment.form
rename to plugins/Settings.form
diff --git a/plugins/Experiment.java b/plugins/Settings.java
similarity index 99%
rename from plugins/Experiment.java
rename to plugins/Settings.java
index b594d9c..f56d810 100644
--- a/plugins/Experiment.java
+++ b/plugins/Settings.java
@@ -13,12 +13,12 @@ import javax.swing.SwingUtilities;
 /**
  *
  */
-public class Experiment extends Panel {
+public class Settings extends Panel {
 
     //static String DEFAULT_PATH = "{data}/{year}_{month}/{date}_{seq}%03d";
     static String DEFAULT_PATH = "{data}/{year}_{month}/{date}/{date}_{seq}%04d_{name}";
 
-    public Experiment() {
+    public Settings() {
         initComponents();
         updateRsync();
         SwingUtils.setEnumCombo(comboNotification, NotificationLevel.class);