diff --git a/config/setup.properties b/config/setup.properties
index 4851dd95..b75e291a 100644
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -7,7 +7,8 @@ configFileTasks={config}/tasks.properties
configFileUpdateStrategy={config}/update.properties
configPath={home}/config
contextPath={home}/context
-dataPath=~/Data1/pshell
+#~/Data1/pshell
+dataPath={home}/data
devicesPath={home}/devices
extensionsPath={home}/extensions
libraryPath={script}; {script}/Lib
diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index bd987395..18d44c1c 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -80,31 +80,25 @@
-
-
-
+
-
-
-
-
+
-
@@ -115,7 +109,7 @@
-
+
@@ -148,9 +142,7 @@
-
-
-
+
@@ -170,18 +162,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -206,7 +186,7 @@
-
+
@@ -214,19 +194,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -253,7 +220,7 @@
-
+
@@ -265,18 +232,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -301,17 +256,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -350,19 +294,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -376,7 +307,7 @@
-
+
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index 43b39be4..1f4dcede 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -61,15 +61,13 @@ public class HoloScan extends Panel {
spinnerStepSizePhi.setEnabled(enableControls && radioStepSize.isSelected());
spinnerStepsPhi.setEnabled(enableControls && radioSteps.isSelected());
- spinnerFromPhi.setEnabled(enableControls && radioAbsolute.isSelected());
- spinnerToPhi.setEnabled(enableControls && radioAbsolute.isSelected());
- spinnerRangePhi.setEnabled(enableControls && !radioAbsolute.isSelected());
+ spinnerFromPhi.setEnabled(enableControls);
+ spinnerToPhi.setEnabled(enableControls);
spinnerStepSizeTheta.setEnabled(spinnerStepSizePhi.isEnabled());
spinnerStepsTheta.setEnabled(spinnerStepsPhi.isEnabled());
spinnerFromTheta.setEnabled(spinnerFromPhi.isEnabled());
spinnerToTheta.setEnabled(spinnerToPhi.isEnabled());
- spinnerRangeTheta.setEnabled(spinnerRangePhi.isEnabled());
buttonScientaSetup.setEnabled(value);
}
@@ -83,13 +81,8 @@ public class HoloScan extends Panel {
}
}
args.put("SENSORS", sensors);
- if (radioRelative.isSelected()) {
- args.put("PHI_RANGE", new Double[]{-(Double) spinnerRangePhi.getValue() / 2, (Double) spinnerRangePhi.getValue() / 2});
- args.put("THETA_RANGE", new Double[]{-(Double) spinnerRangeTheta.getValue() / 2, (Double) spinnerRangeTheta.getValue() / 2});
- } else {
- args.put("PHI_RANGE", new Double[]{(Double) spinnerFromPhi.getValue(), (Double) spinnerToPhi.getValue()});
- args.put("THETA_RANGE", new Double[]{(Double) spinnerFromTheta.getValue(), (Double) spinnerToTheta.getValue()});
- }
+ args.put("PHI_RANGE", new Double[]{(Double) spinnerFromPhi.getValue(), (Double) spinnerToPhi.getValue()});
+ args.put("THETA_RANGE", new Double[]{(Double) spinnerFromTheta.getValue(), (Double) spinnerToTheta.getValue()});
ArrayList steps = new ArrayList();
if (radioStepSize.isSelected()) {
steps.add((Double) spinnerStepSizePhi.getValue());
@@ -100,7 +93,7 @@ public class HoloScan extends Panel {
}
args.put("STEPS", steps);
args.put("LATENCY", (Double) 0.0);
- args.put("RELATIVE", radioRelative.isSelected());
+ args.put("RELATIVE", false);
runAsync("HoloScan", args);
}
@@ -114,18 +107,14 @@ public class HoloScan extends Panel {
buttonGroup2 = new javax.swing.ButtonGroup();
panelPhi = new javax.swing.JPanel();
motorPanelPhi = new ch.psi.pshell.swing.MotorReadoutPanel();
- jLabel2 = new javax.swing.JLabel();
- spinnerRangePhi = new javax.swing.JSpinner();
radioStepSize = new javax.swing.JRadioButton();
radioSteps = new javax.swing.JRadioButton();
spinnerStepSizePhi = new javax.swing.JSpinner();
spinnerStepsPhi = new javax.swing.JSpinner();
- radioAbsolute = new javax.swing.JRadioButton();
spinnerFromPhi = new javax.swing.JSpinner();
jLabel4 = new javax.swing.JLabel();
jLabel5 = new javax.swing.JLabel();
spinnerToPhi = new javax.swing.JSpinner();
- radioRelative = new javax.swing.JRadioButton();
jLabel6 = new javax.swing.JLabel();
jLabel7 = new javax.swing.JLabel();
motorPanelTheta = new ch.psi.pshell.swing.MotorReadoutPanel();
@@ -133,8 +122,6 @@ public class HoloScan extends Panel {
jLabel9 = new javax.swing.JLabel();
spinnerFromTheta = new javax.swing.JSpinner();
spinnerToTheta = new javax.swing.JSpinner();
- jLabel10 = new javax.swing.JLabel();
- spinnerRangeTheta = new javax.swing.JSpinner();
jLabel11 = new javax.swing.JLabel();
jLabel12 = new javax.swing.JLabel();
spinnerStepSizeTheta = new javax.swing.JSpinner();
@@ -163,11 +150,6 @@ public class HoloScan extends Panel {
panelPhi.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners"));
panelPhi.setPreferredSize(new java.awt.Dimension(239, 538));
- jLabel2.setText("Range Phi:");
-
- spinnerRangePhi.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.001d, 100.0d, 1.0d));
- spinnerRangePhi.setEnabled(false);
-
buttonGroup1.add(radioStepSize);
radioStepSize.setSelected(true);
radioStepSize.setText("Step Size");
@@ -185,20 +167,11 @@ public class HoloScan extends Panel {
}
});
- spinnerStepSizePhi.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.001d, 10.0d, 0.1d));
+ spinnerStepSizePhi.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.1d, 180.0d, 0.1d));
spinnerStepsPhi.setModel(new javax.swing.SpinnerNumberModel(10, 1, 1000, 1));
spinnerStepsPhi.setEnabled(false);
- buttonGroup2.add(radioAbsolute);
- radioAbsolute.setSelected(true);
- radioAbsolute.setText("Absolute Scan");
- radioAbsolute.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- radioAbsoluteActionPerformed(evt);
- }
- });
-
spinnerFromPhi.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.0d, 1.0d, 1.0d));
jLabel4.setText("Phi From:");
@@ -207,14 +180,6 @@ public class HoloScan extends Panel {
spinnerToPhi.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.0d, 1.0d, 1.0d));
- buttonGroup2.add(radioRelative);
- radioRelative.setText("Relative Scan");
- radioRelative.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- radioAbsoluteActionPerformed(evt);
- }
- });
-
jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel6.setText("Phi:");
@@ -229,16 +194,11 @@ public class HoloScan extends Panel {
spinnerToTheta.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.0d, 1.0d, 1.0d));
- jLabel10.setText("Range Theta:");
-
- spinnerRangeTheta.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.001d, 100.0d, 1.0d));
- spinnerRangeTheta.setEnabled(false);
-
jLabel11.setText("Phi:");
jLabel12.setText("Theta:");
- spinnerStepSizeTheta.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.001d, 10.0d, 0.1d));
+ spinnerStepSizeTheta.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.1d, 90.0d, 0.1d));
jLabel13.setText("Phi:");
@@ -265,29 +225,23 @@ public class HoloScan extends Panel {
.addGroup(panelPhiLayout.createSequentialGroup()
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(radioSteps)
- .addComponent(radioStepSize)
- .addComponent(radioAbsolute)
- .addComponent(radioRelative))
+ .addComponent(radioStepSize))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
- .addGap(0, 16, Short.MAX_VALUE)
+ .addGap(0, 23, Short.MAX_VALUE)
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel5, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel8, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jLabel10, javax.swing.GroupLayout.Alignment.TRAILING))
+ .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(spinnerFromPhi, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(spinnerRangePhi, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerFromPhi, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 91, Short.MAX_VALUE)
.addComponent(spinnerToPhi, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerFromTheta, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(spinnerToTheta, javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(spinnerRangeTheta, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addComponent(spinnerToTheta, javax.swing.GroupLayout.Alignment.TRAILING)))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addComponent(jLabel11)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -309,7 +263,7 @@ public class HoloScan extends Panel {
panelPhiLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {radioStepSize, radioSteps});
- panelPhiLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerRangePhi, spinnerStepSizePhi, spinnerStepsPhi});
+ panelPhiLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerStepSizePhi, spinnerStepSizeTheta, spinnerStepsPhi});
panelPhiLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel6, jLabel7});
@@ -324,9 +278,7 @@ public class HoloScan extends Panel {
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel7)
.addComponent(motorPanelTheta, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(18, 18, 18)
- .addComponent(radioAbsolute)
- .addGap(3, 3, 3)
+ .addGap(43, 43, 43)
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerFromPhi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel4))
@@ -342,16 +294,6 @@ public class HoloScan extends Panel {
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerToTheta, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel8))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(radioRelative)
- .addGap(1, 1, 1)
- .addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(jLabel2)
- .addComponent(spinnerRangePhi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(1, 1, 1)
- .addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(jLabel10)
- .addComponent(spinnerRangeTheta, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(radioStepSize)
.addGap(3, 3, 3)
@@ -372,7 +314,7 @@ public class HoloScan extends Panel {
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerStepsTheta, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel14))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(100, Short.MAX_VALUE))
);
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
@@ -590,10 +532,6 @@ public class HoloScan extends Panel {
setEnabled(isEnabled());
}//GEN-LAST:event_radioStepSizeActionPerformed
- private void radioAbsoluteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioAbsoluteActionPerformed
- setEnabled(isEnabled());
- }//GEN-LAST:event_radioAbsoluteActionPerformed
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAbort;
private javax.swing.ButtonGroup buttonGroup1;
@@ -613,12 +551,10 @@ public class HoloScan extends Panel {
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkSpectrum;
private javax.swing.JCheckBox checkTotalCount;
- private javax.swing.JLabel jLabel10;
private javax.swing.JLabel jLabel11;
private javax.swing.JLabel jLabel12;
private javax.swing.JLabel jLabel13;
private javax.swing.JLabel jLabel14;
- private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
@@ -630,14 +566,10 @@ public class HoloScan extends Panel {
private ch.psi.pshell.swing.MotorReadoutPanel motorPanelTheta;
private javax.swing.JPanel panelPhi;
private javax.swing.JPanel panelSensors;
- private javax.swing.JRadioButton radioAbsolute;
- private javax.swing.JRadioButton radioRelative;
private javax.swing.JRadioButton radioStepSize;
private javax.swing.JRadioButton radioSteps;
private javax.swing.JSpinner spinnerFromPhi;
private javax.swing.JSpinner spinnerFromTheta;
- private javax.swing.JSpinner spinnerRangePhi;
- private javax.swing.JSpinner spinnerRangeTheta;
private javax.swing.JSpinner spinnerStepSizePhi;
private javax.swing.JSpinner spinnerStepSizeTheta;
private javax.swing.JSpinner spinnerStepsPhi;