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

Closedown

Browse Source
This commit is contained in:
gac-x03da
2020-09-29 15:37:04 +02:00
parent 92bca62646
commit e02fa4cc98
6 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -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

10
config/settings.properties
View File

@@ -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

4
config/variables.properties
View File

@@ -1,2 +1,2 @@
#Tue Sep 29 04:35:37 CEST 2020
FileSequentialNumber=4768
#Tue Sep 29 14:38:50 CEST 2020
FileSequentialNumber=4770

10
plugins/XPSSpectrum.form
View File

@@ -337,7 +337,9 @@
<Component id="buttonInitialScan" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonDetailedScan" linkSize="1" max="32767" attributes="0"/>
<EmptySpace pref="13" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="checkCIS" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="32767" attributes="0"/>
<Component id="buttonSkip" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="buttonAbort" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -357,6 +359,7 @@
<Component id="buttonDetailedScan" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonAbort" alignment="3" max="-2" attributes="0"/>
<Component id="buttonSkip" alignment="3" max="-2" attributes="0"/>
<Component id="checkCIS" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="rangeSelectionPanel" pref="0" max="32767" attributes="0"/>
@@ -429,6 +432,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonSkipActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCIS">
<Properties>
<Property name="text" type="java.lang.String" value="Constant Initial State"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>

13
plugins/XPSSpectrum.java
View File

@@ -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;

1
script/XPSSpectrum.py
View File

@@ -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()