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
2023-08-17 18:15:45 +02:00
parent fcc31f7082
commit 0b29f47731
7 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -1,4 +1,4 @@
#Thu Jul 13 11:14:36 CEST 2023
#Wed Aug 16 17:40:43 CEST 2023
xscanMoveTimeout=600
autoSaveScanData=true
simulation=false
@@ -31,7 +31,7 @@ dataServerPort=-1
hideServerMessages=false
serverPort=8080
versionTrackingEnabled=true
dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name}
dataPath={data}/{year}/{month}/Hadjadj_s/pshell-{date}-{time}-{name}
serverEnabled=false
dataScanReleaseRecords=true
depthDimension=2

12
config/settings.properties
View File

@@ -1,7 +1,7 @@
#Mon Aug 14 12:35:02 CEST 2023
pgroup=p17274
proposal=bl-dev
proposer=bl-dev
#Wed Aug 16 17:41:04 CEST 2023
pgroup=p20771
proposal=20221849
proposer=Hadjadj_s
prefix=
sample=Au(111) \#2
authors=Matthias Muntwiler
sample=FeBr2
authors=Sebastien Hadjadj|Maxim Ilyn|Matthias Muntwiler

8
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Tue Aug 15 12:19:19 CEST 2023
LastRunDate=230815
FileSequentialNumber=18630
DaySequentialNumber=20
#Wed Aug 16 19:06:19 CEST 2023
LastRunDate=230816
FileSequentialNumber=18640
DaySequentialNumber=6

50
devices/img.properties
View File

@@ -1,30 +1,30 @@
#Wed Mar 06 09:34:08 CET 2019
colormap=Temperature
colormapAutomatic=true
colormapLogarithmic=false
colormapMax=255.0
colormapMin=0.0
dataMonitoring=false
dataPolling=0
flipHorizontally=false
flipVertically=false
grayscale=false
invert=false
mirrored=false
pollingBackground=false
pollingInterval=0
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
roiWidth=-1
roiX=0
roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=NaN
#Wed Aug 16 18:55:25 CEST 2023
spatialCalOffsetY=NaN
spatialCalOffsetX=NaN
dataPolling=0
colormapLogarithmic=false
pollingInterval=0
scale=1.0
grayscale=false
mirrored=false
spatialCalScaleX=NaN
spatialCalScaleY=NaN
colormapMax=255.0
rescaleOffset=0.0
roiWidth=-1
colormap=Grayscale
pollingBackground=false
invert=false
colormapMin=0.0
rotation=0.0
rotationCrop=false
rescaleFactor=1.0
spatialCalUnits=mm
flipVertically=false
roiHeight=-1
flipHorizontally=false
colormapAutomatic=true
dataMonitoring=false
roiY=0
roiX=0
transpose=false

4
devices/ps1img.properties
View File

@@ -1,8 +1,8 @@
#Tue Jan 31 14:22:45 CET 2023
#Tue Aug 15 18:38:37 CEST 2023
spatialCalOffsetY=NaN
spatialCalOffsetX=NaN
dataPolling=500
colormapLogarithmic=false
colormapLogarithmic=true
pollingInterval=0
scale=1.0
grayscale=false

18
plugins/XPSSpectrum.form
View File

@@ -203,17 +203,17 @@
<Component class="javax.swing.JComboBox" name="comboPass">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="7">
<StringItem index="0" value="2"/>
<StringItem index="1" value="5"/>
<StringItem index="2" value="10"/>
<StringItem index="3" value="20"/>
<StringItem index="4" value="50"/>
<StringItem index="5" value="100"/>
<StringItem index="6" value="200"/>
<StringArray count="8">
<StringItem index="0" value="1"/>
<StringItem index="1" value="2"/>
<StringItem index="2" value="5"/>
<StringItem index="3" value="10"/>
<StringItem index="4" value="20"/>
<StringItem index="5" value="50"/>
<StringItem index="6" value="100"/>
<StringItem index="7" value="200"/>
</StringArray>
</Property>
<Property name="selectedIndex" type="int" value="4"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
</Properties>
<Events>

6
plugins/XPSSpectrum.java
View File

@@ -179,7 +179,7 @@ public class XPSSpectrum extends ScriptProcessor {
scienta.getChild(scienta.getName() + " total points").addListener(progressListener);
}
dvpAcqTime.setDevice((Device)getScienta("getAcquisitionTime"));
comboPass.setSelectedItem((Integer)getScienta("getPassEnergy"));
comboPass.setSelectedItem(getScienta("getPassEnergy").toString());
} catch (Exception ex) {
Logger.getLogger(XPSSpectrum.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -455,8 +455,7 @@ public class XPSSpectrum extends ScriptProcessor {
valueTime.setShowButtons(false);
valueTime.setValue(1.0);
comboPass.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "2", "5", "10", "20", "50", "100", "200" }));
comboPass.setSelectedIndex(4);
comboPass.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "2", "5", "10", "20", "50", "100", "200" }));
comboPass.setToolTipText("");
comboPass.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -675,7 +674,6 @@ public class XPSSpectrum extends ScriptProcessor {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(btSave))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup()
.addGap(0, 0, 0)
.addComponent(radioInitial)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(radioDetailed)