diff --git a/config/config.properties b/config/config.properties index 5fe77cad..4867b925 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Sep 23 11:08:48 CEST 2020 +#Tue Sep 29 14:05:44 CEST 2020 hostName=x03da-cons-1 userManagement=false instanceName=x03da @@ -8,7 +8,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/ravnik/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false commandExecutionEvents=false logDaysToLive=50 diff --git a/config/settings.properties b/config/settings.properties index 13aae060..84c11bce 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Wed Sep 23 11:08:48 CEST 2020 -pgroup=p18729 +#Tue Sep 29 14:05:44 CEST 2020 +pgroup=p17274 proposal= -proposer=ravnik +proposer=bl-dev prefix= -sample=TaS2 -authors=Jan Ravnik|Matthias Muntwiler +sample=test +authors=Matthias Muntwiler diff --git a/config/variables.properties b/config/variables.properties index 12361f14..df60bf40 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Sep 29 04:35:37 CEST 2020 -FileSequentialNumber=4768 +#Tue Sep 29 14:38:50 CEST 2020 +FileSequentialNumber=4770 diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form index e25d4422..356c5be6 100644 --- a/plugins/XPSSpectrum.form +++ b/plugins/XPSSpectrum.form @@ -337,7 +337,9 @@ - + + + @@ -357,6 +359,7 @@ + @@ -429,6 +432,11 @@ + + + + + diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index 84eb8ba0..6c835273 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -120,7 +120,7 @@ public class XPSSpectrum extends Panel { tableChangeListener = new SwingUtils.TableChangeListener(rangeSelectionPanel.getTable()) { @Override protected void onTableChange(int row, int column, Object value, Object former) { - if (column == indexEph){ + if ((checkCIS.isSelected()) && (column == indexEph)){ try{ if (!isDefined (value)){ value = XPSSpectrum.this.getDevice("Eph").take(); @@ -365,6 +365,7 @@ public class XPSSpectrum extends Panel { ; buttonAbort = new javax.swing.JButton(); buttonSkip = new javax.swing.JButton(); + checkCIS = new javax.swing.JCheckBox(); panelArguments.setBorder(javax.swing.BorderFactory.createTitledBorder("Arguments")); @@ -591,6 +592,8 @@ public class XPSSpectrum extends Panel { } }); + checkCIS.setText("Constant Initial State"); + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( @@ -608,7 +611,9 @@ public class XPSSpectrum extends Panel { .addComponent(buttonInitialScan) .addGap(18, 18, 18) .addComponent(buttonDetailedScan, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 13, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(checkCIS) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(buttonSkip) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(buttonAbort)) @@ -626,7 +631,8 @@ public class XPSSpectrum extends Panel { .addComponent(buttonInitialScan) .addComponent(buttonDetailedScan) .addComponent(buttonAbort) - .addComponent(buttonSkip)) + .addComponent(buttonSkip) + .addComponent(checkCIS)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(rangeSelectionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) @@ -794,6 +800,7 @@ public class XPSSpectrum extends Panel { private javax.swing.JButton buttonInitialScan; private javax.swing.JButton buttonScientaSetup; private javax.swing.JButton buttonSkip; + private javax.swing.JCheckBox checkCIS; private javax.swing.JCheckBox checkEndScan; private javax.swing.JCheckBox checkSaveImage; private javax.swing.JComboBox comboPass; diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index f9d7f02e..ae8cf7b0 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -23,6 +23,7 @@ for cur_range in range(len(ranges)): ar = [round(r.min / r.vars[1]) * r.vars[1], round(r.max / r.vars[1]) * r.vars[1]] adjusted_ranges.append(ar) +1/0 set_exec_pars(open = True) create_metadata_datasets()