config/settings.properties

@@ -1,4 +1,4 @@
-#Tue Sep 22 10:38:41 CEST 2020
+#Tue Sep 22 10:55:47 CEST 2020
 HARMONIC_ID_1=1
 ENERGY=720.3
 OUTLIERS_THRESHOLD=1000000000

config/variables.properties

@@ -1,2 +1,2 @@
-#Tue Sep 22 10:12:44 CEST 2020
-FileSequentialNumber=2112
+#Tue Sep 22 11:22:50 CEST 2020
+FileSequentialNumber=2124

devices/image.properties

@@ -1,7 +1,7 @@
-#Thu Sep 17 16:34:32 CEST 2020
+#Tue Sep 22 11:17:20 CEST 2020
 spatialCalOffsetY=NaN
 spatialCalOffsetX=NaN
-colormapLogarithmic=true
+colormapLogarithmic=false
 scale=1.0
 grayscale=false
 spatialCalScaleX=NaN
@@ -19,7 +19,7 @@ spatialCalUnits=null
 flipVertically=false
 roiHeight=-1
 flipHorizontally=false
-colormapAutomatic=false
+colormapAutomatic=true
 roiY=0
 roiX=0
 transpose=false

plugins/Eiger.java

@@ -75,6 +75,7 @@ public class Eiger extends Panel {
         ((JSpinner.ListEditor) spinnerHar2.getEditor()).getTextField().setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         SwingUtils.setEnumCombo(comboID, ID.class, true);
         SwingUtils.setEnumCombo(comboSwitch, Switching.class, true);
+        comboSwitch.setSelectedIndex(1);
         SwingUtils.setEnumCombo(comboPol1, Polarization.class, true);
         SwingUtils.setEnumCombo(comboPol2, Polarization.class, true);
         SwingUtils.setEnumCombo(comboImgPol1, Polarization.class, true);
@@ -204,17 +205,18 @@ public class Eiger extends Panel {
         }
 
         if (editable) {
+            comboSwitch.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Pol.toString());
             comboImgPol1.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Pol.toString());
             comboImgPol2.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Pol.toString());
             spinnerImgEng1.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
-            spinnerImgEng2.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
+            spinnerImgEng2.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());            
         }
 
         buttonImgStart.setEnabled(getState() == State.Ready);
         buttonImgAbort.setEnabled(getState().isProcessing());
 
         buttonSpecStart.setEnabled(getState() == State.Ready);
-        buttonSpecAbort.setEnabled(getState().isProcessing());
+        buttonSpecAbort.setEnabled(getState().isProcessing());       
     }
 
     void updateRoiList() {

script/templates/EigerAbsSpec.py

@@ -11,6 +11,7 @@ if get_exec_pars().source == CommandSource.ui:
     RANGES = [[500.0, 1000.0, 100.0]]
 
 DRY_RUN = get_dry_run()
+log("ROIs: " + str(ROI))
 
 if len(RANGES) == 0: 
     raise Exception("No scan range defined")