From 076b810bf15c708d1c6a2818f8268251d7c8dd37 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Tue, 22 Sep 2020 13:48:22 +0200 Subject: [PATCH] --- config/settings.properties | 2 +- config/variables.properties | 4 ++-- devices/image.properties | 6 +++--- plugins/Eiger.java | 6 ++++-- script/templates/EigerAbsSpec.py | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/config/settings.properties b/config/settings.properties index 6cbd183..ca1b0c3 100644 --- a/config/settings.properties +++ b/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 diff --git a/config/variables.properties b/config/variables.properties index a2aafeb..93eb476 100644 --- a/config/variables.properties +++ b/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 diff --git a/devices/image.properties b/devices/image.properties index a87b011..3d1f437 100644 --- a/devices/image.properties +++ b/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 diff --git a/plugins/Eiger.java b/plugins/Eiger.java index 37b4ad8..f110958 100644 --- a/plugins/Eiger.java +++ b/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() { diff --git a/script/templates/EigerAbsSpec.py b/script/templates/EigerAbsSpec.py index add461a..d3eb238 100644 --- a/script/templates/EigerAbsSpec.py +++ b/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")