diff --git a/config/config.properties b/config/config.properties index 5ef4e7c7..f3baef70 100644 --- a/config/config.properties +++ b/config/config.properties @@ -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 diff --git a/config/settings.properties b/config/settings.properties index 6d35493c..bb428db8 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -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 diff --git a/config/variables.properties b/config/variables.properties index 22c706bc..1af634d8 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -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 diff --git a/devices/img.properties b/devices/img.properties index b3dd841f..981dce5f 100644 --- a/devices/img.properties +++ b/devices/img.properties @@ -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 diff --git a/devices/ps1img.properties b/devices/ps1img.properties index ff50ff98..2a09b072 100644 --- a/devices/ps1img.properties +++ b/devices/ps1img.properties @@ -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 diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form index 21c384f7..d849df52 100644 --- a/plugins/XPSSpectrum.form +++ b/plugins/XPSSpectrum.form @@ -203,17 +203,17 @@ - - - - - - - - + + + + + + + + + - diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index 88614e10..ce39963d 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -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)