diff --git a/config/config.properties b/config/config.properties
index 2a65167..bb816f6 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,39 +1,42 @@
-#Tue Feb 04 16:59:16 CET 2020
-imageSourcesFile={config}/imaging.properties
-autoSaveScanData=true
-simulation=false
-commandExecutionEvents=false
-logDaysToLive=7
-userAuthenticator=
-logLevelConsole=Off
-scanStreamerPort=-1
-parallelInitialization=false
-scanStreamingPort=-1
-devicePoolFile={config}/devices.properties
-versionTrackingManual=true
+#Fri Aug 14 09:09:23 CEST 2020
hostName=null
userManagement=true
+imageSourcesFile={config}/imaging.properties
instanceName=SIM
+autoSaveScanData=true
+simulation=false
dataServerPort=-1
hideServerMessages=false
serverPort=8080
versionTrackingEnabled=true
-dataPath={data}/{year}_{month}/{date}
+dataPath={data}/{year}_{month}/{date}_{seq}%03d
serverEnabled=false
+commandExecutionEvents=false
+logDaysToLive=7
dataScanReleaseRecords=false
depthDimension=0
dataScanPreserveTypes=false
logLevel=Info
+dataScanSaveOutput=false
dataScanFlushRecords=true
logPath={logs}/{date}_{time}
dataLayout=table
deviceUpdateStrategyFile={config}/update.properties
terminalEnabled=false
notificationLevel=null
+userAuthenticator=
+logLevelConsole=Off
terminalPort=3579
tasksFile={config}/tasks.properties
+scanStreamerPort=-1
+dataScanSaveScript=false
+dataScanSaveSetpoints=false
+parallelInitialization=false
+scanStreamingPort=-1
createSessionFiles=false
versionTrackingLogin={context}/svcusr-hlapp_robot
+devicePoolFile={config}/devices.properties
+versionTrackingManual=true
versionTrackingRemote=git@git.psi.ch\:pshell_config/x11ma.git
dataProvider=txt
saveCommandStatistics=false
diff --git a/config/devices.properties b/config/devices.properties
index e2ca2f6..e3ba7ee 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -15,14 +15,14 @@ idata=ch.psi.pshell.epics.ChannelDoubleArray|IDATA 3|Read||
Keithley_3_raw=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI12:READOUT|Read||true
Keithley_2_raw=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI11:READOUT|Read||true
Keithley_1_raw=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI10:READOUT|Read||true
-#TRX_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRX.RBV|Read||true
-#THT_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:THT.RBV|Read||true
-#TRY_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRY.RBV|Read||true
-#TRZ_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRZ.RBV|Read||true
-#TRX=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRX|||true
-#TRY=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRY|||true
-#THT=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:THT.RBV|||true
-#TRZ=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRZ|||true
+TRX_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRX.RBV|Read||true
+THT_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:THT.RBV|Read||true
+TRY_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRY.RBV|Read||true
+TRZ_RBV=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRZ.RBV|Read||true
+TRX=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRX|||true
+TRY=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRY|||true
+THT=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:THT.RBV|||true
+TRZ=ch.psi.pshell.epics.ChannelDouble|X11MA-VME-ES4:TRZ|||true
Temp=ch.psi.pshell.epics.ChannelDouble|X11MA-ES3-LSCI:TEMP_RBV|Read||true
#FE=ch.psi.pshell.epics.Slit|X11MA-FE:DSAPER|Read||true
ES=ch.psi.pshell.epics.ChannelDouble|X11MA-OP2-SL:TRY.RBV|Read||true
diff --git a/config/settings.properties b/config/settings.properties
index 4de8f8c..6cbd183 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,12 +1,16 @@
-#Wed Feb 12 00:37:11 CET 2020
+#Tue Sep 22 10:38:41 CEST 2020
HARMONIC_ID_1=1
+ENERGY=720.3
+OUTLIERS_THRESHOLD=1000000000
+POL_ID_1=Lin_Ver
+NORM_FILE=/sls/X11MA/data/X11MA/Data1/public/PEEM/2020_09/i1904_1_0.tif
+AUTO_SWITCH_VALVE=true
+DRY_RUN=false
ALPHA_ID_2=0.0
-ENERGY=710.8
ALPHA_ID_1=0.0
POL_ID_2=Lin_Hor
-POL_ID_1=Lin_Hor
-OFFSET_ID_1=-2.5
-NORM_FILE=/sls/X11MA/data/X11MA/Data1/public/PEEM/2020_02/20200206/Take_Image_402/0/i402_1_0.tif
-ID=ID2
-OFFSET_ID_2=-2.5
+OFFSET_ID_1=-0.2
+ID=ID1_ID2
+OFFSET_ID_2=-1.3
HARMONIC_ID_2=1
+FdaBrowser=true
diff --git a/config/tasks.properties b/config/tasks.properties
new file mode 100644
index 0000000..9c4706a
--- /dev/null
+++ b/config/tasks.properties
@@ -0,0 +1 @@
+tasks/CheckEiger=30.0
diff --git a/config/variables.properties b/config/variables.properties
index 1425fae..a2aafeb 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Wed Feb 12 15:36:01 CET 2020
-FileSequentialNumber=628
+#Tue Sep 22 10:12:44 CEST 2020
+FileSequentialNumber=2112
diff --git a/devices/image.properties b/devices/image.properties
index 47ea7a6..a87b011 100644
--- a/devices/image.properties
+++ b/devices/image.properties
@@ -1,12 +1,12 @@
-#Sat Feb 08 23:55:14 CET 2020
+#Thu Sep 17 16:34:32 CEST 2020
spatialCalOffsetY=NaN
spatialCalOffsetX=NaN
-colormapLogarithmic=false
+colormapLogarithmic=true
scale=1.0
grayscale=false
spatialCalScaleX=NaN
spatialCalScaleY=NaN
-colormapMax=200.0
+colormapMax=300.0
rescaleOffset=0.0
roiWidth=-1
colormap=Grayscale
diff --git a/devices/norm.properties b/devices/norm.properties
index 0554abf..3e4a604 100644
--- a/devices/norm.properties
+++ b/devices/norm.properties
@@ -1,4 +1,4 @@
-#Wed Feb 12 11:25:27 CET 2020
+#Mon Apr 06 22:33:26 CEST 2020
spatialCalOffsetY=NaN
spatialCalOffsetX=NaN
colormapLogarithmic=false
@@ -6,7 +6,7 @@ scale=1.0
grayscale=false
spatialCalScaleX=NaN
spatialCalScaleY=NaN
-colormapMax=0.5
+colormapMax=0.1
rescaleOffset=0.0
roiWidth=-1
colormap=Grayscale
diff --git a/plugins/Eiger.form b/plugins/Eiger.form
index c467da8..e0808fa 100644
--- a/plugins/Eiger.form
+++ b/plugins/Eiger.form
@@ -51,6 +51,7 @@
+
@@ -63,6 +64,8 @@
+
+
@@ -238,6 +241,7 @@
+
@@ -258,7 +262,7 @@
-
+
@@ -272,6 +276,8 @@
+
+
@@ -566,6 +572,14 @@
+
+
+
+
+
+
+
+
@@ -642,6 +656,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -690,7 +809,7 @@
-
+
@@ -810,7 +929,7 @@
-
+
@@ -1303,9 +1422,9 @@
-
+
-
+
@@ -1329,6 +1448,7 @@
+
diff --git a/plugins/Eiger.java b/plugins/Eiger.java
index ea8b948..37b4ad8 100644
--- a/plugins/Eiger.java
+++ b/plugins/Eiger.java
@@ -5,10 +5,8 @@ import ch.psi.pshell.imaging.Overlays.Rect;
import ch.psi.pshell.imaging.Pen;
import ch.psi.pshell.imaging.Renderer;
import ch.psi.pshell.imaging.RendererListener;
-import ch.psi.pshell.swing.DevicePanel;
import ch.psi.pshell.ui.App;
import ch.psi.pshell.ui.Panel;
-import static ch.psi.pshell.ui.StripChart.FILE_EXTENSION;
import ch.psi.utils.Arr;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
@@ -18,13 +16,12 @@ import java.awt.Point;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JDialog;
@@ -164,7 +161,13 @@ public class Eiger extends Panel {
spinnerHar2.setValue(har2);
spinnerOff2.setValue(off2);
-
+ checkAutoValve.setSelected(String.valueOf(getSetting("AUTO_SWITCH_VALVE")).equalsIgnoreCase("true"));
+ try{
+ spinnerOutliersThreshold.setValue(Integer.valueOf(getSetting("OUTLIERS_THRESHOLD")));
+ } catch (IOException ex) {
+ spinnerOutliersThreshold.setValue(0);
+ }
+ textOutliersMask.setText(String.valueOf(getSetting("OUTLIERS_MASK_FILE")));
} catch (IOException ex) {
showException(ex);
}
@@ -417,10 +420,10 @@ public class Eiger extends Panel {
jLabel1 = new javax.swing.JLabel();
panelBeamline = new javax.swing.JPanel();
jLabel3 = new javax.swing.JLabel();
- comboID = new javax.swing.JComboBox();
+ comboID = new javax.swing.JComboBox<>();
jPanel7 = new javax.swing.JPanel();
jLabel5 = new javax.swing.JLabel();
- comboPol1 = new javax.swing.JComboBox();
+ comboPol1 = new javax.swing.JComboBox<>();
jLabel6 = new javax.swing.JLabel();
spinnerAlp1 = new javax.swing.JSpinner();
jLabel7 = new javax.swing.JLabel();
@@ -429,7 +432,7 @@ public class Eiger extends Panel {
spinnerOff1 = new javax.swing.JSpinner();
jPanel9 = new javax.swing.JPanel();
jLabel13 = new javax.swing.JLabel();
- comboPol2 = new javax.swing.JComboBox();
+ comboPol2 = new javax.swing.JComboBox<>();
jLabel14 = new javax.swing.JLabel();
spinnerAlp2 = new javax.swing.JSpinner();
jLabel15 = new javax.swing.JLabel();
@@ -439,11 +442,19 @@ public class Eiger extends Panel {
buttonApply = new javax.swing.JButton();
jLabel27 = new javax.swing.JLabel();
spinnerImgEng = new javax.swing.JSpinner();
+ checkAutoValve = new javax.swing.JCheckBox();
panelNorm = new javax.swing.JPanel();
buttonSetNorm = new javax.swing.JButton();
textNorm = new javax.swing.JTextField();
jLabel29 = new javax.swing.JLabel();
buttonShowNorm = new javax.swing.JToggleButton();
+ panelNorm1 = new javax.swing.JPanel();
+ textSelectOutliersMask = new javax.swing.JButton();
+ textOutliersMask = new javax.swing.JTextField();
+ jLabel30 = new javax.swing.JLabel();
+ jLabel31 = new javax.swing.JLabel();
+ textClearOutliersMask = new javax.swing.JButton();
+ spinnerOutliersThreshold = new javax.swing.JSpinner();
panelRoi = new javax.swing.JPanel();
rendererRoi = new ch.psi.pshell.imaging.Renderer();
jLabel26 = new javax.swing.JLabel();
@@ -463,7 +474,7 @@ public class Eiger extends Panel {
jLabel9 = new javax.swing.JLabel();
spinnerImgAvg1 = new javax.swing.JSpinner();
jLabel10 = new javax.swing.JLabel();
- comboImgPol1 = new javax.swing.JComboBox();
+ comboImgPol1 = new javax.swing.JComboBox<>();
jLabel11 = new javax.swing.JLabel();
spinnerImgEng1 = new javax.swing.JSpinner();
jPanel10 = new javax.swing.JPanel();
@@ -472,16 +483,16 @@ public class Eiger extends Panel {
jLabel17 = new javax.swing.JLabel();
spinnerImgAvg2 = new javax.swing.JSpinner();
jLabel18 = new javax.swing.JLabel();
- comboImgPol2 = new javax.swing.JComboBox();
+ comboImgPol2 = new javax.swing.JComboBox<>();
jLabel19 = new javax.swing.JLabel();
spinnerImgEng2 = new javax.swing.JSpinner();
jLabel21 = new javax.swing.JLabel();
spinnerImgMeasurements = new javax.swing.JSpinner();
- comboImgMethod = new javax.swing.JComboBox();
+ comboImgMethod = new javax.swing.JComboBox<>();
jLabel20 = new javax.swing.JLabel();
checkImgAutosave = new javax.swing.JCheckBox();
labelSwitching = new javax.swing.JLabel();
- comboSwitch = new javax.swing.JComboBox();
+ comboSwitch = new javax.swing.JComboBox<>();
jPanel3 = new javax.swing.JPanel();
panelSpectrum = new javax.swing.JPanel();
jLabel23 = new javax.swing.JLabel();
@@ -622,13 +633,13 @@ public class Eiger extends Panel {
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel3.setText("ID:");
- comboID.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboID.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder("ID1"));
jLabel5.setText("Polarization:");
- comboPol1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboPol1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
jLabel6.setText("Alpha:");
@@ -690,7 +701,7 @@ public class Eiger extends Panel {
jLabel13.setText("Polarization:");
- comboPol2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboPol2.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
jLabel14.setText("Alpha:");
@@ -760,6 +771,13 @@ public class Eiger extends Panel {
spinnerImgEng.setModel(new javax.swing.SpinnerNumberModel(1000.0d, 90.0d, 2520.0d, 1.0d));
+ checkAutoValve.setText("Auto Switch Valve");
+ checkAutoValve.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkAutoValveActionPerformed(evt);
+ }
+ });
+
javax.swing.GroupLayout panelBeamlineLayout = new javax.swing.GroupLayout(panelBeamline);
panelBeamline.setLayout(panelBeamlineLayout);
panelBeamlineLayout.setHorizontalGroup(
@@ -776,7 +794,8 @@ public class Eiger extends Panel {
.addGroup(panelBeamlineLayout.createSequentialGroup()
.addComponent(jLabel27)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(checkAutoValve))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
@@ -796,7 +815,7 @@ public class Eiger extends Panel {
panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelBeamlineLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(panelBeamlineLayout.createSequentialGroup()
@@ -807,7 +826,9 @@ public class Eiger extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(panelBeamlineLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel27)
- .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addComponent(spinnerImgEng, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(checkAutoValve)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(buttonApply)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@@ -869,6 +890,86 @@ public class Eiger extends Panel {
.addContainerGap())
);
+ panelNorm1.setBorder(javax.swing.BorderFactory.createTitledBorder("Outliers"));
+
+ textSelectOutliersMask.setText("Select");
+ textSelectOutliersMask.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ textSelectOutliersMaskActionPerformed(evt);
+ }
+ });
+
+ textOutliersMask.setEditable(false);
+ textOutliersMask.addKeyListener(new java.awt.event.KeyAdapter() {
+ public void keyTyped(java.awt.event.KeyEvent evt) {
+ textOutliersMaskKeyTyped(evt);
+ }
+ public void keyReleased(java.awt.event.KeyEvent evt) {
+ textOutliersMaskKeyReleased(evt);
+ }
+ });
+
+ jLabel30.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel30.setText("Mask File:");
+
+ jLabel31.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel31.setText("Threshold:");
+
+ textClearOutliersMask.setText("Clear");
+ textClearOutliersMask.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ textClearOutliersMaskActionPerformed(evt);
+ }
+ });
+
+ spinnerOutliersThreshold.setModel(new javax.swing.SpinnerNumberModel(Long.valueOf(0L), Long.valueOf(0L), Long.valueOf(1000000000000L), Long.valueOf(1L)));
+ spinnerOutliersThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerOutliersThresholdStateChanged(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelNorm1Layout = new javax.swing.GroupLayout(panelNorm1);
+ panelNorm1.setLayout(panelNorm1Layout);
+ panelNorm1Layout.setHorizontalGroup(
+ panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelNorm1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelNorm1Layout.createSequentialGroup()
+ .addComponent(jLabel30)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(textOutliersMask)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(textClearOutliersMask)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(textSelectOutliersMask))
+ .addGroup(panelNorm1Layout.createSequentialGroup()
+ .addComponent(jLabel31)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(spinnerOutliersThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+
+ panelNorm1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel30, jLabel31});
+
+ panelNorm1Layout.setVerticalGroup(
+ panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelNorm1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel30)
+ .addComponent(textOutliersMask, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(textSelectOutliersMask)
+ .addComponent(textClearOutliersMask))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(panelNorm1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel31)
+ .addComponent(spinnerOutliersThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
@@ -878,7 +979,8 @@ public class Eiger extends Panel {
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelDataFile, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelBeamline, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelNorm1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
@@ -888,6 +990,8 @@ public class Eiger extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelNorm, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelNorm1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(panelBeamline, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@@ -991,7 +1095,7 @@ public class Eiger extends Panel {
.addGap(18, 18, 18)
.addComponent(jLabel26)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -1029,7 +1133,7 @@ public class Eiger extends Panel {
jLabel10.setText("Polarization:");
- comboImgPol1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboImgPol1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
jLabel11.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel11.setText("Energy:");
@@ -1094,7 +1198,7 @@ public class Eiger extends Panel {
jLabel18.setText("Polarization:");
- comboImgPol2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboImgPol2.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
jLabel19.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel19.setText("Energy:");
@@ -1150,7 +1254,7 @@ public class Eiger extends Panel {
spinnerImgMeasurements.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10000, 1));
- comboImgMethod.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboImgMethod.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
comboImgMethod.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
comboImgMethodActionPerformed(evt);
@@ -1165,7 +1269,7 @@ public class Eiger extends Panel {
labelSwitching.setText("Switching:");
- comboSwitch.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ comboSwitch.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
javax.swing.GroupLayout panelImgControlsLayout = new javax.swing.GroupLayout(panelImgControls);
panelImgControls.setLayout(panelImgControlsLayout);
@@ -1240,7 +1344,7 @@ public class Eiger extends Panel {
.addGroup(jPanel2Layout.createSequentialGroup()
.addGap(18, 18, 18)
.addComponent(panelImgControls, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 236, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 304, Short.MAX_VALUE)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonImgStart)
.addComponent(buttonImgAbort))
@@ -1255,6 +1359,7 @@ public class Eiger extends Panel {
jLabel24.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel24.setText("Average:");
+ checkSpecSaveImages.setSelected(true);
checkSpecSaveImages.setText("Save images");
spinnerSpecAvg.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
@@ -1386,9 +1491,9 @@ public class Eiger extends Panel {
.addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel25)
.addComponent(spinnerSpecScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 93, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 126, Short.MAX_VALUE)
.addComponent(checkSpecSwitchPol)
- .addGap(0, 86, Short.MAX_VALUE))
+ .addGap(0, 121, Short.MAX_VALUE))
.addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@@ -1621,7 +1726,7 @@ public class Eiger extends Panel {
}//GEN-LAST:event_buttonShowDetectorPanelActionPerformed
private void buttonShowNormActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonShowNormActionPerformed
- try{
+ try{
this.enableNorm( buttonShowNorm.isSelected());
buttonShowNorm.setText(buttonShowNorm.isSelected() ? "Hide" : "Show");
} catch (Exception ex){
@@ -1629,6 +1734,56 @@ public class Eiger extends Panel {
}
}//GEN-LAST:event_buttonShowNormActionPerformed
+ private void checkAutoValveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkAutoValveActionPerformed
+ try{
+ setSetting("AUTO_SWITCH_VALVE", checkAutoValve.isSelected());
+ } catch (Exception ex){
+ showException (ex);
+ }
+ }//GEN-LAST:event_checkAutoValveActionPerformed
+
+ private void textSelectOutliersMaskActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textSelectOutliersMaskActionPerformed
+ try{
+ JFileChooser chooser = new JFileChooser(getContext().getSetup().expandPath(getContext().getConfig().dataPath));
+ FileNameExtensionFilter filter = new FileNameExtensionFilter("Image File", "tif", "tiff");
+ chooser.setFileFilter(filter);
+ chooser.setFileHidingEnabled(true);
+
+ int rVal = chooser.showOpenDialog(this);
+ if (rVal == JFileChooser.APPROVE_OPTION) {
+ textOutliersMask.setText(chooser.getSelectedFile().getAbsoluteFile().toString());
+ this.setSetting("OUTLIERS_MASK_FILE", textOutliersMask.getText());
+ }
+ } catch (Exception ex){
+ showException (ex);
+ }
+ }//GEN-LAST:event_textSelectOutliersMaskActionPerformed
+
+ private void textOutliersMaskKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_textOutliersMaskKeyTyped
+ // TODO add your handling code here:
+ }//GEN-LAST:event_textOutliersMaskKeyTyped
+
+ private void textOutliersMaskKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_textOutliersMaskKeyReleased
+ // TODO add your handling code here:
+ }//GEN-LAST:event_textOutliersMaskKeyReleased
+
+ private void textClearOutliersMaskActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textClearOutliersMaskActionPerformed
+ try{
+ setSetting("OUTLIERS_MASK_FILE", null);
+ textOutliersMask.setText("");
+ } catch (Exception ex){
+ showException (ex);
+ }
+ }//GEN-LAST:event_textClearOutliersMaskActionPerformed
+
+ private void spinnerOutliersThresholdStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerOutliersThresholdStateChanged
+ try{
+ setSetting("OUTLIERS_THRESHOLD", spinnerOutliersThreshold.getValue());
+ } catch (Exception ex){
+ showException (ex);
+ }
+ }//GEN-LAST:event_spinnerOutliersThresholdStateChanged
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAdd;
private javax.swing.JButton buttonApply;
@@ -1648,6 +1803,7 @@ public class Eiger extends Panel {
private javax.swing.JButton buttonTriggerDetector;
private javax.swing.JButton buttonUndoPath;
private javax.swing.JButton buttonUndoSeq;
+ private javax.swing.JCheckBox checkAutoValve;
private javax.swing.JCheckBox checkImgAutosave;
private javax.swing.JCheckBox checkSpecSaveImages;
private javax.swing.JCheckBox checkSpecSaveSpectrum;
@@ -1681,6 +1837,8 @@ public class Eiger extends Panel {
private javax.swing.JLabel jLabel27;
private javax.swing.JLabel jLabel29;
private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel30;
+ private javax.swing.JLabel jLabel31;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
@@ -1703,6 +1861,7 @@ public class Eiger extends Panel {
private javax.swing.JPanel panelDataFile;
private javax.swing.JPanel panelImgControls;
private javax.swing.JPanel panelNorm;
+ private javax.swing.JPanel panelNorm1;
private javax.swing.JPanel panelRoi;
private javax.swing.JPanel panelSpectrum;
private ch.psi.pshell.imaging.Renderer rendererRoi;
@@ -1720,13 +1879,17 @@ public class Eiger extends Panel {
private javax.swing.JSpinner spinnerImgMeasurements;
private javax.swing.JSpinner spinnerOff1;
private javax.swing.JSpinner spinnerOff2;
+ private javax.swing.JSpinner spinnerOutliersThreshold;
private javax.swing.JSpinner spinnerSeq;
private javax.swing.JSpinner spinnerSpecAvg;
private javax.swing.JSpinner spinnerSpecExp;
private javax.swing.JSpinner spinnerSpecScans;
private javax.swing.JTable tableRegions;
private javax.swing.JTable tableRoi;
+ private javax.swing.JButton textClearOutliersMask;
private javax.swing.JTextField textDataPath;
private javax.swing.JTextField textNorm;
+ private javax.swing.JTextField textOutliersMask;
+ private javax.swing.JButton textSelectOutliersMask;
// End of variables declaration//GEN-END:variables
}
diff --git a/script/StartingExample.py b/script/StartingExample.py
new file mode 100644
index 0000000..92f168d
--- /dev/null
+++ b/script/StartingExample.py
@@ -0,0 +1,25 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="")
+nr_loops=5
+
+
+open_vg10()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_C', folder='data/2019_10/20191004')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_O', folder='data/2019_10/20191004')
+
+
+time.sleep(5)
+close_vg10()
+
+TRY.write(0.0)
+TRZ.write(0.0)
diff --git a/script/Fechner/Temperature_sweepID2.py b/script/Users/Fechner/Temperature_sweepID2.py
similarity index 100%
rename from script/Fechner/Temperature_sweepID2.py
rename to script/Users/Fechner/Temperature_sweepID2.py
diff --git a/script/Fechner/field_sweepID2.py b/script/Users/Fechner/field_sweepID2.py
similarity index 100%
rename from script/Fechner/field_sweepID2.py
rename to script/Users/Fechner/field_sweepID2.py
diff --git a/script/Fechner/hyst_ID2.py b/script/Users/Fechner/hyst_ID2.py
similarity index 100%
rename from script/Fechner/hyst_ID2.py
rename to script/Users/Fechner/hyst_ID2.py
diff --git a/script/Fechner/xmcdID2.py b/script/Users/Fechner/xmcdID2.py
similarity index 100%
rename from script/Fechner/xmcdID2.py
rename to script/Users/Fechner/xmcdID2.py
diff --git a/script/Fechner/xmcdID2_Al.py b/script/Users/Fechner/xmcdID2_Al.py
similarity index 100%
rename from script/Fechner/xmcdID2_Al.py
rename to script/Users/Fechner/xmcdID2_Al.py
diff --git a/script/Fechner/xmcdID2_Fe-one-run.py b/script/Users/Fechner/xmcdID2_Fe-one-run.py
similarity index 100%
rename from script/Fechner/xmcdID2_Fe-one-run.py
rename to script/Users/Fechner/xmcdID2_Fe-one-run.py
diff --git a/script/Fechner/xmcdID2_Fe.py b/script/Users/Fechner/xmcdID2_Fe.py
similarity index 100%
rename from script/Fechner/xmcdID2_Fe.py
rename to script/Users/Fechner/xmcdID2_Fe.py
diff --git a/script/Fechner/xmcdID2_Mg.py b/script/Users/Fechner/xmcdID2_Mg.py
similarity index 100%
rename from script/Fechner/xmcdID2_Mg.py
rename to script/Users/Fechner/xmcdID2_Mg.py
diff --git a/script/Fechner/xmcdID2_OCr.py b/script/Users/Fechner/xmcdID2_OCr.py
similarity index 100%
rename from script/Fechner/xmcdID2_OCr.py
rename to script/Users/Fechner/xmcdID2_OCr.py
diff --git a/script/Fechner/xmcdID2_OCr_fix_drift.py b/script/Users/Fechner/xmcdID2_OCr_fix_drift.py
similarity index 100%
rename from script/Fechner/xmcdID2_OCr_fix_drift.py
rename to script/Users/Fechner/xmcdID2_OCr_fix_drift.py
diff --git a/script/Fechner/xmldID2_Fe.py b/script/Users/Fechner/xmldID2_Fe.py
similarity index 100%
rename from script/Fechner/xmldID2_Fe.py
rename to script/Users/Fechner/xmldID2_Fe.py
diff --git a/script/Fechner/xmldID2_Mg.py b/script/Users/Fechner/xmldID2_Mg.py
similarity index 100%
rename from script/Fechner/xmldID2_Mg.py
rename to script/Users/Fechner/xmldID2_Mg.py
diff --git a/script/Fechner/xmldID2_OCr_fix_drift.py b/script/Users/Fechner/xmldID2_OCr_fix_drift.py
similarity index 100%
rename from script/Fechner/xmldID2_OCr_fix_drift.py
rename to script/Users/Fechner/xmldID2_OCr_fix_drift.py
diff --git a/script/Juraj/B_scan.py b/script/Users/Juraj/B_scan.py
similarity index 100%
rename from script/Juraj/B_scan.py
rename to script/Users/Juraj/B_scan.py
diff --git a/script/Juraj/E_scan.py b/script/Users/Juraj/E_scan.py
similarity index 100%
rename from script/Juraj/E_scan.py
rename to script/Users/Juraj/E_scan.py
diff --git a/script/Juraj/FixedE.py b/script/Users/Juraj/FixedE.py
similarity index 100%
rename from script/Juraj/FixedE.py
rename to script/Users/Juraj/FixedE.py
diff --git a/script/Juraj/Main.py b/script/Users/Juraj/Main.py
similarity index 100%
rename from script/Juraj/Main.py
rename to script/Users/Juraj/Main.py
diff --git a/script/Mehdi/EnergyScan2.py b/script/Users/Mehdi/EnergyScan2.py
similarity index 100%
rename from script/Mehdi/EnergyScan2.py
rename to script/Users/Mehdi/EnergyScan2.py
diff --git a/script/Mehdi/Linear_XAS.py b/script/Users/Mehdi/Linear_XAS.py
similarity index 100%
rename from script/Mehdi/Linear_XAS.py
rename to script/Users/Mehdi/Linear_XAS.py
diff --git a/script/Mehdi/OTF_scan.py b/script/Users/Mehdi/OTF_scan.py
similarity index 100%
rename from script/Mehdi/OTF_scan.py
rename to script/Users/Mehdi/OTF_scan.py
diff --git a/script/Mehdi/OTF_scan2.py b/script/Users/Mehdi/OTF_scan2.py
similarity index 100%
rename from script/Mehdi/OTF_scan2.py
rename to script/Users/Mehdi/OTF_scan2.py
diff --git a/script/Mehdi/OTF_scan3.py b/script/Users/Mehdi/OTF_scan3.py
similarity index 100%
rename from script/Mehdi/OTF_scan3.py
rename to script/Users/Mehdi/OTF_scan3.py
diff --git a/script/Mehdi/OTF_scan_Mn.py b/script/Users/Mehdi/OTF_scan_Mn.py
similarity index 100%
rename from script/Mehdi/OTF_scan_Mn.py
rename to script/Users/Mehdi/OTF_scan_Mn.py
diff --git a/script/Mehdi/OTF_scan_NEXAFS.py b/script/Users/Mehdi/OTF_scan_NEXAFS.py
similarity index 100%
rename from script/Mehdi/OTF_scan_NEXAFS.py
rename to script/Users/Mehdi/OTF_scan_NEXAFS.py
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G20.py b/script/Users/Mehdi/OTF_scan_NEXAFS_G20.py
similarity index 100%
rename from script/Mehdi/OTF_scan_NEXAFS_G20.py
rename to script/Users/Mehdi/OTF_scan_NEXAFS_G20.py
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G40.py b/script/Users/Mehdi/OTF_scan_NEXAFS_G40.py
similarity index 100%
rename from script/Mehdi/OTF_scan_NEXAFS_G40.py
rename to script/Users/Mehdi/OTF_scan_NEXAFS_G40.py
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G55.py b/script/Users/Mehdi/OTF_scan_NEXAFS_G55.py
similarity index 100%
rename from script/Mehdi/OTF_scan_NEXAFS_G55.py
rename to script/Users/Mehdi/OTF_scan_NEXAFS_G55.py
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G70.py b/script/Users/Mehdi/OTF_scan_NEXAFS_G70.py
similarity index 100%
rename from script/Mehdi/OTF_scan_NEXAFS_G70.py
rename to script/Users/Mehdi/OTF_scan_NEXAFS_G70.py
diff --git a/script/Mehdi/OTF_scan_XACCIRC.py b/script/Users/Mehdi/OTF_scan_XACCIRC.py
similarity index 100%
rename from script/Mehdi/OTF_scan_XACCIRC.py
rename to script/Users/Mehdi/OTF_scan_XACCIRC.py
diff --git a/script/Mehdi/OTF_scan_XAS_XMCD.py b/script/Users/Mehdi/OTF_scan_XAS_XMCD.py
similarity index 100%
rename from script/Mehdi/OTF_scan_XAS_XMCD.py
rename to script/Users/Mehdi/OTF_scan_XAS_XMCD.py
diff --git a/script/Mehdi/OTF_scan_XMCD.py b/script/Users/Mehdi/OTF_scan_XMCD.py
similarity index 100%
rename from script/Mehdi/OTF_scan_XMCD.py
rename to script/Users/Mehdi/OTF_scan_XMCD.py
diff --git a/script/Sridhar/EnergyScanID1only.py b/script/Users/Sridhar/EnergyScanID1only.py
similarity index 100%
rename from script/Sridhar/EnergyScanID1only.py
rename to script/Users/Sridhar/EnergyScanID1only.py
diff --git a/script/Sridhar/EnergyScanID2only.py b/script/Users/Sridhar/EnergyScanID2only.py
similarity index 100%
rename from script/Sridhar/EnergyScanID2only.py
rename to script/Users/Sridhar/EnergyScanID2only.py
diff --git a/script/Sridhar/field_sweep.py b/script/Users/Sridhar/field_sweep.py
similarity index 100%
rename from script/Sridhar/field_sweep.py
rename to script/Users/Sridhar/field_sweep.py
diff --git a/script/Sridhar/field_sweepID1.py b/script/Users/Sridhar/field_sweepID1.py
similarity index 100%
rename from script/Sridhar/field_sweepID1.py
rename to script/Users/Sridhar/field_sweepID1.py
diff --git a/script/Sridhar/field_sweepID2.py b/script/Users/Sridhar/field_sweepID2.py
similarity index 100%
rename from script/Sridhar/field_sweepID2.py
rename to script/Users/Sridhar/field_sweepID2.py
diff --git a/script/Sridhar/field_sweep_old.py b/script/Users/Sridhar/field_sweep_old.py
similarity index 100%
rename from script/Sridhar/field_sweep_old.py
rename to script/Users/Sridhar/field_sweep_old.py
diff --git a/script/Sridhar/harmonic_ID1.xml b/script/Users/Sridhar/harmonic_ID1.xml
similarity index 100%
rename from script/Sridhar/harmonic_ID1.xml
rename to script/Users/Sridhar/harmonic_ID1.xml
diff --git a/script/Sridhar/harmonic_ID2.xml b/script/Users/Sridhar/harmonic_ID2.xml
similarity index 100%
rename from script/Sridhar/harmonic_ID2.xml
rename to script/Users/Sridhar/harmonic_ID2.xml
diff --git a/script/Sridhar/hyst_ID1.py b/script/Users/Sridhar/hyst_ID1.py
similarity index 100%
rename from script/Sridhar/hyst_ID1.py
rename to script/Users/Sridhar/hyst_ID1.py
diff --git a/script/Sridhar/hyst_ID2.py b/script/Users/Sridhar/hyst_ID2.py
similarity index 100%
rename from script/Sridhar/hyst_ID2.py
rename to script/Users/Sridhar/hyst_ID2.py
diff --git a/script/Sridhar/hyst_ID2_Co.py b/script/Users/Sridhar/hyst_ID2_Co.py
similarity index 100%
rename from script/Sridhar/hyst_ID2_Co.py
rename to script/Users/Sridhar/hyst_ID2_Co.py
diff --git a/script/Sridhar/hyst_ID2_Fe.py b/script/Users/Sridhar/hyst_ID2_Fe.py
similarity index 100%
rename from script/Sridhar/hyst_ID2_Fe.py
rename to script/Users/Sridhar/hyst_ID2_Fe.py
diff --git a/script/Sridhar/test.py b/script/Users/Sridhar/test.py
similarity index 100%
rename from script/Sridhar/test.py
rename to script/Users/Sridhar/test.py
diff --git a/script/Sridhar/test_field.py b/script/Users/Sridhar/test_field.py
similarity index 100%
rename from script/Sridhar/test_field.py
rename to script/Users/Sridhar/test_field.py
diff --git a/script/Sridhar/test_fieldID1.py b/script/Users/Sridhar/test_fieldID1.py
similarity index 100%
rename from script/Sridhar/test_fieldID1.py
rename to script/Users/Sridhar/test_fieldID1.py
diff --git a/script/Sridhar/test_fieldID2.py b/script/Users/Sridhar/test_fieldID2.py
similarity index 100%
rename from script/Sridhar/test_fieldID2.py
rename to script/Users/Sridhar/test_fieldID2.py
diff --git a/script/Sridhar/xmcdID1&ID2.py b/script/Users/Sridhar/xmcdID1&ID2.py
similarity index 100%
rename from script/Sridhar/xmcdID1&ID2.py
rename to script/Users/Sridhar/xmcdID1&ID2.py
diff --git a/script/Sridhar/xmcdID1.py b/script/Users/Sridhar/xmcdID1.py
similarity index 100%
rename from script/Sridhar/xmcdID1.py
rename to script/Users/Sridhar/xmcdID1.py
diff --git a/script/Sridhar/xmcdID2.py b/script/Users/Sridhar/xmcdID2.py
similarity index 100%
rename from script/Sridhar/xmcdID2.py
rename to script/Users/Sridhar/xmcdID2.py
diff --git a/script/Sridhar/xmcdID2_Co.py b/script/Users/Sridhar/xmcdID2_Co.py
similarity index 100%
rename from script/Sridhar/xmcdID2_Co.py
rename to script/Users/Sridhar/xmcdID2_Co.py
diff --git a/script/Sridhar/xmcdID2_Fe.py b/script/Users/Sridhar/xmcdID2_Fe.py
similarity index 100%
rename from script/Sridhar/xmcdID2_Fe.py
rename to script/Users/Sridhar/xmcdID2_Fe.py
diff --git a/script/Sridhar/xmcdID2_Ru.py b/script/Users/Sridhar/xmcdID2_Ru.py
similarity index 100%
rename from script/Sridhar/xmcdID2_Ru.py
rename to script/Users/Sridhar/xmcdID2_Ru.py
diff --git a/script/Users/carlos/Bor_test.py b/script/Users/carlos/Bor_test.py
new file mode 100644
index 0000000..9079a20
--- /dev/null
+++ b/script/Users/carlos/Bor_test.py
@@ -0,0 +1,23 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+
+#Sample Na
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/Na/")
+nr_loops=3
+
+TRY.write(21.0)
+TRZ.write(8.2)
+
+time.sleep(3)
+
+#open_vg13()
+#time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 21.1 + 0.2*2 - 0.2*i
+ TRY.write(y_pos)
+ time.sleep(3)
+
+time.sleep(1)
+close_vg13()
+
diff --git a/script/Users/carlos/Boron.py b/script/Users/carlos/Boron.py
new file mode 100644
index 0000000..ef52f92
--- /dev/null
+++ b/script/Users/carlos/Boron.py
@@ -0,0 +1,204 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+
+#Sample Na
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/Na/")
+nr_loops=3
+
+TRY.write(21.0)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 21.0 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Naref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample Ca
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/Ca/")
+nr_loops=3
+
+TRY.write(15.0)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 15.0 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Caref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample B
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/B/")
+nr_loops=3
+
+TRY.write(8.9)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 8.9 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Bref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+
+#Sample K
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/K/")
+nr_loops=3
+
+TRY.write(3.2)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 3.2 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Kref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 32
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/32/")
+nr_loops=3
+
+TRY.write(3.2)
+TRZ.write(16.3)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 3.2 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S32_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 31
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/31/")
+nr_loops=3
+
+TRY.write(8.0)
+TRZ.write(15.6)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 8.0 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S31_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 30
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/30/")
+nr_loops=3
+
+TRY.write(15.2)
+TRZ.write(15.3)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 15.2 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S30_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 29
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/29/")
+nr_loops=3
+
+TRY.write(21.2)
+TRZ.write(14.8)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 21.2 + 0.4 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S29_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/carlos/Boron2.py b/script/Users/carlos/Boron2.py
new file mode 100644
index 0000000..196df20
--- /dev/null
+++ b/script/Users/carlos/Boron2.py
@@ -0,0 +1,127 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+#Sample K
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/K/")
+nr_loops=1
+
+TRY.write(3.2)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 3.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Kref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 32
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/32/")
+nr_loops=3
+
+TRY.write(3.2)
+TRZ.write(16.3)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 3.2 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S32_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 31
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/31/")
+nr_loops=3
+
+TRY.write(8.0)
+TRZ.write(15.6)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 8.0 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S31_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 30
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/30/")
+nr_loops=3
+
+TRY.write(15.2)
+TRZ.write(15.3)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 15.2 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S30_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+#Sample 29
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/29/")
+nr_loops=3
+
+TRY.write(21.2)
+TRZ.write(14.8)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 21.2 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S29_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/carlos/Boron3.py b/script/Users/carlos/Boron3.py
new file mode 100644
index 0000000..c49238c
--- /dev/null
+++ b/script/Users/carlos/Boron3.py
@@ -0,0 +1,54 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+
+#Sample B
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/B/")
+nr_loops=3
+
+TRY.write(8.9)
+TRZ.write(8.2)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 8.9 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Bref_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
+
+#Sample 31
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/31/")
+nr_loops=3
+
+TRY.write(8.0)
+TRZ.write(15.6)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ y_pos = 8.0 + 0.2 -0.2*i
+ TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_S31_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/carlos/Boron4.py b/script/Users/carlos/Boron4.py
new file mode 100644
index 0000000..5980602
--- /dev/null
+++ b/script/Users/carlos/Boron4.py
@@ -0,0 +1,28 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+
+#Sample 31
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/032020/270320/Ca/")
+nr_loops=1
+
+#TRY.write(8.)
+#TRZ.write(15.6)
+
+time.sleep(30)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ #y_pos = 8.0 -0.2*i
+ #TRY.write(y_pos)
+ time.sleep(1)
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 7)
+ otf(start=180, end=220, time=5, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='XAS_Ca_BKedge', folder='./')
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/gesara/17apr2020_Circscan.py b/script/Users/gesara/17apr2020_Circscan.py
new file mode 100644
index 0000000..1c04652
--- /dev/null
+++ b/script/Users/gesara/17apr2020_Circscan.py
@@ -0,0 +1,34 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/042020/220420/")
+
+sample = 'GB155'
+TRY.write(8.0)
+TRZ.write(15)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(2):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Mn_cp', folder='./')
+
+
+for i in range(1):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=570, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_O_cp', folder='./')
+ otf(start=520, end=570, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_O_cm', folder='./')
+ otf(start=520, end=570, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_O_cm', folder='./')
+ otf(start=520, end=570, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_O_cp', folder='./')
+
+
+
+time.sleep(3)
+close_vg13()
+
diff --git a/script/Users/gesara/20feb2020.py b/script/Users/gesara/20feb2020.py
new file mode 100644
index 0000000..ce7bebd
--- /dev/null
+++ b/script/Users/gesara/20feb2020.py
@@ -0,0 +1,30 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/20Feb2020/Sample120/")
+
+#Sample 120
+
+TRY.write(8.8)
+TRZ.write(9.5)
+
+nr_loops=10
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=610, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='Mn_linear', folder='')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=580, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='Oedge_linear', folder='')
+
+
+time.sleep(5)
+close_vg10()
+
+TRY.write(0.0)
+TRZ.write(0.0)
diff --git a/script/Users/gesara/20feb2020_Linearscan1.py b/script/Users/gesara/20feb2020_Linearscan1.py
new file mode 100644
index 0000000..45feddd
--- /dev/null
+++ b/script/Users/gesara/20feb2020_Linearscan1.py
@@ -0,0 +1,157 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample120/")
+
+#Sample 120
+
+TRY.write(8.8)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB120_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB120_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg10()
+
+#sample130
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample130/")
+
+TRY.write(1.8)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB130_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB130_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample133_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample133_Li/")
+
+TRY.write(-6.2)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB133_Li_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample140_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample140_Li/")
+
+TRY.write(8)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB140_Li_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample121
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample121/")
+
+TRY.write(0.2)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB121_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB121_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample122
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample122/")
+
+TRY.write(8)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB122_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB122_O_linear_1', folder='./')
+
+
+time.sleep(3)
+close_vg13()
diff --git a/script/Users/gesara/21feb2020_Circscan1.py b/script/Users/gesara/21feb2020_Circscan1.py
new file mode 100644
index 0000000..4161b03
--- /dev/null
+++ b/script/Users/gesara/21feb2020_Circscan1.py
@@ -0,0 +1,189 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample120circ/")
+
+#Sample 120
+
+TRY.write(6.0)
+TRZ.write(7.5)
+
+nr_loops=2
+
+open_vg13()
+time.sleep(1)
+
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 6)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB120_Mn_cp', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB120_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB120_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB120_Mn_cp', folder='./')
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB120_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB120_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB120_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB120_O_cp', folder='./')
+
+time.sleep(3)
+#close_vg10()
+
+#sample130
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample130circ/")
+
+TRY.write(1.5)
+TRZ.write(7.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 6)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB130_Mn_cp', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB130_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB130_Mn_cm', folder='./')
+# otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB130_Mn_cp', folder='./')
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB130_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB130_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB130_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB130_O_cp', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample133_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample133_Licirc/")
+
+TRY.write(-4)
+TRZ.write(7.5)
+
+nr_loops=5
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_cp', folder='./')
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB133_Li_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB133_Li_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB133_Li_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB133_Li_O_cp', folder='./')
+
+time.sleep(3)
+#close_vg13()
+
+#sample140_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample140_Licirc/")
+
+TRY.write(5.5)
+TRZ.write(22.9)
+
+nr_loops=5
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_cp', folder='./')
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB140_Li_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB140_Li_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB140_Li_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB140_Li_O_cp', folder='./')
+
+time.sleep(3)
+#close_vg13()
+
+#sample121
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample121circ/")
+
+TRY.write(0.0)
+TRZ.write(22.9)
+
+nr_loops=5
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB121_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB121_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB121_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB121_Mn_cp', folder='./')
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB121_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB121_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB121_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB121_O_cp', folder='./')
+
+time.sleep(3)
+#close_vg13()
+
+#sample122
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample122circ/")
+
+TRY.write(-6.5)
+TRZ.write(22.9)
+
+nr_loops=5
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB122_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB122_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB122_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB122_Mn_cp', folder='./')
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB122_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB122_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB122_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB122_O_cp', folder='./')
+time.sleep(3)
+close_vg13()
diff --git a/script/Users/gesara/Circscan.py b/script/Users/gesara/Circscan.py
new file mode 100644
index 0000000..d9a21f4
--- /dev/null
+++ b/script/Users/gesara/Circscan.py
@@ -0,0 +1,248 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+open_vg13()
+time.sleep(1)
+
+nr_loops=0
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+
+ #Sample 137
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample137circ/")
+ TRY.write(3.8)
+ TRZ.write(9.1)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB137_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB137_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB137_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB137_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB137_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB137_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB137_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB137_O_cp', folder='./')
+
+
+ #Sample 143
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample143circ/")
+ TRY.write(0.8)
+ TRZ.write(9.1)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB143_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB143_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB143_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB143_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB143_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB143_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB143_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB143_O_cp', folder='./')
+
+
+ #sample138
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample138circ/")
+ TRY.write(-2.6)
+ TRZ.write(9.1)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB138_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB138_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB138_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB138_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB138_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB138_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB138_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB138_O_cp', folder='./')
+
+
+ #sample139
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample139circ/")
+ TRY.write(-5.4)
+ TRZ.write(12.5)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB139_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB139_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB139_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB139_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB139_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB139_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB139_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB139_O_cp', folder='./')
+
+
+ #sample142
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample142circ/")
+ TRY.write(-0.2)
+ TRZ.write(24.9)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB142_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB142_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB142_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB142_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB142_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB142_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB142_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB142_O_cp', folder='./')
+
+
+ #sample141
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/Sample141circ/")
+ TRY.write(3.4)
+ TRZ.write(24.9)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB141_Mn_cp', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB141_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB141_Mn_cm', folder='./')
+ otf(start=620, end=680, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB141_Mn_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB141_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB141_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='GB141_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='GB141_O_cp', folder='./')
+
+for i in range(1):
+
+ #sampleFeSTOUV
+# set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleFeSTOUVcirc/")
+# TRY.write(6.2)
+# TRZ.write(16.1)
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cp', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cp', folder='./')
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cp', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cm', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cm', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cp', folder='./')
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cp', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cm', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cm', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cp', folder='./')
+
+ #sampleFeSTO
+# set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleFeSTOcirc/")
+# TRY.write(-7.6)
+# TRZ.write(20.7)
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cp', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cp', folder='./')
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_O_cp', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_O_cm', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_O_cm', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_O_cp', folder='./')
+
+# caput('X11MA-KEI10:RANGE', 6)
+ # caput('X11MA-KEI11:RANGE', 7)
+ # caput('X11MA-KEI12:RANGE', 8)
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cp', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cm', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cm', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cp', folder='./')
+
+ #sampleSTO
+# set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleSTOcirc/")
+# TRY.write(-3.8)
+# TRZ.write(20.7)
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_Ti_cp', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_Ti_cp', folder='./')
+
+# caput('X11MA-KEI10:RANGE', 6)
+ # caput('X11MA-KEI11:RANGE', 7)
+ # caput('X11MA-KEI12:RANGE', 8)
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_O_cp', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_O_cm', folder='./')
+ # otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_O_cm', folder='./')
+# otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_O_cp', folder='./')
+
+
+ #sampleSTOUV
+# set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleSTOUVcirc/")
+# TRY.write(-3.6)
+# TRZ.write(24.9)
+
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cp', folder='./')
+ # otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cm', folder='./')
+ # otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cm', folder='./')
+# otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cp', folder='./')
+#
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_O_cp', folder='./')
+
+time.sleep(3)
+close_vg13()
diff --git a/script/Users/gesara/FeSTO_circscan.py b/script/Users/gesara/FeSTO_circscan.py
new file mode 100644
index 0000000..69adc1f
--- /dev/null
+++ b/script/Users/gesara/FeSTO_circscan.py
@@ -0,0 +1,41 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/042020/220420/")
+
+
+sample = 'FeSTOUV_A'
+TRY.write(9)
+TRZ.write(8.5)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(1):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 9)
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cp', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cm', folder='./')
+# otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cp', folder='./')
+
+time.sleep(3)
+#close_vg10()
+sample = 'FeSTO_M3_a'
+TRY.write(8)
+TRZ.write(15)
+
+open_vg13()
+time.sleep(1)
+
+for i in range(2):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cp', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name=sample+'_Fe_cp', folder='./')
+
+time.sleep(3)
+close_vg13()
+
diff --git a/script/Users/gesara/FeSTO_linearscan.py b/script/Users/gesara/FeSTO_linearscan.py
new file mode 100644
index 0000000..8c7755b
--- /dev/null
+++ b/script/Users/gesara/FeSTO_linearscan.py
@@ -0,0 +1,113 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+open_vg13()
+time.sleep(1)
+
+#sampleFeSTOUV
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/042020/220420/")
+
+sample = 'STOUV_A'
+TRY.write(5.5)
+TRZ.write(8.5)
+
+for i in range(0):
+
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 9)
+ # otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l1', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l2', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l3', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l4', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l5', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l6', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l1', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l2', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l3', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l4', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l5', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l6', folder='./')
+
+#sampleFeSTO
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/042020/220420/")
+sample = 'FeSTOUV_A'
+TRY.write(9)
+TRZ.write(8.5)
+
+for i in range(1):
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l1', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l2', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l3', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l4', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l5', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l6', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l1', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l2', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l3', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l4', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l5', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l6', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l1', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l2', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l3', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l4', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l5', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l6', folder='./')
+
+#sampleFeSTO
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/042020/220420/")
+sample = 'FeSTOU_M3_a'
+TRY.write(8)
+TRZ.write(15)
+
+for i in range(1):
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l1', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l2', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l3', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l4', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l5', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Fe_l6', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l1', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l2', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l3', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l4', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l5', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_Ti_l6', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l1', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l2', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l3', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l4', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l5', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name=sample+'_O_l6', folder='./')
+
+time.sleep(3)
+close_vg13()
diff --git a/script/Users/steven/16july2020_Linearscan.py b/script/Users/steven/16july2020_Linearscan.py
new file mode 100644
index 0000000..45feddd
--- /dev/null
+++ b/script/Users/steven/16july2020_Linearscan.py
@@ -0,0 +1,157 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample120/")
+
+#Sample 120
+
+TRY.write(8.8)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB120_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB120_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg10()
+
+#sample130
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample130/")
+
+TRY.write(1.8)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB130_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB130_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample133_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample133_Li/")
+
+TRY.write(-6.2)
+TRZ.write(9.5)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB133_Li_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB133_Li_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample140_Li
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample140_Li/")
+
+TRY.write(8)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB140_Li_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB140_Li_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample121
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample121/")
+
+TRY.write(0.2)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB121_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB121_O_linear_1', folder='./')
+
+
+time.sleep(3)
+#close_vg13()
+
+#sample122
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/21Feb2020/Sample122/")
+
+TRY.write(8)
+TRZ.write(22.9)
+
+nr_loops=3
+
+open_vg13()
+time.sleep(1)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 6)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=620, end=680, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB122_Mn_linear_1', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='GB122_O_linear_1', folder='./')
+
+
+time.sleep(3)
+close_vg13()
diff --git a/script/Users/steven/HOLDER1_V2.py b/script/Users/steven/HOLDER1_V2.py
new file mode 100644
index 0000000..1bed420
--- /dev/null
+++ b/script/Users/steven/HOLDER1_V2.py
@@ -0,0 +1,704 @@
+#########Sample SL1-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-L/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_C', folder='XAS/2020/07/17/SL1-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_O', folder='XAS/2020/07/17/SL1-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Mn', folder='XAS/2020/07/17/SL1-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_F', folder='XAS/2020/07/17/SL1-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Co', folder='XAS/2020/07/17/SL1-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Ni', folder='XAS/2020/07/17/SL1-L/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Survey', folder='XAS/2020/07/17/SL1-L/')
+
+time.sleep(1)
+
+#########Sample SL3-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL3-L/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_C', folder='XAS/2020/07/17/SL3-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_O', folder='XAS/2020/07/17/SL3-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Mn', folder='XAS/2020/07/17/SL3-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_F', folder='XAS/2020/07/17/SL3-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Co', folder='XAS/2020/07/17/SL3-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Ni', folder='XAS/2020/07/17/SL3-L/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Survey', folder='XAS/2020/07/17/SL3-L/')
+
+time.sleep(1)
+
+
+#########Sample SL4-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL4-L/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_C', folder='XAS/2020/07/17/SL4-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_O', folder='XAS/2020/07/17/SL4-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Mn', folder='XAS/2020/07/17/SL4-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_F', folder='XAS/2020/07/17/SL4-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Co', folder='XAS/2020/07/17/SL4-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Ni', folder='XAS/2020/07/17/SL4-L/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Survey', folder='XAS/2020/07/17/SL4-L/')
+
+time.sleep(1)
+
+
+#########Sample SL5-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-L/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_C', folder='XAS/2020/07/17/SL5-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_O', folder='XAS/2020/07/17/SL5-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Mn', folder='XAS/2020/07/17/SL5-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_F', folder='XAS/2020/07/17/SL5-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Co', folder='XAS/2020/07/17/SL5-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Ni', folder='XAS/2020/07/17/SL5-L/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Survey', folder='XAS/2020/07/17/SL5-L/')
+
+time.sleep(1)
+
+#########Sample SL6-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL6-L/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_C', folder='XAS/2020/07/17/SL6-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_O', folder='XAS/2020/07/17/SL6-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Mn', folder='XAS/2020/07/17/SL6-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_F', folder='XAS/2020/07/17/SL6-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Co', folder='XAS/2020/07/17/SL6-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Ni', folder='XAS/2020/07/17/SL6-L/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Survey', folder='XAS/2020/07/17/SL6-L/')
+
+time.sleep(1)
+
+
+
+
+#########Sample SL1-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-LF/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_C', folder='XAS/2020/07/17/SL1-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_O', folder='XAS/2020/07/17/SL1-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Mn', folder='XAS/2020/07/17/SL1-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_F', folder='XAS/2020/07/17/SL1-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Co', folder='XAS/2020/07/17/SL1-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Ni', folder='XAS/2020/07/17/SL1-LF/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Survey', folder='XAS/2020/07/17/SL1-LF/')
+
+time.sleep(1)
+
+#########Sample SL3-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL3-LF/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_C', folder='XAS/2020/07/17/SL3-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_O', folder='XAS/2020/07/17/SL3-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Mn', folder='XAS/2020/07/17/SL3-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_F', folder='XAS/2020/07/17/SL3-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Co', folder='XAS/2020/07/17/SL3-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Ni', folder='XAS/2020/07/17/SL3-LF/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Survey', folder='XAS/2020/07/17/SL3-LF/')
+
+time.sleep(1)
+
+
+#########Sample SL4-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL4-LF/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_C', folder='XAS/2020/07/17/SL4-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_O', folder='XAS/2020/07/17/SL4-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Mn', folder='XAS/2020/07/17/SL4-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_F', folder='XAS/2020/07/17/SL4-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Co', folder='XAS/2020/07/17/SL4-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Ni', folder='XAS/2020/07/17/SL4-LF/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Survey', folder='XAS/2020/07/17/SL4-LF/')
+
+time.sleep(1)
+
+
+#########Sample SL5-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-LF/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_C', folder='XAS/2020/07/17/SL5-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_O', folder='XAS/2020/07/17/SL5-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Mn', folder='XAS/2020/07/17/SL5-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_F', folder='XAS/2020/07/17/SL5-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Co', folder='XAS/2020/07/17/SL5-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Ni', folder='XAS/2020/07/17/SL5-LF/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Survey', folder='XAS/2020/07/17/SL5-LF/')
+
+time.sleep(1)
+
+#########Sample SL6-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL6-LF/")
+open_vg13()
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_C', folder='XAS/2020/07/17/SL6-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_O', folder='XAS/2020/07/17/SL6-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Mn', folder='XAS/2020/07/17/SL6-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_F', folder='XAS/2020/07/17/SL6-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Co', folder='XAS/2020/07/17/SL6-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Ni', folder='XAS/2020/07/17/SL6-LF/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Survey', folder='XAS/2020/07/17/SL6-LF/')
+
+time.sleep(1)
+
+
+
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/HOLDER2.py b/script/Users/steven/HOLDER2.py
new file mode 100644
index 0000000..8d14b8b
--- /dev/null
+++ b/script/Users/steven/HOLDER2.py
@@ -0,0 +1,701 @@
+#########Sample SL1-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-L/")
+#open_vg13()
+#
+#TRY.write(1.75)
+#TRZ.write(23.15)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_C', folder='XAS/2020/07/17/SL1-L/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_O', folder='XAS/2020/07/17/SL1-L/')
+#
+#Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Mn', folder='XAS/2020/07/17/SL1-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_F', folder='XAS/2020/07/17/SL1-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Co', folder='XAS/2020/07/17/SL1-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Ni', folder='XAS/2020/07/17/SL1-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Survey', folder='XAS/2020/07/17/SL1-L/')
+#
+#time.sleep(1)
+
+#########Sample SL1-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-LF/")
+#open_vg13()
+#
+#TRY.write(1.5)
+#TRZ.write(16.65)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_C', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_O', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Mn', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_F', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Co', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Ni', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Survey', folder='XAS/2020/07/17/SL1-LF/')
+#
+#time.sleep(1)
+#
+#########Sample SL3-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL3-L/")
+#open_vg13()
+#
+#TRY.write(6.75)
+#TRZ.write(29.65)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_C', folder='XAS/2020/07/17/SL3-L/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_O', folder='XAS/2020/07/17/SL3-L/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Mn', folder='XAS/2020/07/17/SL3-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_F', folder='XAS/2020/07/17/SL3-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Co', folder='XAS/2020/07/17/SL3-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Ni', folder='XAS/2020/07/17/SL3-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Survey', folder='XAS/2020/07/17/SL3-L/')
+#
+#time.sleep(1)
+#
+##########Sample SL3-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL3-LF/")
+#open_vg13()
+#
+#TRY.write(7.5)
+#TRZ.write(11.65)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_C', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_O', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Mn', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_F', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time680=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Co', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Ni', folder='XAS/2020/07/17/SL3-LF/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Survey', folder='XAS/2020/07/17/SL3-LF/')
+#
+#time.sleep(1)
+#
+
+##########Sample SL4-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL4-L/")
+#open_vg13()
+#
+#TRY.write(18.00)
+#TRZ.write(29.65)
+#
+#
+#time.sleep(1)
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_C', folder='XAS/2020/07/17/SL4-L/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_O', folder='XAS/2020/07/17/SL4-L/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Mn', folder='XAS/2020/07/17/SL4-L/')
+#
+##Fluor K edge680
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_F', folder='XAS/2020/07/17/SL4-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Co', folder='XAS/2020/07/17/SL4-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Ni', folder='XAS/2020/07/17/SL4-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Survey', folder='XAS/2020/07/17/SL4-L/')
+#
+##time.sleep(1)
+#
+##########Sample SL4-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL4-LF/")
+#open_vg13()
+#
+#TRY.write(18.00)
+#TRZ.write(11.65)
+#
+#
+#time.sleep(1)
+#
+###Carbon K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_C', folder='XAS/2020/07/17/SL4-LF/')
+
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_O', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Mn', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_F', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Co', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Ni', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Survey', folder='XAS/2020/07/17/SL4-LF/')
+#
+#time.sleep(1)
+#
+
+##########Sample SL5-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-L/")
+#open_vg13()
+#
+#TRY.write(23.00)
+#TRZ.write(23.65)
+#
+#
+#time.sleep(1)
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_C', folder='XAS/2020/07/17/SL5-L/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_O', folder='XAS/2020/07/17/SL5-L/')
+#
+##Manganese L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Mn', folder='XAS/2020/07/17/SL5-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_F', folder='XAS/2020/07/17/SL5-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Co', folder='XAS/2020/07/17/SL5-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Ni', folder='XAS/2020/07/17/SL5-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Survey', folder='XAS/2020/07/17/SL5-L/')
+#
+#time.sleep(1)
+#
+#########Sample SL5-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-LF_new/")
+open_vg13()
+
+TRY.write(23.50)
+TRZ.write(17.15)
+
+
+time.sleep(1)
+
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_C', folder='XAS/2020/07/17/SL5-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_O', folder='XAS/2020/07/17/SL5-LF/')
+
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Mn', folder='XAS/2020/07/17/SL5-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_F', folder='XAS/2020/07/17/SL5-LF_new/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Co', folder='XAS/2020/07/17/SL5-LF_new/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Ni', folder='XAS/2020/07/17/SL5-LF_new/')
+
+#Survey
+
+nr_loops=2
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Survey', folder='XAS/2020/07/17/SL5-LF_new/')
+
+time.sleep(1)
+
+#########Sample SL6-L
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL6-L/")
+open_vg13()
+
+TRY.write(7.25)
+TRZ.write(23.15)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_C', folder='XAS/2020/07/17/SL6-L/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_O', folder='XAS/2020/07/17/SL6-L/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Mn', folder='XAS/2020/07/17/SL6-L/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_F', folder='XAS/2020/07/17/SL6-L/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Co', folder='XAS/2020/07/17/SL6-L/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Ni', folder='XAS/2020/07/17/SL6-L/')
+
+#Survey
+
+nr_loops=2
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Survey', folder='XAS/2020/07/17/SL6-L/')
+
+time.sleep(1)
+
+
+
+#########Sample SL6-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL6-LF/")
+open_vg13()
+
+TRY.write(18.50)
+TRZ.write(17.15)
+
+
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_C', folder='XAS/2020/07/17/SL6-LF/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_O', folder='XAS/2020/07/17/SL6-LF/')
+
+#Manganese L edge
+nr_loops=6
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Mn', folder='XAS/2020/07/17/SL6-LF/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_F', folder='XAS/2020/07/17/SL6-LF/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Co', folder='XAS/2020/07/17/SL6-LF/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Ni', folder='XAS/2020/07/17/SL6-LF/')
+
+#Survey
+
+nr_loops=2
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Survey', folder='XAS/2020/07/17/SL6-LF/')
+
+time.sleep(1)
+
+
+
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/HOLDER2_v2.py b/script/Users/steven/HOLDER2_v2.py
new file mode 100644
index 0000000..de919a7
--- /dev/null
+++ b/script/Users/steven/HOLDER2_v2.py
@@ -0,0 +1,701 @@
+#########Sample SL1-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-L/")
+#open_vg13()
+#
+#TRY.write(1.75)
+#TRZ.write(23.15)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_C', folder='XAS/2020/07/17/SL1-L/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_O', folder='XAS/2020/07/17/SL1-L/')
+#
+#Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Mn', folder='XAS/2020/07/17/SL1-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_F', folder='XAS/2020/07/17/SL1-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Co', folder='XAS/2020/07/17/SL1-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Ni', folder='XAS/2020/07/17/SL1-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-L_Survey', folder='XAS/2020/07/17/SL1-L/')
+#
+#time.sleep(1)
+
+#########Sample SL1-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL1-LF/")
+#open_vg13()
+#
+#TRY.write(1.5)
+#TRZ.write(16.65)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_C', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_O', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Mn', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_F', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Co', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Ni', folder='XAS/2020/07/17/SL1-LF/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-LF_Survey', folder='XAS/2020/07/17/SL1-LF/')
+#
+#time.sleep(1)
+#
+#########Sample SL3-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL3-L/")
+#open_vg13()
+#
+#TRY.write(6.75)
+#TRZ.write(29.65)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_C', folder='XAS/2020/07/17/SL3-L/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_O', folder='XAS/2020/07/17/SL3-L/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Mn', folder='XAS/2020/07/17/SL3-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_F', folder='XAS/2020/07/17/SL3-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Co', folder='XAS/2020/07/17/SL3-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Ni', folder='XAS/2020/07/18/SL3-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-L_Survey', folder='XAS/2020/07/17/SL3-L/')
+#
+#time.sleep(1)
+#
+###########Sample SL3-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL3-LF/")
+#open_vg13()
+#
+#TRY.write(7.5)
+#TRZ.write(11.65)
+#
+#
+#time.sleep(1)
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_C', folder='XAS/2020/07/17/SL3-LF/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_O', folder='XAS/2020/07/17/SL3-LF/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Mn', folder='XAS/2020/07/17/SL3-LF/')
+##
+###Fluor K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_F', folder='XAS/2020/07/17/SL3-LF/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time680=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Co', folder='XAS/2020/07/17/SL3-LF/')
+##
+###Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Ni', folder='XAS/2020/07/18/SL3-LF/')
+#
+###Survey
+##
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3-LF_Survey', folder='XAS/2020/07/17/SL3-LF/')
+#
+#time.sleep(1)
+#
+
+###########Sample SL4-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL4-L/")
+#open_vg13()
+#
+#TRY.write(18.00)
+#TRZ.write(29.65)
+#
+#
+#time.sleep(1)
+#
+####Carbon K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 8)
+### otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_C', folder='XAS/2020/07/17/SL4-L/')
+###
+####Oxygen K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_O', folder='XAS/2020/07/17/SL4-L/')
+###
+####Manganese L edge
+###nr_loops=6
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Mn', folder='XAS/2020/07/17/SL4-L/')
+##
+###Fluor K edge680
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_F', folder='XAS/2020/07/17/SL4-L/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Co', folder='XAS/2020/07/17/SL4-L/')
+##
+###Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Ni', folder='XAS/2020/07/18/SL4-L/')
+#
+###Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L_Survey', folder='XAS/2020/07/17/SL4-L/')
+#
+##time.sleep(1)
+#
+##########Sample SL4-LF
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL4-LF/")
+open_vg13()
+
+TRY.write(18.00)
+TRZ.write(11.65)
+
+
+time.sleep(1)
+
+###Carbon K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_C', folder='XAS/2020/07/17/SL4-LF/')
+
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_O', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Mn', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_F', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Co', folder='XAS/2020/07/17/SL4-LF/')
+#
+##Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Ni', folder='XAS/2020/07/18/SL4-LF/')
+
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF_Survey', folder='XAS/2020/07/17/SL4-LF/')
+#
+#time.sleep(1)
+#
+
+##########Sample SL5-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-L/")
+#open_vg13()
+#
+#TRY.write(23.00)
+#TRZ.write(23.65)
+#
+#
+#time.sleep(1)
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_C', folder='XAS/2020/07/17/SL5-L/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_O', folder='XAS/2020/07/17/SL5-L/')
+#
+##Manganese L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Mn', folder='XAS/2020/07/17/SL5-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_F', folder='XAS/2020/07/17/SL5-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Co', folder='XAS/2020/07/17/SL5-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Ni', folder='XAS/2020/07/17/SL5-L/')
+#
+##Survey
+#
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-L_Survey', folder='XAS/2020/07/17/SL5-L/')
+#
+##time.sleep(1)
+##
+##########Sample SL5-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/17/SL5-LF/")
+#open_vg13()
+#
+#TRY.write(23.50)
+#TRZ.write(17.15)
+#
+#
+#time.sleep(1)
+#
+###Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_C', folder='XAS/2020/07/17/SL5-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_O', folder='XAS/2020/07/17/SL5-LF/')
+
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Mn', folder='XAS/2020/07/17/SL5-LF/')
+
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_F', folder='XAS/2020/07/17/SL5-LF/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Co', folder='XAS/2020/07/17/SL5-LF/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Ni', folder='XAS/2020/07/17/SL5-LF/')
+#
+##Survey
+#
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5-LF_Survey', folder='XAS/2020/07/17/SL5-LF/')
+#
+#time.sleep(1)
+#
+##########Sample SL6-L
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL6-L/")
+#open_vg13()
+#
+#TRY.write(7.25)
+#TRZ.write(23.15)
+#
+#
+#time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_C', folder='XAS/2020/07/18/SL6-L/')
+#
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_O', folder='XAS/2020/07/18/SL6-L/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Mn', folder='XAS/2020/07/18/SL6-L/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_F', folder='XAS/2020/07/18/SL6-L/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Co', folder='XAS/2020/07/18/SL6-L/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Ni', folder='XAS/2020/07/18/SL6-L/')
+#
+##Survey
+#
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-L_Survey', folder='XAS/2020/07/18/SL6-L/')
+#
+#time.sleep(1)
+#
+
+
+##########Sample SL6-LF
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/18/SL6-LF/")
+#open_vg13()
+#
+#TRY.write(18.50)
+#TRZ.write(17.15)
+#
+#
+#time.sleep(1)
+
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_C', folder='XAS/2020/07/18/SL6-LF/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_O', folder='XAS/2020/07/18/SL6-LF/')
+
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Mn', folder='XAS/2020/07/18/SL6-LF/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_F', folder='XAS/2020/07/18/SL6-LF/')
+
+#Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Co', folder='XAS/2020/07/18/SL6-LF/')
+
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Ni', folder='XAS/2020/07/18/SL6-LF/')
+#
+##Survey
+#
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6-LF_Survey', folder='XAS/2020/07/18/SL6-LF/')
+#
+#time.sleep(1)
+#
+#
+
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/HOLDER3.py b/script/Users/steven/HOLDER3.py
new file mode 100644
index 0000000..2b5f25e
--- /dev/null
+++ b/script/Users/steven/HOLDER3.py
@@ -0,0 +1,485 @@
+#########Sample beta
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/beta-new/")
+#open_vg13()
+#
+#TRY.write(6.00)
+#TRZ.write(23.90)
+#
+#
+#time.sleep(1)
+#
+#
+####Carbon K edge
+###nr_loops=2
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='beta_C', folder='XAS/2020/07/19/beta-new/')
+###
+###Oxygen K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='beta_O', folder='XAS/2020/07/19/beta-new/')
+###
+###Fluor + Fe edges
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='beta_F-Fe', folder='XAS/2020/07/19/beta-new/')
+###
+####Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='beta_Survey', folder='XAS/2020/07/19/beta-new/')
+#
+#time.sleep(1)
+##
+##
+##
+##########Sample SL-RP
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL-RP-new/")
+#open_vg13()
+#
+#TRY.write(12.00)
+#TRZ.write(27.90)
+#
+#
+#time.sleep(1)
+#
+####Carbon K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 8)
+### otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_C', folder='XAS/2020/07/19/SL-RP-new/')
+##
+####Oxygen K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_O', folder='XAS/2020/07/19/SL-RP-new')
+###
+###Manganese L edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_Mn', folder='XAS/2020/07/19/SL-RP-new/')
+###
+####Fluor + Fe edges
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_F-Fe', folder='XAS/2020/07/19/SL-RP-new/')
+#
+####Cobalt L edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_Co', folder='XAS/2020/07/19/SL-RP-new/')
+###
+###Nickel L edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_Ni', folder='XAS/2020/07/19/SL-RP-new/')
+###
+####Survey
+###nr_loops=2
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_Survey', folder='XAS/2020/07/19/SL-RP-new/')
+###
+###
+####Coper L edge
+####nr_loops=1
+####for i in range(nr_loops):
+#### caput('X11MA-KEI10:RANGE', 6)
+#### caput('X11MA-KEI11:RANGE', 8)
+#### caput('X11MA-KEI12:RANGE', 10)
+#### otf(start=920, end=970, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-RP_Cu', folder='XAS/2020/07/19/SL-RP/')
+###
+#time.sleep(1)
+###
+###
+##
+##########Sample SL-FRP
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL-FRP-new/")
+#open_vg13()
+#
+#TRY.write(20.50)
+#TRZ.write(26.90)
+#
+#
+#time.sleep(1)
+#
+###Carbon K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 8)
+### otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_C', folder='XAS/2020/07/19/SL-FRP-new/')
+###
+####Oxygen K edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_O', folder='XAS/2020/07/19/SL-FRP-new/')
+###
+###Manganese L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_Mn', folder='XAS/2020/07/19/SL-FRP-new/')
+##
+###Fluor + Fe edges
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_F-Fe', folder='XAS/2020/07/19/SL-FRP-new/')
+#
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_Co', folder='XAS/2020/07/19/SL-FRP-new/')
+##
+###Nickel L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_Ni', folder='XAS/2020/07/19/SL-FRP-new/')
+##
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_Survey', folder='XAS/2020/07/19/SL-FRP-new/')
+##
+####Coper L edge
+###nr_loops=3
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 6)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=920, end=970, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL-FRP_Cu', folder='XAS/2020/07/19/SL-FRP/')
+##
+#time.sleep(1)
+##
+##
+##
+###########Sample SL7
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL7-new/")
+open_vg13()
+
+TRY.write(13.00)
+TRZ.write(11.40)
+
+
+time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_C', folder='XAS/2020/07/19/SL7-new/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_O', folder='XAS/2020/07/19/SL7-new/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_Mn', folder='XAS/2020/07/19/SL7-new/')
+#
+##Fluor + Fe edges
+nr_loops=1
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_F-Fe', folder='XAS/2020/07/19/SL7-new/')
+
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_Co', folder='XAS/2020/07/19/SL7-new/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_Ni', folder='XAS/2020/07/19/SL7-new/')
+#
+##Survey
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7_Survey', folder='XAS/2020/07/19/SL7-new/')
+#
+time.sleep(1)
+#
+#
+
+
+############Sample SL7-F
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL7-F-new/")
+open_vg13()
+
+TRY.write(21.50)
+TRZ.write(20.40)
+
+
+time.sleep(1)
+##
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_C', folder='XAS/2020/07/19/SL7-F-new/')
+
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_O', folder='XAS/2020/07/19/SL7-F-new/')
+
+##Manganese L edge
+#nr_loops=5
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_Mn', folder='XAS/2020/07/19/SL7-F-new/')
+#
+##Fluor + Fe edges
+nr_loops=1
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_F-Fe', folder='XAS/2020/07/19/SL7-F-new/')
+
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_Co', folder='XAS/2020/07/19/SL7-F-new/')
+#
+##Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_Survey', folder='XAS/2020/07/19/SL7-F-new/')
+#
+##Nickel L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 9)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-F_Ni', folder='XAS/2020/07/19/SL7-F-new/')
+#
+#time.sleep(1)
+#
+
+
+############Sample SL8
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL8-new/")
+#open_vg13()
+#
+#TRY.write(7.50)
+#TRZ.write(15.40)
+#
+#
+#time.sleep(1)
+
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_C', folder='XAS/2020/07/19/SL8-new/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_O', folder='XAS/2020/07/19/SL8-new/')
+#
+##Manganese L edge
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_Mn', folder='XAS/2020/07/19/SL8-new/')
+#
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_F-Fe', folder='XAS/2020/07/19/SL8-new/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_Co', folder='XAS/2020/07/19/SL8-new/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 9)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_Ni', folder='XAS/2020/07/19/SL8-new/')
+
+##Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8_Survey', folder='XAS/2020/07/19/SL8-new/')
+#
+#time.sleep(1)
+#
+
+
+############Sample SL8-F
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL8-F-new/")
+#open_vg13()
+#
+#TRY.write(21.00)
+#TRZ.write(14.90)
+#
+#
+#time.sleep(1)
+
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8-F_C', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Oxygen K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8-F_O', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Manganese L edge
+#nr_loops=4
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8-F_Mn', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8-F_F-Fe', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Cobalt L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL8-F_Co', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 9)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-8_Ni', folder='XAS/2020/07/19/SL8-F-new/')
+#
+##Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL7-8_Survey', folder='XAS/2020/07/19/SL8-F-new/')
+#
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/HOLDER4.py b/script/Users/steven/HOLDER4.py
new file mode 100644
index 0000000..c2974b3
--- /dev/null
+++ b/script/Users/steven/HOLDER4.py
@@ -0,0 +1,1198 @@
+#
+########Sample SL4-L-LC30
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL4-L-LC30/")
+##open_vg13()
+##
+##TRY.write(18.25)
+##TRZ.write(15.65)
+##
+##
+##time.sleep(1)
+##
+##Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_Survey', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+##Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_Ni', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+##Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_Co', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+##Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_F-Fe', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_Mn', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+##Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_O', folder='XAS/2020/07/19/SL4-L-LC30')
+##
+##
+##Carbon K edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-L-LC30_C', folder='XAS/2020/07/19/SL4-L-LC30/')
+##
+##
+##time.sleep(1)
+#
+#
+########Sample SL4-LF-LC30
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL4-LF-LC30-new/")
+##open_vg13()
+##
+##TRY.write(7.25)
+##TRZ.write(21.40)
+##
+##
+##time.sleep(1)
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Survey', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Ni', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Co', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+###Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_F-Fe', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Mn', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_O', folder='XAS/2020/07/19/SL4-LF-LC30-new')
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_C', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+##
+##
+##time.sleep(1)
+#
+#########Sample Gold
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/Gold/")
+##open_vg13()
+##
+##TRY.write(6.75)
+##TRZ.write(14.40)
+##
+##
+##time.sleep(1)
+##
+####Carbon K edge
+###nr_loops=2
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='Gold_C', folder='XAS/2020/07/19/Gold/')
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='Gold_Survey', folder='XAS/2020/07/19/Gold/')
+##
+##time.sleep(1)
+#
+#
+#
+#########Sample AS1
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS1/")
+##open_vg13()
+##
+##TRY.write(23.98)
+##TRZ.write(17.15)
+##
+##
+##time.sleep(1)
+#
+##Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_Survey', folder='XAS/2020/07/19/AS1/')
+##
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_Ni', folder='XAS/2020/07/19/AS1/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_Co', folder='XAS/2020/07/19/AS1/')
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_Fe-F', folder='XAS/2020/07/19/AS1/')
+#
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_Mn', folder='XAS/2020/07/19/AS1/')
+#
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_O', folder='XAS/2020/07/19/AS1')
+##
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1_C', folder='XAS/2020/07/19/AS1/')
+#
+##
+##time.sleep(1)
+##
+#########Sample AS1-F
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS1-F/")
+##open_vg13()
+##
+##TRY.write(23.98)
+##TRZ.write(22.65)
+#
+#
+##time.sleep(1)
+#
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_Survey', folder='XAS/2020/07/19/AS1-F/')
+#
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_Ni', folder='XAS/2020/07/19/AS1-F/')
+#
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_Co', folder='XAS/2020/07/19/AS1-F/')
+##
+###Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_Fe-F', folder='XAS/2020/07/19/AS1-F/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_Mn', folder='XAS/2020/07/19/AS1-F/')
+#
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_O', folder='XAS/2020/07/19/AS1-F')
+#
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS1-F_C', folder='XAS/2020/07/19/AS1-F/')
+#
+#
+##time.sleep(1)
+#
+########Sample AS2-LC30
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS2-LC30/")
+#open_vg13()
+#
+#TRY.write(19.73)
+#TRZ.write(10.15)
+#
+#
+##time.sleep(1)
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_Survey', folder='XAS/2020/07/19/AS2-LC30/')
+#
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_Ni', folder='XAS/2020/07/19/AS2-LC30/')
+#
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_Co', folder='XAS/2020/07/19/AS2-LC30/')
+#
+###Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_Fe-F', folder='XAS/2020/07/19/AS2-LC30/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Ni', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_Mn', folder='XAS/2020/07/19/AS2-LC30/')
+#
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_O', folder='XAS/2020/07/19/AS2-LC30')
+#
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-LC30_C', folder='XAS/2020/07/19/AS2-LC30/')
+#
+#
+#time.sleep(1)
+#
+########Sample AS2-F-LC30
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS2-F-LC30/")
+#open_vg13()
+#
+#TRY.write(19.48)
+#TRZ.write(27.65)
+#
+#
+##time.sleep(1)
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_Survey', folder='XAS/2020/07/19/AS2-F-LC30/')
+#
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_Ni', folder='XAS/2020/07/19/AS2-F-LC30/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_Co', folder='XAS/2020/07/19/AS2-F-LC30/')
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_Fe-F', folder='XAS/2020/07/19/AS2-F-LC30/')
+##
+###Manganese L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_Mn', folder='XAS/2020/07/19/AS2-F-LC30/')
+#
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_O', folder='XAS/2020/07/19/AS2-F-LC30')
+#
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS2-F-LC30_C', folder='XAS/2020/07/19/AS2-F-LC30/')
+##
+##
+##time.sleep(1)
+#
+#
+#########Sample AS3
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS3/")
+#open_vg13()
+#
+#TRY.write(7.88)
+#TRZ.write(9.50)
+#
+#
+##time.sleep(1)
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_Survey', folder='XAS/2020/07/19/AS3/')
+##
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_Ni', folder='XAS/2020/07/19/AS3/')
+#
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_Co', folder='XAS/2020/07/19/AS3/')
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_Fe-F', folder='XAS/2020/07/19/AS3/')
+##
+###Manganese L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_Mn', folder='XAS/2020/07/19/AS3/')
+##
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_O', folder='XAS/2020/07/19/AS3')
+#
+#
+##Carbon K edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3_C', folder='XAS/2020/07/19/AS3/')
+#
+
+#time.sleep(1)
+
+
+########Sample AS3-F
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS3-F/")
+#open_vg13()
+#
+#TRY.write(6.48)
+#TRZ.write(28.00)
+#
+#
+#time.sleep(1)
+
+##Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_Survey', folder='XAS/2020/07/19/AS3-F/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_Ni', folder='XAS/2020/07/19/AS3-F/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_Co', folder='XAS/2020/07/19/AS3-F/')
+#
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_Fe-F', folder='XAS/2020/07/19/AS3-F/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_Mn', folder='XAS/2020/07/19/AS3-F/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_O', folder='XAS/2020/07/19/AS3-F')
+#
+
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS3-F_C', folder='XAS/2020/07/19/AS3-F/')
+#
+#
+#time.sleep(1)
+#
+
+
+
+########Sample AS4
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS4/")
+#open_vg13()
+#
+#TRY.write(2.23)
+#TRZ.write(16.60)
+#
+#
+#time.sleep(1)
+#
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_Survey', folder='XAS/2020/07/19/AS4/')
+#
+##Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_Ni', folder='XAS/2020/07/19/AS4/')
+#
+##Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_Co', folder='XAS/2020/07/19/AS4/')
+#
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_Fe-F', folder='XAS/2020/07/19/AS4/')
+#
+##Manganese L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_Mn', folder='XAS/2020/07/19/AS4/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_O', folder='XAS/2020/07/19/AS4')
+#
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4_C', folder='XAS/2020/07/19/AS4/')
+#
+#
+#time.sleep(1)
+#
+#
+########Sample AS4-F
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS4-F/")
+#open_vg13()
+#
+#TRY.write(2.23)
+#TRZ.write(21.70)
+#
+#
+#time.sleep(1)
+#
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Survey', folder='XAS/2020/07/19/AS4-F/')
+##
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Ni', folder='XAS/2020/07/19/AS4-F/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Co', folder='XAS/2020/07/19/AS4-F/')
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Fe-F', folder='XAS/2020/07/19/AS4-F/')
+##
+###Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Mn', folder='XAS/2020/07/19/AS4-F/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_O', folder='XAS/2020/07/19/AS4-F')
+##
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 8)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_C', folder='XAS/2020/07/19/AS4-F/')
+##
+##
+##time.sleep(1)
+##
+#######Sample JBF3
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/JBF3/")
+#open_vg13()
+#
+#TRY.write(12.13)
+#TRZ.write(24.00)
+##
+#
+#time.sleep(1)
+#
+##Survey
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_Survey', folder='XAS/2020/07/19/JBF3/')
+###
+###Cobalt L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_Co', folder='XAS/2020/07/19/JBF3/')
+##
+####Fluor + Fe edges
+###nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_Fe-F', folder='XAS/2020/07/19/JBF3/')
+##
+###Manganese L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_Mn', folder='XAS/2020/07/19/JBF3/')
+##
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_O', folder='XAS/2020/07/19/JBF3')
+#
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF3_C', folder='XAS/2020/07/19/JBF3/')
+#
+#
+#time.sleep(1)
+##
+#
+#
+#########Sample JBF4
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/JBF4/")
+##open_vg13()
+##
+##TRY.write(12.13)
+##TRZ.write(28.60)
+##
+##
+##time.sleep(1)
+##
+####Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_Survey', folder='XAS/2020/07/19/JBF4/')
+##
+###Nickel L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AJBF4_Ni', folder='XAS/2020/07/19/JBF4/')
+##
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_Fe-F', folder='XAS/2020/07/19/JBF4/')
+#
+###Manganese L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_Mn', folder='XAS/2020/07/19/JBF4/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_O', folder='XAS/2020/07/19/JBF4')
+##
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_C', folder='XAS/2020/07/19/JBF4/')
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF4_Survey', folder='XAS/2020/07/19/JBF4/')
+##
+###Nickel L edge
+##nr_loops=6
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AJBF4_Ni', folder='XAS/2020/07/19/JBF4/')
+
+
+#time.sleep(1)
+#
+########Sample JBF1
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/JBF1/")
+#open_vg13()
+#
+#TRY.write(13.38)
+#TRZ.write(9.25)
+#
+#
+#time.sleep(1)
+
+##Survey
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF1_Survey', folder='XAS/2020/07/19/JBF1/')
+#
+#
+
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF1_Fe-F', folder='XAS/2020/07/19/JBF1/')
+#
+##Manganese L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF1_Mn', folder='XAS/2020/07/19/JBF1/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF1_O', folder='XAS/2020/07/19/JBF1')
+#
+
+#Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF1_C', folder='XAS/2020/07/19/JBF1/')
+#
+#
+#time.sleep(1)
+
+
+########Sample JBF5
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/JBF5/")
+#open_vg13()
+#
+#TRY.write(17.63)
+#TRZ.write(21.60)
+#
+#
+#time.sleep(1)
+#
+##Survey
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF5_Survey', folder='XAS/2020/07/19/JBF5/')
+#
+#
+#
+##Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF5_Fe-F', folder='XAS/2020/07/19/JBF5/')
+#
+##Manganese L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF5_Mn', folder='XAS/2020/07/19/JBF5/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF5_O', folder='XAS/2020/07/19/JBF5')
+#
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 8)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF5_C', folder='XAS/2020/07/19/JBF5/')
+#
+#
+#time.sleep(1)
+#
+
+#######Sample JBF2
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/JBF2/")
+#open_vg13()
+#
+#TRY.write(12.63)
+#TRZ.write(14.25)
+#
+#
+#time.sleep(1)
+#
+##Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 6)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF2_Survey', folder='XAS/2020/07/19/JBF2/')
+#
+#
+#
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF2_Fe-F', folder='XAS/2020/07/19/JBF2/')
+#
+##Manganese L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 7)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF2_Mn', folder='XAS/2020/07/19/JBF2/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF2_O', folder='XAS/2020/07/19/JBF2')
+#
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='JBF2_C', folder='XAS/2020/07/19/JBF2/')
+#
+#
+#
+#time.sleep(1)
+
+######Sample AS4-F
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/AS4-F/")
+#open_vg13()
+#
+#TRY.write(2.23)
+#TRZ.write(21.70)
+#
+#
+#time.sleep(1)
+#
+##Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Survey', folder='XAS/2020/07/19/AS4-F/')
+##
+##Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Ni', folder='XAS/2020/07/19/AS4-F/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Co', folder='XAS/2020/07/19/AS4-F/')
+##
+##Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Fe-F', folder='XAS/2020/07/19/AS4-F/')
+##
+##Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_Mn', folder='XAS/2020/07/19/AS4-F/')
+##
+##Oxygen K edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_O', folder='XAS/2020/07/19/AS4-F')
+##
+#
+##Carbon K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='AS4-F_C', folder='XAS/2020/07/19/AS4-F/')
+#
+#
+#time.sleep(1)
+#
+######Sample SL4-LF-LC30
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/19/SL4-LF-LC30-new/")
+open_vg13()
+
+TRY.write(7.25)
+TRZ.write(21.40)
+
+
+time.sleep(1)
+
+#Survey
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Survey', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+#Nickel L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Ni', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+#Cobalt L edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Co', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+#Fluor + Fe edges
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_F-Fe', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+#Manganese L edge
+#nr_loops=4
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_Mn', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+#
+#Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_O', folder='XAS/2020/07/19/SL4-LF-LC30-new')
+#
+#Carbon K edge
+nr_loops=2
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4-LF-LC30_C', folder='XAS/2020/07/19/SL4-LF-LC30-new/')
+
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/HOLDER5.py b/script/Users/steven/HOLDER5.py
new file mode 100644
index 0000000..2087b6a
--- /dev/null
+++ b/script/Users/steven/HOLDER5.py
@@ -0,0 +1,876 @@
+##
+#######Sample SL1-freshpowder
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/SL1-freshpowder/")
+##open_vg13()
+##
+##TRY.write(14.10)
+##TRZ.write(28.90)
+##
+##
+##time.sleep(1)
+#
+##Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_Survey', folder='XAS/2020/07/20/SL1-freshpowder/')
+##
+###Nickel L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_Ni', folder='XAS/2020/07/20/SL1-freshpowder/')
+##
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_Co', folder='XAS/2020/07/20/SL1-freshpowder/')
+##
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_Fe', folder='XAS/2020/07/20/SL1-freshpowder/')
+##
+###Manganese L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_Mn', folder='XAS/2020/07/20/SL1-freshpowder/')
+##
+###Oxygen K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_O', folder='XAS/2020/07/20/SL1-freshpowder')
+##
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpowder_C', folder='XAS/2020/07/20/SL1-freshpowder')
+##
+##
+##time.sleep(1)
+##
+##
+########Sample SL1-fresh-pellet
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/SL1-freshpellet/")
+##open_vg13()
+##
+##TRY.write(9.70)
+##TRZ.write(28.90)
+##
+##
+##time.sleep(1)
+##
+####Survey
+###nr_loops=1
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_Survey', folder='XAS/2020/07/20/SL1-freshpellet/')
+###
+###Nickel L edge
+###nr_loops=2
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_Ni', folder='XAS/2020/07/20/SL1-freshpellet/')
+###
+####Cobalt L edge
+###nr_loops=1
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 9)
+### otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_Co', folder='XAS/2020/07/20/SL1-freshpellet/')
+###
+####Fluor + Fe edges
+###nr_loops=1
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_Fe', folder='XAS/2020/07/20/SL1-freshpellet/')
+###
+####Manganese L edge
+###nr_loops=4
+###for i in range(nr_loops):
+### caput('X11MA-KEI10:RANGE', 7)
+### caput('X11MA-KEI11:RANGE', 8)
+### caput('X11MA-KEI12:RANGE', 10)
+### otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_Mn', folder='XAS/2020/07/20/SL1-freshpellet/')
+##
+###Oxygen K edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_O', folder='XAS/2020/07/20/SL1-freshpellet/')
+##
+##
+###Carbon K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1-freshpellet_C', folder='XAS/2020/07/20/SL1-freshpellet/')
+##
+##
+##time.sleep(1)
+#
+#
+########Sample SL5
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/SL5/")
+##open_vg13()
+##
+##TRY.write(6.00)
+##TRZ.write(24.90)
+##
+##
+##time.sleep(1)
+#
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_Survey', folder='XAS/2020/07/20/SL5/')
+##
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_Ni', folder='XAS/2020/07/20/SL5/')
+##
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_Co', folder='XAS/2020/07/20/SL5/')
+##
+###Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_Fe', folder='XAS/2020/07/20/SL5/')
+##
+###Manganese L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_Mn', folder='XAS/2020/07/20/SL5/')
+##
+###Oxygen K edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_O', folder='XAS/2020/07/20/SL5/')
+##
+####Carbon K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL5_C', folder='XAS/2020/07/20/SL5/')
+##
+##
+##time.sleep(1)
+##
+##
+#########Sample SL4
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/SL4/")
+##open_vg13()
+##
+##TRY.write(11.70)
+##TRZ.write(24.30)
+##
+##
+##time.sleep(1)
+#
+##Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_Survey', folder='XAS/2020/07/20/SL4/')
+##
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_Ni', folder='XAS/2020/07/20/SL4/')
+##
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_Co', folder='XAS/2020/07/20/SL4/')
+##
+###Fluor + Fe edges
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_Fe', folder='XAS/2020/07/20/SL4/')
+#
+##Manganese L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_Mn', folder='XAS/2020/07/20/SL4/')
+##
+##Oxygen K edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_O', folder='XAS/2020/07/20/SL4/')
+##
+#
+###Carbon K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL4_C', folder='XAS/2020/07/20/SL4/')
+##
+##time.sleep(1)
+#
+##
+#######Sample LH2
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH2/")
+##open_vg13()
+##
+##TRY.write(18.50)
+##TRZ.write(17.60)
+##
+##
+##time.sleep(1)
+#
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_Survey', folder='XAS/2020/07/20/LH2/')
+##
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_Ni', folder='XAS/2020/07/20/LH2/')
+###
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_Co', folder='XAS/2020/07/20/LH2/')
+#
+##Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_Fe', folder='XAS/2020/07/20/LH2/')
+##
+##Manganese L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_Mn', folder='XAS/2020/07/20/LH2/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_O', folder='XAS/2020/07/20/LH2')
+#
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH2_C', folder='XAS/2020/07/20/LH2')
+##
+##time.sleep(1)
+##
+########Sample LH1B
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH1B/")
+##open_vg13()
+##
+##TRY.write(12.50)
+##TRZ.write(15.00)
+##
+##
+##time.sleep(1)
+###
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_Survey', folder='XAS/2020/07/20/LH1B/')
+##
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_Ni', folder='XAS/2020/07/20/LH1B/')
+#
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_Co', folder='XAS/2020/07/20/LH1B/')
+#
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_Fe', folder='XAS/2020/07/20/LH1B/')
+##
+###Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_Mn', folder='XAS/2020/07/20/LH1B/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_O', folder='XAS/2020/07/20/LH1B')
+#
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1B_C', folder='XAS/2020/07/20/LH1B')
+#
+##time.sleep(1)
+##
+########Sample LH1A
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH1A/")
+##open_vg13()
+##
+##TRY.write(12.90)
+##TRZ.write(9.70)
+##
+##
+##time.sleep(1)
+##
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_Survey', folder='XAS/2020/07/20/LH1A/')
+##
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_Ni', folder='XAS/2020/07/20/LH1A/')
+#
+###Cobalt L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_Co', folder='XAS/2020/07/20/LH1A/')
+#
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_Fe', folder='XAS/2020/07/20/LH1A/')
+##
+##Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_Mn', folder='XAS/2020/07/20/LH1A/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_O', folder='XAS/2020/07/20/LH1A')
+##
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH1A_C', folder='XAS/2020/07/20/LH1A')
+##
+##time.sleep(1)
+##
+#######Sample LH5
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH5/")
+##open_vg13()
+##
+##TRY.write(3.40)
+##TRZ.write(16.50)
+##
+##
+##time.sleep(1)
+#
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_Survey', folder='XAS/2020/07/20/LH5/')
+#
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_Ni', folder='XAS/2020/07/20/LH5/')
+#
+###Cobalt L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_Co', folder='XAS/2020/07/20/LH5/')
+###
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_Fe', folder='XAS/2020/07/20/LH5/')
+#
+###Manganese L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_Mn', folder='XAS/2020/07/20/LH5/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_O', folder='XAS/2020/07/20/LH5')
+#
+#
+###Carbon K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH5_C', folder='XAS/2020/07/20/LH5')
+##
+##time.sleep(1)
+#
+########Sample LH6
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH6/")
+##open_vg13()
+##
+##TRY.write(7.30)
+##TRZ.write(10.40)
+##
+##
+##time.sleep(1)
+#
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH6_Survey', folder='XAS/2020/07/20/LH6/')
+##
+###Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH6_Ni', folder='XAS/2020/07/20/LH6/')
+##
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH6_Co', folder='XAS/2020/07/20/LH6/')
+##
+###Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH6_Mn', folder='XAS/2020/07/20/LH6/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH6_O', folder='XAS/2020/07/20/LH6')
+##
+##
+##time.sleep(1)
+#
+#######Sample LH3
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH3/")
+##open_vg13()
+##
+##TRY.write(7.50)
+##TRZ.write(18.00)
+###
+##
+##time.sleep(1)
+###
+##Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_Survey', folder='XAS/2020/07/20/LH3/')
+#
+##Nickel L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_Ni', folder='XAS/2020/07/20/LH3/')
+###
+###Cobalt L edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_Co', folder='XAS/2020/07/20/LH3/')
+##
+###Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_Mn', folder='XAS/2020/07/20/LH3/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_O', folder='XAS/2020/07/20/LH3')
+#
+##
+##Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH3_C', folder='XAS/2020/07/20/LH3')
+#
+##time.sleep(1)
+##
+#######Sample LH4
+#set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH4/")
+#open_vg13()
+#
+#TRY.write(18.50)
+#TRZ.write(11.10)
+##
+##
+#time.sleep(1)
+##
+###Survey
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_Survey', folder='XAS/2020/07/20/LH4/')
+##
+##Nickel L edge
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_Ni', folder='XAS/2020/07/20/LH4/')
+###
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_Co', folder='XAS/2020/07/20/LH4/')
+#
+###Manganese L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_Mn', folder='XAS/2020/07/20/LH4/')
+##
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_O', folder='XAS/2020/07/20/LH4/')
+##
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH4_C', folder='XAS/2020/07/20/LH4/')
+##
+##time.sleep(1)
+##
+########Sample SL3
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/SL3/")
+open_vg13()
+
+TRY.write(18.20)
+TRZ.write(26.20)
+
+
+time.sleep(1)
+
+###Survey
+nr_loops=1
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_Survey', folder='XAS/2020/07/20/SL3/')
+
+####Nickel L edge
+#nr_loops=1
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_Ni', folder='XAS/2020/07/20/SL3/')
+
+###Cobalt L edge
+#nr_loops=2
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_Co', folder='XAS/2020/07/20/SL3/')
+
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_Fe', folder='XAS/2020/07/20/SL3/')
+##
+###Manganese L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_Mn', folder='XAS/2020/07/20/SL3/')
+##
+###Oxygen K edge
+nr_loops=1
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_O', folder='XAS/2020/07/20/SL3/')
+#
+##
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL3_C', folder='XAS/2020/07/20/SL3/')
+##
+##time.sleep(1)
+##
+########Sample LH7
+##set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/20/LH7/")
+##open_vg13()
+##
+##TRY.write(2.40)
+##TRZ.write(20.90)
+###
+###
+##time.sleep(1)
+##
+###Survey
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 7)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_Survey', folder='XAS/2020/07/20/LH7/')
+#
+###Nickel L edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_Ni', folder='XAS/2020/07/20/LH7/')
+##
+###Cobalt L edge
+##nr_loops=2
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_Co', folder='XAS/2020/07/20/LH7/')
+###
+###Fluor + Fe edges
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=680, end=735, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_Fe', folder='XAS/2020/07/20/LH7/')
+##
+###Manganese L edge
+##nr_loops=4
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_Mn', folder='XAS/2020/07/20/LH7/')
+#
+###Oxygen K edge
+##nr_loops=1
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 9)
+## otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_O', folder='XAS/2020/07/20/LH7')
+##
+#
+###Carbon K edge
+##nr_loops=3
+##for i in range(nr_loops):
+## caput('X11MA-KEI10:RANGE', 7)
+## caput('X11MA-KEI11:RANGE', 8)
+## caput('X11MA-KEI12:RANGE', 10)
+## otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='LH7_C', folder='XAS/2020/07/20/LH7')
+#
+#time.sleep(1)
+#
+#
+#close_vg13()
+#
+#
diff --git a/script/Users/steven/SL6-F.py b/script/Users/steven/SL6-F.py
new file mode 100644
index 0000000..4b024a9
--- /dev/null
+++ b/script/Users/steven/SL6-F.py
@@ -0,0 +1,280 @@
+#Sample SL6F
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/16/SL6F/")
+
+TRY.write(20.25)
+TRZ.write(14.90)
+
+open_vg13()
+time.sleep(1)
+#
+##Carbon K edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_C', folder='XAS/2020/07/16/SL6F/')
+#
+##Oxygen K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 6)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_O', folder='XAS/2020/07/16/SL6F/')
+#
+##Manganese L edge
+#nr_loops=6
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 9)
+# otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_Mn', folder='XAS/2020/07/16/SL6F/')
+#
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_F', folder='XAS/2020/07/16/SL6F/')
+
+#Cobalt L edge
+nr_loops=1
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_Co', folder='XAS/2020/07/16/SL6F/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_Ni', folder='XAS/2020/07/16/SL6F/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6F_Survey', folder='XAS/2020/07/16/SL6F/')
+
+time.sleep(1)
+close_vg13()
+
+#Sample SL6
+
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/16/SL6/")
+
+TRY.write(9.5)
+TRZ.write(13.65)
+
+open_vg13()
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_C', folder='XAS/2020/07/16/SL6/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_O', folder='XAS/2020/07/16/SL6/')
+
+#Manganese L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_Mn', folder='XAS/2020/07/16/SL6/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_F', folder='XAS/2020/07/16/SL6/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_Co', folder='XAS/2020/07/16/SL6/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_Ni', folder='XAS/2020/07/16/SL6/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_Survey', folder='XAS/2020/07/16/SL6/')
+
+time.sleep(1)
+close_vg13()
+
+#Sample SL1
+
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/16/SL1/")
+
+TRY.write(8.5)
+TRZ.write(24.65)
+
+open_vg13()
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_C', folder='XAS/2020/07/16/SL1/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_O', folder='XAS/2020/07/16/SL1/')
+
+#Manganese L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_Mn', folder='XAS/2020/07/16/SL1/')
+
+#Fluor K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_F', folder='XAS/2020/07/16/SL6/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_Co', folder='XAS/2020/07/16/SL1/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_Ni', folder='XAS/2020/07/16/SL1/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL1_Survey', folder='XAS/2020/07/16/SL1/')
+
+time.sleep(1)
+close_vg13()
+
+#Sample SL2
+
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/16/SL1/")
+
+TRY.write(19.25)
+TRZ.write(24.40)
+
+open_vg13()
+time.sleep(1)
+
+#Carbon K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_C', folder='XAS/2020/07/16/SL2/')
+
+#Oxygen K edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_O', folder='XAS/2020/07/16/SL2/')
+
+#Manganese L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_Mn', folder='XAS/2020/07/16/SL2/')
+
+##Fluor K edge
+#nr_loops=3
+#for i in range(nr_loops):
+# caput('X11MA-KEI10:RANGE', 7)
+# caput('X11MA-KEI11:RANGE', 8)
+# caput('X11MA-KEI12:RANGE', 10)
+# otf(start=680, end=710, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL6_F', folder='XAS/2020/07/16/SL6/')
+
+#Cobalt L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_Co', folder='XAS/2020/07/16/SL2/')
+
+#Nickel L edge
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 9)
+ caput('X11MA-KEI12:RANGE', 10)
+ otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_Ni', folder='XAS/2020/07/16/SL2/')
+
+#Survey
+
+nr_loops=3
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='SL2_Survey', folder='XAS/2020/07/16/SL2/')
+
+time.sleep(1)
+close_vg13()
+
+
diff --git a/script/Users/steven/test.py b/script/Users/steven/test.py
new file mode 100644
index 0000000..642c816
--- /dev/null
+++ b/script/Users/steven/test.py
@@ -0,0 +1,28 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/2020/07/16/")
+nr_loops=1
+
+
+#TRY.write(20.25)
+#TRZ.write(14.90)
+
+
+caput('X11MA-FE-DSAPER', 3)
+
+open_vg13()
+#time.sleep(15)
+
+for i in range(nr_loops):
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=630, end=670, time=2, delay=3, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_C', folder='XAS/2020/07/16/test/')
+
+
+time.sleep(1)
+close_vg13()
+
+#caput('X11MA-FE-DSAPER', 3)
+
+#TRY.write(0.0)
+#TRZ.write(0.0)
diff --git a/script/devices/eiger.py b/script/devices/eiger.py
index 4e3dc62..a70588b 100644
--- a/script/devices/eiger.py
+++ b/script/devices/eiger.py
@@ -86,29 +86,35 @@ def average_frames(source, samples=1, roi=None, wait_next=False, sleep=0, as_flo
def integrate_frames(source, samples=1, roi=None, wait_next=False, sleep=0, as_float=True):
return integrate_ips(grab_frames(source, samples, roi, wait_next, sleep), as_float)
"""
-def grab_frame(source, roi=None, wait_next=False, rmv_outliers=True):
+def grab_frame(source, roi=None, wait_next=False, outliers_threshold=None, outliers_mask=None):
+ if outliers_threshold is None:
+ outliers_threshold = get_outliers_threshold()
+ if outliers_mask is None:
+ outliers_mask = get_outliers_mask()
+
if wait_next:
if str(eiger.grabMode)=="Single":
eiger.start()
#eiger.getDataArray().waitCacheChange(2000)
- source.waitNext(20000)
+ source.waitNext(20000 + int(eiger.exposure * 1000))
#ret = load_image(Utils.grayscale(source.output, Rectangle(roi[0], roi[1], roi[2], roi[3]) if (roi is not None) else None))
time.sleep(0.01)
data=source.data
if roi is not None:
data = data.getRoi(Rectangle(roi[0], roi[1], roi[2], roi[3]))
#ret = load_image(img)
- if rmv_outliers:
- #data = remove_outliers(data)
- data.threshold(1e9, False, None)
+ if outliers_mask is not None:
+ data.mult(outliers_mask)
+ if outliers_threshold>0:
+ data.threshold(outliers_threshold, False, None)
return data
-def grab_frames(source, samples, roi=None, wait_next=False, sleep=0, rmv_outliers=True):
+def grab_frames(source, samples, roi=None, wait_next=False, sleep=0, outliers_threshold=None, outliers_mask=None):
frames = []
for i in range(samples):
if (i>0) and (sleep>0):
time.sleep(sleep)
- aux = grab_frame(source, roi, wait_next, rmv_outliers)
+ aux = grab_frame(source, roi, wait_next, outliers_threshold, outliers_mask)
frames.append(aux)
return frames
@@ -126,27 +132,20 @@ def average_frames(frames):
ret.div(len(frames))
return ret
-"""
-def remove_outliers(imgdata, threshold = 1e9, replace_value=None):
- if replace_value is None:
- if str(imgdata.getType()) in ('float', 'double'):
- replace_value = float('NaN')
- else:
- replace_value = 0
- data = imgdata.copy()
- for i in range(data.width):
- for j in range(data.height):
- if data.getElementDbl(j,i, False) >=threshold:
- data.setElement(j*data.width + i, replace_value)
- return data
-"""
+
+def _timestamp(prec=0):
+ t = time.time()
+ s = time.strftime("%y/%m/%d %H:%M:%S", time.localtime(t))
+ if prec > 0:
+ s += ("%.9f" % (t % 1,))[1:2+prec]
+ return s
def _save_as_tiff(data, filename, check=False, show = False, metadata={}):
if type(data) == Data:
ip = load_array(data.matrix)
else:
ip = data
- info = "Timestamp: " + time.strftime("%y/%m/%d %H:%M:%S",time.localtime())
+ info = "Timestamp: " + _timestamp(3)
for key,val in metadata.items():
info = info + "\n" + str(key) + ": " + str(val)
@@ -188,6 +187,46 @@ def set_exposure_time(exposure):
eiger.start()
+def restore_eiger():
+ """
+ Set Eiger default mode
+ """
+ if eiger.isStarted():
+ eiger.stop()
+ time.sleep(0.2)
+ eiger.grabMode=eiger.GrabMode.Continuous
+ eiger.setExposure(0.2)
+ eiger.setNumImages(1)
+ eiger.start()
+
+_outliers_mask_timestamp = 0
+_outliers_mask = None
+
+def get_outliers_mask(data_type='f'):
+ global _outliers_mask_timestamp, _outliers_mask
+
+ if get_exec_pars().start == _outliers_mask_timestamp:
+ return _outliers_mask
+ _outliers_mask_timestamp = get_exec_pars().start
+ try:
+ _outliers_mask = None
+ filename = get_outliers_mask_file()
+ if filename:
+ ip=open_image(filename)
+
+ #TRANSPOSE - ImageJ stores the data transposed
+ ip.getProcessor().rotate(-90)
+ ip.getProcessor().flipVertical()
+
+ array = get_ip_array(ip)
+ array = Convert.toPrimitiveArray(array, ScriptUtils.getType(data_type))
+ _outliers_mask = Data(array)
+ print "Generated outliers mask"
+ except:
+ pass
+ return _outliers_mask
+
+
if False:
integrate_roi(image, 10, 5, 20, 10)
diff --git a/script/devices/id.py b/script/devices/id.py
index 66901e0..2bcddfb 100644
--- a/script/devices/id.py
+++ b/script/devices/id.py
@@ -90,18 +90,22 @@ def put_id_pol(id, pol, alpha=None):
caput(pv2,0)
elif pol == 4:
caput(pv1,0)
- caput(pv2,0)
+ caput(pv2,90)
elif pol == 5:
caput(pv1,0)
- time.sleep(1.0)
- caput(pv2,alpha)
+ if alpha is not None:
+ time.sleep(1.0)
+ caput(pv2,alpha)
def tune_detune(active_id):
+ offset_1 = float(get_setting("OFFSET_ID_1"))
+ offset_2 = float(get_setting("OFFSET_ID_2"))
+
if active_id ==1:
print "Tune ID1"
- put_id_offset(2, float(get_setting("OFFSET_ID_2"))-40) #detuneID2
- put_id_offset(1, float(get_setting("OFFSET_ID_1"))) #tuneID1
+ put_id_offset(2, offset_2-40) #detuneID2
+ put_id_offset(1, offset_1) #tuneID1
else:
print "Tune ID2"
- put_id_offset(1, float(get_setting("OFFSET_ID_1"))-40) #detuneID1
- put_id_offset(2, float(get_setting("OFFSET_ID_2"))) #tuneID2
+ put_id_offset(1, offset_1-40) #detuneID1
+ put_id_offset(2, offset_2) #tuneID2
diff --git a/script/devices/norm.py b/script/devices/norm.py
index 79abc07..c4c95be 100644
--- a/script/devices/norm.py
+++ b/script/devices/norm.py
@@ -15,6 +15,14 @@ class ImgageNorm (DeviceSource):
array = get_ip_array(ip)
self.ref = Data(array)
+ threshold = get_outliers_threshold()
+ self.outliers_mask = get_outliers_mask()
+ if self.outliers_mask is not None:
+ self.ref.mult(self.outliers_mask)
+ if threshold>0:
+ self.ref.threshold(threshold, False, None)
+
+
except:
self.ref = None
self.pushData(None)
@@ -22,8 +30,12 @@ class ImgageNorm (DeviceSource):
def onDataReceived(self,val):
if self.ref:
- n = Data(eiger.getDataMatrix().take())
- n.threshold(1e9, False, None)
+ n = Data(eiger.getDataMatrix().take())
+ if self.outliers_mask is not None:
+ n.mult(self.outliers_mask)
+ threshold = get_outliers_threshold()
+ if threshold>0:
+ n.threshold(threshold, False, None)
n.div(self.ref)
self.pushData(n)
diff --git a/script/local.py b/script/local.py
index 1c2bec6..fed06d1 100644
--- a/script/local.py
+++ b/script/local.py
@@ -18,7 +18,7 @@ ID1_ALPHA = "X11MA-ID1:ALPHA"
ID2_ALPHA = "X11MA-ID2:ALPHA"
ID1_OFF = "X11MA-ID1:ENERGY-OFFS"
ID2_OFF = "X11MA-ID2:ENERGY-OFFS"
-ENERGY_SP = "X11MA-PHS:E_SP"
+ENERGY_SP = "X11MA-PHS:E_SP"f
"""
ALL_DONE = "X11PHS:alldone"
VG10_SET = "X11MA-EPS-VG10:SET"
@@ -235,9 +235,11 @@ def otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None,
#Devices
###################################################################################################
-run("devices/eiger")
-run("devices/id")
-run("devices/chopper")
+for dev in ["eiger", "id", "chopper"]:
+ try:
+ run("devices/" + dev)
+ except:
+ log(sys.exc_info()[1], False)
###################################################################################################
@@ -424,5 +426,31 @@ def put_energy(v):
energy.write(float(v))
time.sleep(0.5)
wait_channel(ALL_DONE, 1, type = 'i')
-
+
+###################################################################################################
+#Settings
+###################################################################################################
+
+
+def set_dry_run(value):
+ set_setting("DRY_RUN", bool(value))
+
+def get_dry_run():
+ return str(get_setting("DRY_RUN")).lower() == "true"
+
+def set_outliers_threshold(value):
+ set_setting("OUTLIERS_THRESHOLD", int(value))
+
+def get_outliers_threshold():
+ try:
+ return int(get_setting("OUTLIERS_THRESHOLD"))
+ except:
+ return 0
+
+
+def get_outliers_mask_file():
+ return get_setting("OUTLIERS_MASK_FILE")
+
+
+
diff --git a/script/local.py~ b/script/local.py~
deleted file mode 100644
index 89d5eb6..0000000
--- a/script/local.py~
+++ /dev/null
@@ -1,231 +0,0 @@
-###################################################################################################
-# Deployment specific global definitions - executed after startup.py
-###################################################################################################
-import ntpath
-import traceback
-
-"""
-OTF_START = "X11MA-OTF:GO"
-OTF_E1 = "X11MA-OTF:E1"
-OTF_E2 = "X11MA-OTF:E2"
-OTF_TIME = "X11MA-OTF:TIME"
-OTF_FID = "X11MA-OTF:FID"
-OTF_FTS = "X11MA-OTF:FTSTAMP"
-OTF_FILE = "X11MA-OTF:FNAME"
-ID1_MODE = "X11MA-ID1:MODE"
-ID2_MODE = "X11MA-ID2:MODE"
-ID1_ALPHA = "X11MA-ID1:ALPHA"
-ID2_ALPHA = "X11MA-ID2:ALPHA"
-ID1_OFF = "X11MA-ID1:ENERGY-OFFS"
-ID2_OFF = "X11MA-ID2:ENERGY-OFFS"
-ENERGY_SP = "X11MA-PHS:E_SP"
-"""
-ALL_DONE = "X11PHS:alldone"
-VG10_SET = "X11MA-EPS-VG10:SET"
-VG10_GET = "X11MA-OP-VG10:OPEN"
-VG11_SET = "X11MA-EPS-VG11:SET"
-VG11_GET = "X11MA-OP-VG11:OPEN"
-VG12_SET = "X11MA-EPS-VG12:SET"
-VG12_GET = "X11MA-OP-VG12:OPEN"
-VG13_SET = "X11MA-EPS-VG13:SET"
-VG13_GET = "X11MA-OP-VG13:OPEN"
-
-"""
-
-LPP_DELAY = "X11MA-ES2-4CHT:SET2-DELAY"
-LPP_FINE_DELAY = "X11MA-ES2-4CHT:SET2-FINE"
-TIME_DELAY_SET = "X11MA-ES2:Theta-New.A"
-TIME_DELAY_VAL = "X11MA-ES2:Theta-Cur.VAL"
-TIME_DELAY_START = "X11MA-ES2:SCAN-START"
-TIME_DELAY_COMPLETE = "X11MA-ES2-scan1.SMSG"
-TBT_MAG = "X11MA-LSCI632:MFIELD"
-"
-"""
-def get_next_fid(folder, prefix):
- try:
- import glob
- files = glob.glob(folder + prefix + '*_*.dat')
- last = max(files)
- index = int (last[last.rfind('_')+1 : last.rfind('.')]) + 1
- return index
- except:
- return 0
-
-def wait_channel(name, value, timeout =None, type='s'):
- print "Waiting " + str(name) + " = " + str(value)
- cawait(name, value, timeout = timeout, type=type)
- print "Done"
-
-def wait_device(dev, value, timeout=-1):
- timeout = int(timeout *1000) if timeout>0 else timeout
- dev.waitValue(value,timeout)
-
-def open_vg10():
- if caget (VG10_GET,'i') != 1:
- caput(VG10_SET, 0)
- time.sleep(0.1)
- caput(VG10_SET, 1)
-
-def close_vg10():
- if caget (VG10_GET,'i') == 1:
- caput(VG10_SET, 0)
- time.sleep(0.1)
- caput(VG10_SET, 1)
-
-def open_vg11():
- if caget (VG11_GET,'i') != 1:
- caput(VG11_SET, 0)
- time.sleep(0.1)
- caput(VG11_SET, 1)
-
-def close_vg11():
- if caget (VG11_GET,'i') == 1:
- caput(VG11_SET, 0)
- time.sleep(0.1)
- caput(VG11_SET, 1)
-
-def open_vg12():
- if caget (VG12_GET,'i') != 1:
- caput(VG12_SET, 0)
- time.sleep(0.1)
- caput(VG12_SET, 1)
-
-def close_vg12():
- if caget (VG12_GET,'i') == 1:
- caput(VG12_SET, 0)
- time.sleep(0.1)
- caput(VG12_SET, 1)
-
-def open_vg13():
- if caget (VG13_GET,'i') != 1:
- caput(VG13_SET, 0)
- time.sleep(0.1)
- caput(VG13_SET, 1)
-
-def close_vg13():
- if caget (VG13_GET,'i') == 1:
- caput(VG13_SET, 0)
- time.sleep(0.1)
- caput(VG13_SET, 1)
-
-def plot_file(file_name, ctxt = None):
- """
- """
- sep = "\t"
- with open(file_name) as f:
- header = f.readline()[1:].split(sep)
- table = Table.loadRaw(file_name, sep, '#',header)
- plots = plot(table, title = ctxt)
-
-def has_beam():
- """
- """
- return beam_status.readback.read() == "Light Available"
-
-def is_id_error():
- return (id_error.read()==0)
-
-def check_id_error():
- if is_id_error():
- raise Exception ("ID error: check ID status")
-
-###################################################################################################
-#Default scan callbacks
-###################################################################################################
-
-def before_sample():
- pass
-
-def after_sample():
- check_id_error()
-
-##################### Convert_File function #############################
-"""
-def convert_file(input_file_name, output_file_name):
- sep = "\t"
- line_sep = "\r\n"
- field = caget('X11MA-XMCD:Ireadout')
- with open(input_file_name) as inp:
- lines = inp.readlines()
- with open(output_file_name, "wb") as out:
- out.write("Energy" + sep + "Io" + sep + "CADC2" + sep + "CADC3" + sep + "Mag" + line_sep)
- s = sep + " " #File format has a space before numeric values
- for line in lines[1:]:
- line = line.strip()
- if line=="": break
- try:
- (Ecrbk,CADC1, CADC2, NORM, CADC3, CADC4, MCurr, cffrbk, ID1Erbk, ID2Erbk, vTime) = line.split(" ")
- out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + str(field) +line_sep)
- except:
- traceback.print_exc()
-"""
-def convert_file(input_file_name, output_file_name, pol = None):
- print "Converting data file: " + input_file_name + " to " + output_file_name
- #print "File converted to: ",output_file_name
- sep = "\t"
- line_sep = "\n"
- MODE = pol_mode.read()
- if pol is None:
- pol = pol_angle.read() if (MODE == "LINEAR") else pol_mode.readback.read()
- with open(input_file_name) as inp:
- lines = inp.readlines()
- with open(output_file_name, "wb") as out:
- (db, st) = ("java.lang.Double", "java.lang.String")
- out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + sep + "NORMdiode" + sep + "Pol" + line_sep)
- out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + st + line_sep)
- s = sep
- for line in lines[1:]:
- line = line.strip()
- if line=="": break
- try:
- (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ")
- normtey=repr( float(CADC2)/float(CADC1))
- normdiode=repr(float(CADC3)/float(CADC1))
- #field=caget(MAG)
- out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + normtey + s + normdiode + s + str(pol) + line_sep)
- except:
- traceback.print_exc()
- #os.rename(input_file_name, get_context().setup.expandPath("{data}/OTF/" + ntpath.basename(input_file_name)))
-
-def convert_file_full(input_file_name, output_file_name, pol = None):
- print "Converting data file: " + input_file_name + " to " + output_file_name
- sep = "\t"
- line_sep = "\n"
- MODE = pol_mode.read()
- if pol is None:
- pol = pol_angle.read() if (MODE == "LINEAR") else pol_mode.readback.read()
- with open(input_file_name) as inp:
- lines = inp.readlines()
- with open(output_file_name, "wb") as out:
- (db, st) = ("java.lang.Double", "java.lang.String")
- out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "CADC4" + sep + "CADC5" + sep + "MCurr" + sep + "Time" + sep + "FieldX" + sep + "FieldZ" + sep + "Pol" + sep + "Temperature" + sep + "NORMtey" + sep + "NORMdiode" + line_sep)
- out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + st + sep + db + sep + db + sep + db + line_sep)
- s = sep
- for line in lines[1:]:
- line = line.strip()
- if line=="": break
- try:
- (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ")
- normtey=repr( float(CADC2)/float(CADC1))
- normdiode=repr(float(CADC3)/float(CADC1))
- CADC5 = 0
- mcur=machine_cur.read()
- fieldx= field.read()
- fieldz=0
- temp=Temp.read()
- out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + CADC4 + s + CADC5 + s + mcur + s + time + s + fieldx + s + fieldz + s + str(pol) + s + temp + s + normtey + s + normdiode + s + line_sep)
- except:
- traceback.print_exc()
-
-###################################################################################################
-#OTF function
-###################################################################################################
-def otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST'):
- """
- """
- if name is None:
- name = get_exec_pars().name
- #folder = get_context().setup.expandPath("{year}_{month}/{date}");
- run("templates/EnergyScan", {"E1":start, "E2":end, "TIME":time, "DELAY":float(delay), "MODE":mode, "OFFSET":(offset), "FOLDER":folder, "FILE":name, "ALPHA":float(alpha) if alpha is not None else None})
-
-
diff --git a/script/tasks/CheckEiger.py b/script/tasks/CheckEiger.py
new file mode 100644
index 0000000..759b0a0
--- /dev/null
+++ b/script/tasks/CheckEiger.py
@@ -0,0 +1,8 @@
+try:
+ if not eiger.isInitialized():
+ eiger.initialize()
+ run("devices/eiger")
+ log("Eiger initialized", False)
+ stop_task("tasks/CheckEiger")
+except:
+ log("Error initializing Eiger: " + str(sys.exc_info()[1]), False)
diff --git a/script/templates/AreaScan.py b/script/templates/AreaScan.py
index 50f86b3..749abe3 100644
--- a/script/templates/AreaScan.py
+++ b/script/templates/AreaScan.py
@@ -3,12 +3,12 @@
###################################################################################################
# Scan parameters
-Y_start = -1.0
-Z_start = 10.60
-Y_end = 1.0
-Z_end = 12.6
-Y_steps = 32
-Z_steps = 32
+Y_start = -1
+Z_start = 7.7
+Y_end = 2
+Z_end = 7.7
+Y_steps = 150
+Z_steps = 1
# NPLC (integration time) value for the Keithleys
NPLC=10
diff --git a/script/templates/Eiger2Img.py b/script/templates/Eiger2Img.py
index 67ff15d..b8be596 100644
--- a/script/templates/Eiger2Img.py
+++ b/script/templates/Eiger2Img.py
@@ -15,7 +15,7 @@ if get_exec_pars().source == CommandSource.ui:
POLARIZATION_2 = "Circ_Minus"
-DRY_RUN=False
+DRY_RUN = get_dry_run()
SHOW_IMAGES = True
ID = get_setting("ID")
@@ -80,7 +80,7 @@ def assert_status_ok():
"""
#Initialize vartiables
-if not DRY_RUN:
+if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
open_vg10()
@@ -91,12 +91,16 @@ pol_id2=POL_IDS[get_setting("POL_ID_2")]
#rbkEnergy=energy_rbk.read()
-if METHOD == "Two_Pol":
+if METHOD == "Two_Pol":
if ID == "ID1":
+ put_id_pol(1,pol_id1)
current_pol = pol_id1
elif ID == "ID2":
+ put_id_pol(2,pol_id2)
current_pol = pol_id2
elif ID == "ID1_ID2":
+ put_id_pol(1,pol_id1)
+ put_id_pol(2,pol_id2)
current_pol=pol_id1
if SWITCHING == "Tune_Detune":
tune_detune(1) #Tune ID1, Detune ID2
@@ -221,7 +225,7 @@ try:
print "Waiting file writing threads to finish..."
for t in threads:
join(t)
- if (METHOD != "Take_Image") and (MEASUREMENTS > 1) and (AUTO_SAVE == 1):
+ if (MEASUREMENTS > 1) and (AUTO_SAVE == 1):
print "--- Averaging..."
for i in range(len(frames)):
measures = []
@@ -234,8 +238,7 @@ try:
av=average_ips (measures, roi=None, as_float=True)
save_image_file(av, -1, i)
finally:
- if not DRY_RUN:
+ if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
close_vg10()
- eiger.grabMode=eiger.GrabMode.Continuous
- eiger.start()
+ restore_eiger()
print "Running time: " + str(time.time() - start)
\ No newline at end of file
diff --git a/script/templates/EigerAbsSpec.py b/script/templates/EigerAbsSpec.py
index e70867d..add461a 100644
--- a/script/templates/EigerAbsSpec.py
+++ b/script/templates/EigerAbsSpec.py
@@ -2,7 +2,7 @@
if get_exec_pars().source == CommandSource.ui:
ROI = {"Region1": [10,5,20, 10], "Region2": [20,15,20, 10]}
SAVE_SPECTRUM = True
- SAVE_IMAGES = False
+ SAVE_IMAGES = True
WITH_I0 = True
SWITCH_POL = False
EXPOSURE = 1.0
@@ -10,7 +10,7 @@ if get_exec_pars().source == CommandSource.ui:
NUMBER_SCANS =1
RANGES = [[500.0, 1000.0, 100.0]]
-DRY_RUN=False
+DRY_RUN = get_dry_run()
if len(RANGES) == 0:
raise Exception("No scan range defined")
@@ -23,7 +23,7 @@ time.sleep(0.3)
set_exposure_time(EXPOSURE)
set_exec_pars(path="{data}/{year}_{month}/{date}/{seq}%03d_AbsortionSpectrum", format="csv", layout="table")
-tag= "AbsortionSpectrum_{seq}%03d"
+tag= "AbsortionSpectrum_{seq}%03d_{count}%02d"
rois = create_roi_devices(ROI)
@@ -77,7 +77,7 @@ set_device_alias(averager, "Image") #Set display name
sensors.append(averager) #sensors.append(eiger.getDataMatrix())
#Initialize vartiables
-if not DRY_RUN:
+if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
open_vg10()
#put_id_offset(1, OFFSET_ID_1) #offset on ID1
@@ -94,7 +94,7 @@ elif ID == "ID2":
current_pol=POL_IDS[POL_ID_2]#get_id_pol(2)
put_id_pol(2,current_pol)
- caput('X11MA-ID1-GAP:SET',100) #open Gap ID1
+ caput('X11MA-Ivg10D1-GAP:SET',100) #open Gap ID1
elif ID == "ID1_ID2":
polID1=POL_IDS[POL_ID_1]
polID2=POL_IDS[POL_ID_2]
@@ -105,13 +105,12 @@ wait_channel("X11PHS:alldone", 1)
try:
#tscan(rois, 10, 0.1, format="csv", before_read=grab_image, passes = NUMBER_SCANS, tag=tag)
- rscan(sync_energy, sensors, RANGES, latency = 0.0 , passes = NUMBER_SCANS, tag=tag, before_read=grab_image, save=SAVE_SPECTRUM)
+ rscan(sync_energy, sensors, RANGES, latency = 0.0 , passes = NUMBER_SCANS, tag=tag, before_read=grab_image, save=SAVE_SPECTRUM, split=True, keep=False)
finally:
if AVERAGE>1:
for i in range(len(rois)):
rois[i].parent.monitored = False # Remove listeners on the image
- if not DRY_RUN:
+ if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
close_vg10()
- eiger.grabMode=eiger.GrabMode.Continuous
- eiger.start()
+ restore_eiger()
print "Running time: " + str(time.time() - start)
\ No newline at end of file
diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py
index 5db255f..17d2d28 100644
--- a/script/templates/EnergyScan.py
+++ b/script/templates/EnergyScan.py
@@ -74,9 +74,9 @@ def getNewestFile():
newest = getNewestFile()
#Checking the beam
-if not has_beam():
- print "Maintenence mode: end of scan"
- sys.exit()
+#if not has_beam():
+# print "Maintenence mode: end of scan"
+# sys.exit()
if MODE is not None:
diff --git a/script/templates/SetupBeamline.py b/script/templates/SetupBeamline.py
index 148d08c..586f8ea 100644
--- a/script/templates/SetupBeamline.py
+++ b/script/templates/SetupBeamline.py
@@ -11,7 +11,7 @@ if get_exec_pars().source == CommandSource.ui:
HARMONIC_ID_2 = 1
OFFSET_ID_2 = 0.0
-DRY_RUN=False
+DRY_RUN = get_dry_run()
set_setting("ID", ID)
diff --git a/script/test/BenchGrab.py b/script/test/BenchGrab.py
index 3fe8ef1..b667297 100644
--- a/script/test/BenchGrab.py
+++ b/script/test/BenchGrab.py
@@ -9,7 +9,6 @@ def grab_image(position, scan):
image.waitNext(2000)
def grab_image(position, scan):
- #av = grab_frame(image, roi=None, wait_next=True, rmv_outliers=False)
frames = grab_frames(image, AVERAGE, roi=None, wait_next=True)
av = average_frames(frames)
if True:
diff --git a/script/test/StartingExample.py b/script/test/StartingExample.py
new file mode 100644
index 0000000..4e6ee63
--- /dev/null
+++ b/script/test/StartingExample.py
@@ -0,0 +1,22 @@
+#otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST')
+
+nr_loops=5
+loop_count = 0
+
+while loop_count < nr_loops:
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_C', folder='data/2019_10/20191004')
+
+ caput('X11MA-KEI10:RANGE', 6)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=520, end=570, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_O', folder='data/2019_10/20191004')
+
+ loop_count = loop_count + 1
+
+time.sleep(5)
+
+TRY.write(0.0)
+TRZ.write(0.0)
\ No newline at end of file
diff --git a/script/test/TestRsync.py b/script/test/TestRsync.py
new file mode 100644
index 0000000..503ffc1
--- /dev/null
+++ b/script/test/TestRsync.py
@@ -0,0 +1,93 @@
+import subprocess
+import sys
+import os.path
+
+
+RSYNC_GENERATE_USER_KEY = True
+
+def rsync(src, dest, key):
+ #cmd = 'rsync -e "ssh -i ' + key + ' -o LogLevel=quiet" --chmod=ug=rwx --verbose --modify-window=1 --times --recursive ' + src + ' ' + dest
+ #ret = exec_cmd(cmd)
+ cmd = 'rsync -e "ssh -i ' + key + '" --chmod=ug=rwx --verbose --modify-window=1 --times --recursive ' + src + ' ' + dest
+ ret = exec_cmd(cmd, False)
+ lines = ret.split("\n")
+ lines = filter(lambda x: x != "", lines)
+ if len(lines)<3:
+ raise Exception ("Invalid format")
+ files = lines[1:-2]
+
+ stats = lines[-2]
+ stats = [int(s) for s in stats.split() if s.isdigit()]
+ bytes_sent, bytes_received = stats[0], stats[1]
+
+ return files, bytes_sent, bytes_received
+
+
+def sync_user_data(user, src, dest):
+ try:
+ key = os.path.expanduser("~/.ssh/" + ("ke" if RSYNC_GENERATE_USER_KEY else "id_rsa"))
+ if not os.path.isfile(key):
+ raise Exception ("Invalid key file")
+ dest = user + "@localhost:" + dest
+ files, bytes_sent, bytes_received = rsync(src,dest,key)
+ msg = "Transferred " + str(bytes_sent) + " byte to " + user + ": "
+ for f in files:
+ msg = msg + "\n" + f
+ log(msg, False)
+ print msg
+ except:
+ msg = "Error transferring user data to " + user + ": " + str(sys.exc_info()[1])
+ log(msg, False)
+ print >> sys.stderr, msg
+
+#sync_user_data("e18720", "/sls/X11MA/data/X11MA/pshell/home/log", "~/Data1")
+
+
+#export PK=`cat ~/.ssh/id_rsa.pub`; su - e18720 bash -c "echo $PK >> .ssh/authorized_keys; sort .ssh/authorized_keys | uniq > .ssh/authorized_keys.uniq ; mv .ssh/authorized_keys.uniq .ssh/authorized_keys"
+
+user = "e18720"
+
+def remove_user_key():
+ cmd = "rm ~/.ssh/ke;"
+ cmd = cmd + "rm ~/.ssh/ke.pub"
+ print exec_cmd(cmd, False)
+
+def reset_user_key():
+ remove_user_key()
+ cmd = "ssh-keygen -N '' -f ~/.ssh/ke -t rsa;"
+ print exec_cmd(cmd)
+
+def authorize_user(user):
+ success_msg = 'Success transfering authorization key for: ' + user
+ cmd = 'echo Authorizing: ' + user + ";"
+ if RSYNC_GENERATE_USER_KEY:
+ reset_user_key()
+ cmd = cmd + "export PK=`cat ~/.ssh/ke.pub`;"
+ else:
+ cmd = cmd + "export PK=`cat ~/.ssh/id_rsa.pub`;"
+ cmd = cmd + 'su - ' + user + ' bash -c "'
+ cmd = cmd + 'echo $PK >> .ssh/authorized_keys;'
+ #cmd = cmd + 'sort .ssh/authorized_keys | uniq > .ssh/authorized_keys.uniq;'
+ #cmd = cmd + 'mv .ssh/authorized_keys.uniq .ssh/authorized_keys;'
+ cmd = cmd + 'echo ' + success_msg
+ cmd = cmd + '"'
+ #xterm_options = '-hold -T "Authentication" -into 44040199' #Get Winfow ID with 'wmctrl -lp'
+ xterm_options = '-hold -T "Authentication" -fa monaco -fs 14 -bg black -fg green -geometry 80x15+400+100'
+ try:
+ ret = exec_cmd("xterm " + xterm_options + " -e '" + cmd + "'")
+ if not success_msg in ret:
+ raise Exception ("Error authenticating user")
+ except:
+ if RSYNC_GENERATE_USER_KEY:
+ remove_user_key()
+ raise
+ return ret
+
+#reset_user_key()
+authorize_user(user)
+#sync_user_data(user, "/sls/X11MA/data/X11MA/pshell/home/log", "~/Data1")
+
+#print exec_cmd("ls $HOME", user, "6p!ZP_sQ9")
+
+
+
diff --git a/script/test/TestRsync2.py b/script/test/TestRsync2.py
new file mode 100644
index 0000000..9743d09
--- /dev/null
+++ b/script/test/TestRsync2.py
@@ -0,0 +1,14 @@
+#run("rsync")
+from rsync import *
+
+user = "e18720"
+
+#reset_user_key()
+#remove_user_key()
+#authorize_user(user)
+sync_user_data(user, "/sls/X11MA/data/X11MA/pshell/home/log", "~/Data1")
+
+#print exec_cmd("ls $HOME", user, "6p!ZP_sQ9")
+
+
+
diff --git a/script/test/dark.py b/script/test/dark.py
new file mode 100644
index 0000000..317168b
--- /dev/null
+++ b/script/test/dark.py
@@ -0,0 +1,124 @@
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/test/")
+
+
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 6)
+caput('X11MA-KEI12:RANGE', 8)
+
+#open_vg13()
+
+otf(start=520, end=610, time=1, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='O_dark_end', folder='./')
+
+
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 6)
+caput('X11MA-KEI12:RANGE', 8)
+
+otf(start=620, end=680, time=1, delay=10, mode='LINEAR', alpha = 0.0, offset=-2.5, name='Mn_dark_end', folder='./')
+
+
+
+
+
+for i in range(2):
+
+ #sampleFeSTOUV
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleFeSTOUVcirc/")
+ TRY.write(6.2)
+ TRZ.write(16.1)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cp', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cp', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cp', folder='./')
+
+ #sampleFeSTO
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleFeSTOcirc/")
+ TRY.write(-7.6)
+ TRZ.write(20.7)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cp', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Ti_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_O_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cp', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cm', folder='./')
+ otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTO_Fe_cp', folder='./')
+
+ #sampleSTO
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleSTOcirc/")
+ TRY.write(-3.8)
+ TRZ.write(20.7)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_Ti_cp', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_Ti_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STO_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STO_O_cp', folder='./')
+
+
+ #sampleSTOUV
+ set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/SampleSTOUVcirc/")
+ TRY.write(-3.6)
+ TRZ.write(24.9)
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 8)
+ caput('X11MA-KEI12:RANGE', 9)
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cp', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cm', folder='./')
+ otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_Ti_cp', folder='./')
+
+ caput('X11MA-KEI10:RANGE', 7)
+ caput('X11MA-KEI11:RANGE', 7)
+ caput('X11MA-KEI12:RANGE', 8)
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_O_cp', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='STOUV_O_cm', folder='./')
+ otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='STOUV_O_cp', folder='./')
\ No newline at end of file
diff --git a/script/test/test.py b/script/test/test.py
index c17acdc..19aa11a 100644
--- a/script/test/test.py
+++ b/script/test/test.py
@@ -1,3 +1,25 @@
-import math
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/25Feb2020/test/")
-print math.sqrt(12/67)
\ No newline at end of file
+open_vg13()
+time.sleep(1)
+
+#caput('X11MA-KEI10:RANGE', 7)
+#caput('X11MA-KEI11:RANGE', 8)
+#caput('X11MA-KEI12:RANGE', 9)
+#otf(start=440, end=480, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cp_range', folder='./')
+#otf(start=440, end=480, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Ti_cm_range', folder='./')
+
+
+#caput('X11MA-KEI10:RANGE', 7)
+#caput('X11MA-KEI11:RANGE', 7)
+#caput('X11MA-KEI12:RANGE', 8)
+#otf(start=520, end=590, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cp_range', folder='./')
+#otf(start=520, end=590, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_O_cm_range', folder='./')
+
+
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 8)
+caput('X11MA-KEI12:RANGE', 8)
+otf(start=690, end=750, time=2, delay=10, mode='CIRC +', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cp_range', folder='./')
+otf(start=690, end=750, time=2, delay=10, mode='CIRC -', alpha = 0.0, offset=-2.5, name='FeSTOUV_Fe_cm_range', folder='./')
+
\ No newline at end of file
diff --git a/script/test/test2.py b/script/test/test2.py
index 3646b49..2d8ab5a 100644
--- a/script/test/test2.py
+++ b/script/test/test2.py
@@ -1,2 +1,22 @@
-print('test')
-otf(start=700, end=740, time=2, delay=10.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Test', folder='XAS/20190930/o_XAS_NCM111')
\ No newline at end of file
+set_exec_pars(path="/sls/X11MA/data/X11MA/Data1/XAS/20Feb2020")
+
+#Set ID1 to C+ and ID2 to C-
+caput('X11MA-ID1:MODE', 1)
+time.sleep(30)
+caput('X11MA-ID2:MODE', 2)
+time.sleep(30)
+
+#Set to PGM + ID1
+caput('X11PHS-E:OPT', 1)
+caput('X11MA-ID2-GAP:OPEN', 1)
+
+#Energy scan with C+
+otf(start=635, end=645, time=1, delay=10, mode='CIRC +', alpha = 0, offset=-2.5, name='Mn_plus_test', folder='Sample')
+
+
+#Set to PGM + ID2
+caput('X11PHS-E:OPT', 2)
+caput('X11MA-ID1-GAP:OPEN', 1)
+#Energy scan with C-
+otf(start=635, end=645, time=1, delay=10, mode='CIRC -', alpha = 0, offset=-2.5, name='Mn_minus_test', folder='Sample')
+