pshell_config/x11ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eiger fixes

Browse Source
This commit is contained in:
gac-x11ma
2021-03-12 12:19:10 +01:00
parent 26abb23c10
commit e4d933c4be
237 changed files with 456426 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/DataAcquisition.java Normal file → Executable file
View File

@@ -187,6 +187,8 @@ public class DataAcquisition extends Panel {
spinnerImgEng2.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
spinnerImgEng1.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
checkSwitchPol.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
spinnerScans.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
labelScans.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
//panelSecondImage.setVisible(comboImgMethod.getSelectedItem() != ImgMethod.Take_Image.toString());
@@ -327,6 +329,7 @@ public class DataAcquisition extends Panel {
args.put("ENERGY_1", spinnerImgEng1.getValue());
args.put("ENERGY_2", spinnerImgEng2.getValue());
args.put("SWITCH_POL", checkSwitchPol.isSelected());
args.put("NUMBER_SCANS", (comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString()) ? ((Integer)spinnerScans.getValue()) : 1 );
runAsync("templates/Eiger2Img", args).handle((ret, t) -> {
if ((t != null) && (!getContext().isAborted())) {
@@ -467,6 +470,8 @@ public class DataAcquisition extends Panel {
labelSwitching1 = new javax.swing.JLabel();
comboSeq = new javax.swing.JComboBox<>();
checkSwitchPol = new javax.swing.JCheckBox();
labelScans = new javax.swing.JLabel();
spinnerScans = new javax.swing.JSpinner();
jPanel9 = new javax.swing.JPanel();
dvpEnergya3 = new ch.psi.pshell.swing.DeviceValuePanel();
dvpOffID1b = new ch.psi.pshell.swing.DeviceValuePanel();
@@ -901,6 +906,11 @@ public class DataAcquisition extends Panel {
checkSwitchPol.setText("Switch pol after scan");
labelScans.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
labelScans.setText("Scans:");
spinnerScans.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
@@ -921,7 +931,8 @@ public class DataAcquisition extends Panel {
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel20, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING))
.addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(labelScans, javax.swing.GroupLayout.Alignment.TRAILING))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -937,11 +948,12 @@ public class DataAcquisition extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addComponent(spinnerScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp, spinnerImgMeasurements});
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp, spinnerImgMeasurements, spinnerScans});
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSeq, comboSwitch});
@@ -970,6 +982,10 @@ public class DataAcquisition extends Panel {
.addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel9)
.addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(labelScans)
.addComponent(spinnerScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(checkImgAutosave)
@@ -979,7 +995,7 @@ public class DataAcquisition extends Panel {
jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {comboImgMethod, comboSeq, comboSwitch});
jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgExp, spinnerImgMeasurements});
jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgExp, spinnerImgMeasurements, spinnerScans});
javax.swing.GroupLayout panelImgControlsLayout = new javax.swing.GroupLayout(panelImgControls);
panelImgControls.setLayout(panelImgControlsLayout);
@@ -1829,6 +1845,7 @@ public class DataAcquisition extends Panel {
private javax.swing.JLabel labelOffID2a1;
private javax.swing.JLabel labelOffID2a2;
private javax.swing.JLabel labelOffID2b;
private javax.swing.JLabel labelScans;
private javax.swing.JLabel labelSwitching;
private javax.swing.JLabel labelSwitching1;
private javax.swing.JPanel panelImgControls;
@@ -1846,6 +1863,7 @@ public class DataAcquisition extends Panel {
private javax.swing.JSpinner spinnerImgExp;
private javax.swing.JSpinner spinnerImgMeasurements;
private javax.swing.JSpinner spinnerOutliersThreshold;
private javax.swing.JSpinner spinnerScans;
private javax.swing.JSpinner spinnerSpecAvg;
private javax.swing.JSpinner spinnerSpecExp;
private javax.swing.JSpinner spinnerSpecScans;