2020-09-22 10:39:02 +02:00
parent 7f8ef858f4
commit 99586393b5
102 changed files with 7217 additions and 367 deletions
@@ -5,10 +5,8 @@ import ch.psi.pshell.imaging.Overlays.Rect;
 import ch.psi.pshell.imaging.Pen;
 import ch.psi.pshell.imaging.Renderer;
 import ch.psi.pshell.imaging.RendererListener;
-import ch.psi.pshell.swing.DevicePanel;
 import ch.psi.pshell.ui.App;
 import ch.psi.pshell.ui.Panel;
-import static ch.psi.pshell.ui.StripChart.FILE_EXTENSION;
 import ch.psi.utils.Arr;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
@@ -18,13 +16,12 @@ import java.awt.Point;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
@@ -164,7 +161,13 @@ public class Eiger extends Panel {
            spinnerHar2.setValue(har2);
            spinnerOff2.setValue(off2);        
            
-            
+            checkAutoValve.setSelected(String.valueOf(getSetting("AUTO_SWITCH_VALVE")).equalsIgnoreCase("true"));            
+            try{
+                spinnerOutliersThreshold.setValue(Integer.valueOf(getSetting("OUTLIERS_THRESHOLD")));
+            } catch (IOException ex) {
+                spinnerOutliersThreshold.setValue(0);
+            }
+            textOutliersMask.setText(String.valueOf(getSetting("OUTLIERS_MASK_FILE")));            
        } catch (IOException ex) {
            showException(ex);
        }
@@ -417,10 +420,10 @@ public class Eiger extends Panel {
        jLabel1 = new javax.swing.JLabel();
        panelBeamline = new javax.swing.JPanel();
        jLabel3 = new javax.swing.JLabel();
-        comboID = new javax.swing.JComboBox<String>();
+        comboID = new javax.swing.JComboBox<>();
        jPanel7 = new javax.swing.JPanel();
        jLabel5 = new javax.swing.JLabel();
-        comboPol1 = new javax.swing.JComboBox<String>();
+        comboPol1 = new javax.swing.JComboBox<>();
        jLabel6 = new javax.swing.JLabel();
        spinnerAlp1 = new javax.swing.JSpinner();
        jLabel7 = new javax.swing.JLabel();
@@ -429,7 +432,7 @@ public class Eiger extends Panel {
        spinnerOff1 = new javax.swing.JSpinner();
        jPanel9 = new javax.swing.JPanel();
        jLabel13 = new javax.swing.JLabel();
-        comboPol2 = new javax.swing.JComboBox<String>();
+        comboPol2 = new javax.swing.JComboBox<>();
        jLabel14 = new javax.swing.JLabel();
        spinnerAlp2 = new javax.swing.JSpinner();
        jLabel15 = new javax.swing.JLabel();
@@ -439,11 +442,19 @@ public class Eiger extends Panel {
        buttonApply = new javax.swing.JButton();
        jLabel27 = new javax.swing.JLabel();
        spinnerImgEng = new javax.swing.JSpinner();
+        checkAutoValve = new javax.swing.JCheckBox();
        panelNorm = new javax.swing.JPanel();
        buttonSetNorm = new javax.swing.JButton();
        textNorm = new javax.swing.JTextField();
        jLabel29 = new javax.swing.JLabel();
        buttonShowNorm = new javax.swing.JToggleButton();
+        panelNorm1 = new javax.swing.JPanel();
+        textSelectOutliersMask = new javax.swing.JButton();
+        textOutliersMask = new javax.swing.JTextField();
+        jLabel30 = new javax.swing.JLabel();
+        jLabel31 = new javax.swing.JLabel();
+        textClearOutliersMask = new javax.swing.JButton();
+        spinnerOutliersThreshold = new javax.swing.JSpinner();
        panelRoi = new javax.swing.JPanel();
        rendererRoi = new ch.psi.pshell.imaging.Renderer();
        jLabel26 = new javax.swing.JLabel();
@@ -463,7 +474,7 @@ public class Eiger extends Panel {
        jLabel9 = new javax.swing.JLabel();
        spinnerImgAvg1 = new javax.swing.JSpinner();
        jLabel10 = new javax.swing.JLabel();
-        comboImgPol1 = new javax.swing.JComboBox<String>();
+        comboImgPol1 = new javax.swing.JComboBox<>();
        jLabel11 = new javax.swing.JLabel();
        spinnerImgEng1 = new javax.swing.JSpinner();
        jPanel10 = new javax.swing.JPanel();
@@ -472,16 +483,16 @@ public class Eiger extends Panel {
        jLabel17 = new javax.swing.JLabel();
        spinnerImgAvg2 = new javax.swing.JSpinner();
        jLabel18 = new javax.swing.JLabel();
-        comboImgPol2 = new javax.swing.JComboBox<String>();
+        comboImgPol2 = new javax.swing.JComboBox<>();
        jLabel19 = new javax.swing.JLabel();
        spinnerImgEng2 = new javax.swing.JSpinner();
        jLabel21 = new javax.swing.JLabel();
        spinnerImgMeasurements = new javax.swing.JSpinner();
-        comboImgMethod = new javax.swing.JComboBox<String>();
+        comboImgMethod = new javax.swing.JComboBox<>();
        jLabel20 = new javax.swing.JLabel();
        checkImgAutosave = new javax.swing.JCheckBox();
        labelSwitching = new javax.swing.JLabel();
-        comboSwitch = new javax.swing.JComboBox<String>();
+        comboSwitch = new javax.swing.JComboBox<>();
        jPanel3 = new javax.swing.JPanel();
        panelSpectrum = new javax.swing.JPanel();
        jLabel23 = new javax.swing.JLabel();
@@ -622,13 +633,13 @@ public class Eiger extends Panel {
        jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
        jLabel3.setText("ID:");

-        comboID.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboID.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder("ID1"));

        jLabel5.setText("Polarization:");

-        comboPol1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboPol1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        jLabel6.setText("Alpha:");

@@ -690,7 +701,7 @@ public class Eiger extends Panel {

        jLabel13.setText("Polarization:");

-        comboPol2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboPol2.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        jLabel14.setText("Alpha:");

@@ -760,6 +771,13 @@ public class Eiger extends Panel {

        spinnerImgEng.setModel(new javax.swing.SpinnerNumberModel(1000.0d, 90.0d, 2520.0d, 1.0d));

+        checkAutoValve.setText("Auto Switch Valve");
+        checkAutoValve.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                checkAutoValveActionPerformed(evt);
+            }
+        });
+
        javax.swing.GroupLayout panelBeamlineLayout = new javax.swing.GroupLayout(panelBeamline);
        panelBeamline.setLayout(panelBeamlineLayout);
        panelBeamlineLayout.setHorizontalGroup(
@@ -776,7 +794,8 @@ public class Eiger extends Panel {
                            .addGroup(panelBeamlineLayout.createSequentialGroup()
                                .addComponent(jLabel27)
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addComponent(checkAutoValve))
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                        .addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                        .addGap(18, 18, 18)
@@ -796,7 +815,7 @@ public class Eiger extends Panel {
            panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelBeamlineLayout.createSequentialGroup()
                .addContainerGap()
-                .addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                    .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(jPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addGroup(panelBeamlineLayout.createSequentialGroup()
@@ -807,7 +826,9 @@ public class Eiger extends Panel {
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                            .addComponent(jLabel27)
-                            .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                            .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(checkAutoValve)))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addComponent(buttonApply)
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@@ -869,6 +890,86 @@ public class Eiger extends Panel {
                .addContainerGap())
        );

+        panelNorm1.setBorder(javax.swing.BorderFactory.createTitledBorder("Outliers"));
+
+        textSelectOutliersMask.setText("Select");
+        textSelectOutliersMask.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                textSelectOutliersMaskActionPerformed(evt);
+            }
+        });
+
+        textOutliersMask.setEditable(false);
+        textOutliersMask.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyTyped(java.awt.event.KeyEvent evt) {
+                textOutliersMaskKeyTyped(evt);
+            }
+            public void keyReleased(java.awt.event.KeyEvent evt) {
+                textOutliersMaskKeyReleased(evt);
+            }
+        });
+
+        jLabel30.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+        jLabel30.setText("Mask File:");
+
+        jLabel31.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+        jLabel31.setText("Threshold:");
+
+        textClearOutliersMask.setText("Clear");
+        textClearOutliersMask.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                textClearOutliersMaskActionPerformed(evt);
+            }
+        });
+
+        spinnerOutliersThreshold.setModel(new javax.swing.SpinnerNumberModel(Long.valueOf(0L), Long.valueOf(0L), Long.valueOf(1000000000000L), Long.valueOf(1L)));
+        spinnerOutliersThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+            public void stateChanged(javax.swing.event.ChangeEvent evt) {
+                spinnerOutliersThresholdStateChanged(evt);
+            }
+        });
+
+        javax.swing.GroupLayout panelNorm1Layout = new javax.swing.GroupLayout(panelNorm1);
+        panelNorm1.setLayout(panelNorm1Layout);
+        panelNorm1Layout.setHorizontalGroup(
+            panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(panelNorm1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(panelNorm1Layout.createSequentialGroup()
+                        .addComponent(jLabel30)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(textOutliersMask)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(textClearOutliersMask)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(textSelectOutliersMask))
+                    .addGroup(panelNorm1Layout.createSequentialGroup()
+                        .addComponent(jLabel31)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(spinnerOutliersThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(0, 0, Short.MAX_VALUE)))
+                .addContainerGap())
+        );
+
+        panelNorm1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel30, jLabel31});
+
+        panelNorm1Layout.setVerticalGroup(
+            panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(panelNorm1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel30)
+                    .addComponent(textOutliersMask, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(textSelectOutliersMask)
+                    .addComponent(textClearOutliersMask))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel31)
+                    .addComponent(spinnerOutliersThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap())
+        );
+
        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
        jPanel1.setLayout(jPanel1Layout);
        jPanel1Layout.setHorizontalGroup(
@@ -878,7 +979,8 @@ public class Eiger extends Panel {
                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(panelDataFile, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(panelBeamline, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(panelNorm1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                .addContainerGap())
        );
        jPanel1Layout.setVerticalGroup(
@@ -888,6 +990,8 @@ public class Eiger extends Panel {
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(panelNorm, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(panelNorm1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(panelBeamline, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );
@@ -991,7 +1095,7 @@ public class Eiger extends Panel {
                        .addGap(18, 18, 18)
                        .addComponent(jLabel26)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE)
+                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -1029,7 +1133,7 @@ public class Eiger extends Panel {

        jLabel10.setText("Polarization:");

-        comboImgPol1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboImgPol1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        jLabel11.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
        jLabel11.setText("Energy:");
@@ -1094,7 +1198,7 @@ public class Eiger extends Panel {

        jLabel18.setText("Polarization:");

-        comboImgPol2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboImgPol2.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        jLabel19.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
        jLabel19.setText("Energy:");
@@ -1150,7 +1254,7 @@ public class Eiger extends Panel {

        spinnerImgMeasurements.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10000, 1));

-        comboImgMethod.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboImgMethod.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
        comboImgMethod.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                comboImgMethodActionPerformed(evt);
@@ -1165,7 +1269,7 @@ public class Eiger extends Panel {

        labelSwitching.setText("Switching:");

-        comboSwitch.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        comboSwitch.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        javax.swing.GroupLayout panelImgControlsLayout = new javax.swing.GroupLayout(panelImgControls);
        panelImgControls.setLayout(panelImgControlsLayout);
@@ -1240,7 +1344,7 @@ public class Eiger extends Panel {
            .addGroup(jPanel2Layout.createSequentialGroup()
                .addGap(18, 18, 18)
                .addComponent(panelImgControls, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 236, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 304, Short.MAX_VALUE)
                .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(buttonImgStart)
                    .addComponent(buttonImgAbort))
@@ -1255,6 +1359,7 @@ public class Eiger extends Panel {
        jLabel24.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
        jLabel24.setText("Average:");

+        checkSpecSaveImages.setSelected(true);
        checkSpecSaveImages.setText("Save images");

        spinnerSpecAvg.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
@@ -1386,9 +1491,9 @@ public class Eiger extends Panel {
                        .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                            .addComponent(jLabel25)
                            .addComponent(spinnerSpecScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 93, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 126, Short.MAX_VALUE)
                        .addComponent(checkSpecSwitchPol)
-                        .addGap(0, 86, Short.MAX_VALUE))
+                        .addGap(0, 121, Short.MAX_VALUE))
                    .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                .addContainerGap())
        );
@@ -1621,7 +1726,7 @@ public class Eiger extends Panel {
    }//GEN-LAST:event_buttonShowDetectorPanelActionPerformed

    private void buttonShowNormActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonShowNormActionPerformed
-           try{
+        try{
            this.enableNorm( buttonShowNorm.isSelected());
            buttonShowNorm.setText(buttonShowNorm.isSelected() ? "Hide" : "Show");
        } catch (Exception ex){
@@ -1629,6 +1734,56 @@ public class Eiger extends Panel {
        }
    }//GEN-LAST:event_buttonShowNormActionPerformed

+    private void checkAutoValveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkAutoValveActionPerformed
+       try{
+            setSetting("AUTO_SWITCH_VALVE", checkAutoValve.isSelected());
+        } catch (Exception ex){
+            showException (ex);
+        }
+    }//GEN-LAST:event_checkAutoValveActionPerformed
+
+    private void textSelectOutliersMaskActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textSelectOutliersMaskActionPerformed
+        try{    
+            JFileChooser chooser = new JFileChooser(getContext().getSetup().expandPath(getContext().getConfig().dataPath));
+            FileNameExtensionFilter filter = new FileNameExtensionFilter("Image File", "tif", "tiff");
+            chooser.setFileFilter(filter);
+            chooser.setFileHidingEnabled(true);
+
+            int rVal = chooser.showOpenDialog(this);
+            if (rVal == JFileChooser.APPROVE_OPTION) {
+                textOutliersMask.setText(chooser.getSelectedFile().getAbsoluteFile().toString());
+                this.setSetting("OUTLIERS_MASK_FILE", textOutliersMask.getText());
+            }
+        } catch (Exception ex){
+            showException (ex);            
+        }    
+    }//GEN-LAST:event_textSelectOutliersMaskActionPerformed
+
+    private void textOutliersMaskKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_textOutliersMaskKeyTyped
+        // TODO add your handling code here:
+    }//GEN-LAST:event_textOutliersMaskKeyTyped
+
+    private void textOutliersMaskKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_textOutliersMaskKeyReleased
+        // TODO add your handling code here:
+    }//GEN-LAST:event_textOutliersMaskKeyReleased
+
+    private void textClearOutliersMaskActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textClearOutliersMaskActionPerformed
+        try{                
+            setSetting("OUTLIERS_MASK_FILE", null);
+            textOutliersMask.setText("");
+        } catch (Exception ex){
+            showException (ex);            
+        }   
+    }//GEN-LAST:event_textClearOutliersMaskActionPerformed
+
+    private void spinnerOutliersThresholdStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerOutliersThresholdStateChanged
+        try{    
+            setSetting("OUTLIERS_THRESHOLD", spinnerOutliersThreshold.getValue());
+        } catch (Exception ex){
+            showException (ex);            
+        }  
+    }//GEN-LAST:event_spinnerOutliersThresholdStateChanged
+
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton buttonAdd;
    private javax.swing.JButton buttonApply;
@@ -1648,6 +1803,7 @@ public class Eiger extends Panel {
    private javax.swing.JButton buttonTriggerDetector;
    private javax.swing.JButton buttonUndoPath;
    private javax.swing.JButton buttonUndoSeq;
+    private javax.swing.JCheckBox checkAutoValve;
    private javax.swing.JCheckBox checkImgAutosave;
    private javax.swing.JCheckBox checkSpecSaveImages;
    private javax.swing.JCheckBox checkSpecSaveSpectrum;
@@ -1681,6 +1837,8 @@ public class Eiger extends Panel {
    private javax.swing.JLabel jLabel27;
    private javax.swing.JLabel jLabel29;
    private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel30;
+    private javax.swing.JLabel jLabel31;
    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel5;
    private javax.swing.JLabel jLabel6;
@@ -1703,6 +1861,7 @@ public class Eiger extends Panel {
    private javax.swing.JPanel panelDataFile;
    private javax.swing.JPanel panelImgControls;
    private javax.swing.JPanel panelNorm;
+    private javax.swing.JPanel panelNorm1;
    private javax.swing.JPanel panelRoi;
    private javax.swing.JPanel panelSpectrum;
    private ch.psi.pshell.imaging.Renderer rendererRoi;
@@ -1720,13 +1879,17 @@ public class Eiger extends Panel {
    private javax.swing.JSpinner spinnerImgMeasurements;
    private javax.swing.JSpinner spinnerOff1;
    private javax.swing.JSpinner spinnerOff2;
+    private javax.swing.JSpinner spinnerOutliersThreshold;
    private javax.swing.JSpinner spinnerSeq;
    private javax.swing.JSpinner spinnerSpecAvg;
    private javax.swing.JSpinner spinnerSpecExp;
    private javax.swing.JSpinner spinnerSpecScans;
    private javax.swing.JTable tableRegions;
    private javax.swing.JTable tableRoi;
+    private javax.swing.JButton textClearOutliersMask;
    private javax.swing.JTextField textDataPath;
    private javax.swing.JTextField textNorm;
+    private javax.swing.JTextField textOutliersMask;
+    private javax.swing.JButton textSelectOutliersMask;
    // End of variables declaration//GEN-END:variables
 }