diff --git a/config/AbsortionSpectrum/Co_L3_FINE.abs b/config/AbsortionSpectrum/Co_L3_FINE.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/Co_L3_MEDIUM.abs b/config/AbsortionSpectrum/Co_L3_MEDIUM.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/Co_L3_coarse.abs b/config/AbsortionSpectrum/Co_L3_coarse.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/Co_L3_savetime.abs b/config/AbsortionSpectrum/Co_L3_savetime.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/Fe_L3_fine.abs b/config/AbsortionSpectrum/Fe_L3_fine.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/gold.abs b/config/AbsortionSpectrum/gold.abs old mode 100755 new mode 100644 diff --git a/config/AbsortionSpectrum/test.abs b/config/AbsortionSpectrum/test.abs old mode 100755 new mode 100644 diff --git a/config/ROIs/BFO_4nm.roi b/config/ROIs/BFO_4nm.roi old mode 100755 new mode 100644 diff --git a/config/ROIs/test.roi b/config/ROIs/test.roi old mode 100755 new mode 100644 diff --git a/config/ROIs/test2.roi b/config/ROIs/test2.roi old mode 100755 new mode 100644 diff --git a/config/administrator.properties b/config/administrator.properties old mode 100755 new mode 100644 diff --git a/config/config.properties b/config/config.properties old mode 100755 new mode 100644 diff --git a/config/energy_scan.properties b/config/energy_scan.properties old mode 100755 new mode 100644 diff --git a/config/filelisting.txt b/config/filelisting.txt old mode 100755 new mode 100644 diff --git a/config/mail.properties b/config/mail.properties old mode 100755 new mode 100644 diff --git a/config/metadata.json b/config/metadata.json old mode 100755 new mode 100644 diff --git a/config/power.properties b/config/power.properties old mode 100755 new mode 100644 diff --git a/config/preferences.json b/config/preferences.json index 2089050..9259b65 100644 --- a/config/preferences.json +++ b/config/preferences.json @@ -46,7 +46,7 @@ "simpleEditor" : false, "hideEditorLineNumbers" : false, "hideEditorContextMenu" : false, - "consoleLocation" : "Plot", + "consoleLocation" : "Left", "dataPanelLocation" : "Status", "openDataFilesInDocTab" : false, "noVariableEvaluationPropagation" : false, @@ -58,7 +58,6 @@ "cachedDataPanel" : false, "dataExtensions" : "log txt xml py png tif tiff mat", "dataSubFiles" : "*", - "hideFileName" : false, "showEmergencyStop" : false, "showHomingButtons" : false, "showJogButtons" : false, @@ -114,6 +113,5 @@ }, { "deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterMatrix", "panelClassName" : "ch.psi.pshell.swing.DeviceValueChart" - } ], - "scriptPopupDialog" : "None" + } ] } \ No newline at end of file diff --git a/config/remote.properties b/config/remote.properties old mode 100755 new mode 100644 diff --git a/config/scicat.properties b/config/scicat.properties old mode 100755 new mode 100644 diff --git a/config/session_metadata.properties b/config/session_metadata.properties old mode 100755 new mode 100644 diff --git a/config/settings.properties b/config/settings.properties index d794c64..8e723e7 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Thu Aug 28 10:36:26 CEST 2025 +#Wed Sep 03 16:47:25 CEST 2025 ALPHA_ID_2=0.0 AUTO_SWITCH_BEAMLINE=false AUTO_SWITCH_SHUTTER=true diff --git a/config/setup.properties b/config/setup.properties old mode 100755 new mode 100644 diff --git a/config/standard.properties b/config/standard.properties old mode 100755 new mode 100644 diff --git a/config/sys b/config/sys old mode 100755 new mode 100644 diff --git a/config/tasks.properties b/config/tasks.properties old mode 100755 new mode 100644 diff --git a/config/variables.properties b/config/variables.properties index efe8e45..c508763 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon Aug 25 11:01:59 CEST 2025 +#Thu Aug 28 14:45:05 CEST 2025 DaySequentialNumber=0 FileSequentialNumber=58 LastRunDate=240407 diff --git a/devices/0000.tif.properties b/devices/0000.tif.properties old mode 100755 new mode 100644 diff --git a/devices/1_2_0002.tif.properties b/devices/1_2_0002.tif.properties old mode 100755 new mode 100644 diff --git a/devices/axis.properties b/devices/axis.properties old mode 100755 new mode 100644 diff --git a/devices/float.tif.properties b/devices/float.tif.properties old mode 100755 new mode 100644 diff --git a/devices/i344_1_0.tif.properties b/devices/i344_1_0.tif.properties old mode 100755 new mode 100644 diff --git a/devices/i364_0.tif.properties b/devices/i364_0.tif.properties old mode 100755 new mode 100644 diff --git a/devices/image2.properties b/devices/image2.properties old mode 100755 new mode 100644 diff --git a/devices/int.tif.properties b/devices/int.tif.properties old mode 100755 new mode 100644 diff --git a/devices/m.properties b/devices/m.properties old mode 100755 new mode 100644 diff --git a/devices/norm.properties b/devices/norm.properties old mode 100755 new mode 100644 diff --git a/devices/obj_stig_a.properties b/devices/obj_stig_a.properties old mode 100755 new mode 100644 diff --git a/devices/obj_stig_b.properties b/devices/obj_stig_b.properties old mode 100755 new mode 100644 diff --git a/devices/objective.properties b/devices/objective.properties old mode 100755 new mode 100644 diff --git a/devices/src1.properties b/devices/src1.properties old mode 100755 new mode 100644 diff --git a/devices/src2.properties b/devices/src2.properties old mode 100755 new mode 100644 diff --git a/plugins/Beamline.form b/plugins/Beamline.form old mode 100755 new mode 100644 diff --git a/plugins/Beamline.java b/plugins/Beamline.java old mode 100755 new mode 100644 diff --git a/plugins/Cooling.java b/plugins/Cooling.java index 5525e0c..ab9bd90 100644 --- a/plugins/Cooling.java +++ b/plugins/Cooling.java @@ -3,10 +3,10 @@ import ch.psi.pshell.epics.GenericChannel; import ch.psi.pshell.swing.DevicePanel; import ch.psi.pshell.swing.RegisterPanel; import ch.psi.pshell.framework.Panel; +import ch.psi.pshell.framework.Setup; import ch.psi.pshell.stripchart.StripChart; import ch.psi.pshell.utils.State; import java.io.File; -import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; @@ -27,6 +27,9 @@ public class Cooling extends Panel { for (DevicePanel p : panels){ GenericChannel channel = new GenericChannel(p.getName(), p.getName()); + if (Setup.isSimulation()){ + channel.setSimulated(); + } if (p instanceof RegisterPanel){ channel.setPrecision(((RegisterPanel)p).getDecimals()); } @@ -41,7 +44,7 @@ public class Cooling extends Panel { } panelPlot.removeAll(); - panelPlot.add(StripChart.getPlotPanel(new File("/sls/X11MA/data/X11MA/strip/PEEM-Pt100.scd"))); + panelPlot.add(StripChart.getPlotPanel(new File(Setup.expandPath("{home}/stripchart/PEEM-Pt100.scd")))); } diff --git a/plugins/DataAcquisition.form b/plugins/DataAcquisition.form old mode 100755 new mode 100644 diff --git a/plugins/DelayScan.form b/plugins/DelayScan.form old mode 100755 new mode 100644 diff --git a/plugins/DelayScan.java b/plugins/DelayScan.java old mode 100755 new mode 100644 diff --git a/plugins/DelayScanBase.form b/plugins/DelayScanBase.form old mode 100755 new mode 100644 diff --git a/plugins/DelayScanBase.java b/plugins/DelayScanBase.java old mode 100755 new mode 100644 diff --git a/plugins/Eiger.form b/plugins/Eiger.form old mode 100755 new mode 100644 diff --git a/plugins/Eiger.java b/plugins/Eiger.java old mode 100755 new mode 100644 diff --git a/plugins/EnergyScan.form b/plugins/EnergyScan.form old mode 100755 new mode 100644 diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java old mode 100755 new mode 100644 diff --git a/plugins/EnergyScanBase.form b/plugins/EnergyScanBase.form old mode 100755 new mode 100644 diff --git a/plugins/EnergyScanBase.java b/plugins/EnergyScanBase.java old mode 100755 new mode 100644 diff --git a/plugins/EnergyScan_TBT.form b/plugins/EnergyScan_TBT.form old mode 100755 new mode 100644 diff --git a/plugins/EnergyScan_TBT.java b/plugins/EnergyScan_TBT.java old mode 100755 new mode 100644 diff --git a/plugins/OTFScanBase.form b/plugins/OTFScanBase.form old mode 100755 new mode 100644 diff --git a/plugins/OTFScanBase.java b/plugins/OTFScanBase.java old mode 100755 new mode 100644 diff --git a/plugins/Settings.form b/plugins/Settings.form old mode 100755 new mode 100644 diff --git a/plugins/Settings.java b/plugins/Settings.java old mode 100755 new mode 100644 diff --git a/plugins/Test.form b/plugins/Test.form old mode 100755 new mode 100644 diff --git a/plugins/Test.java b/plugins/Test.java old mode 100755 new mode 100644 diff --git a/script/Users/Cinthia/2021_june_Energy.py b/script/Users/Cinthia/2021_june_Energy.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Cinthia/2021_june_Energy.py b/script/Users/TR-TEY/Cinthia/2021_june_Energy.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Cinthia/field_sweepID2.py b/script/Users/TR-TEY/Cinthia/field_sweepID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Cinthia/hyst_ID2_Fe.py b/script/Users/TR-TEY/Cinthia/hyst_ID2_Fe.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/Temperature_sweepID2.py b/script/Users/TR-TEY/Fechner/Temperature_sweepID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/field_sweepID2.py b/script/Users/TR-TEY/Fechner/field_sweepID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/hyst_ID2.py b/script/Users/TR-TEY/Fechner/hyst_ID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2.py b/script/Users/TR-TEY/Fechner/xmcdID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_Al.py b/script/Users/TR-TEY/Fechner/xmcdID2_Al.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_Fe-one-run.py b/script/Users/TR-TEY/Fechner/xmcdID2_Fe-one-run.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_Fe.py b/script/Users/TR-TEY/Fechner/xmcdID2_Fe.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_Mg.py b/script/Users/TR-TEY/Fechner/xmcdID2_Mg.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_OCr.py b/script/Users/TR-TEY/Fechner/xmcdID2_OCr.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmcdID2_OCr_fix_drift.py b/script/Users/TR-TEY/Fechner/xmcdID2_OCr_fix_drift.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmldID2_Fe.py b/script/Users/TR-TEY/Fechner/xmldID2_Fe.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmldID2_Mg.py b/script/Users/TR-TEY/Fechner/xmldID2_Mg.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Fechner/xmldID2_OCr_fix_drift.py b/script/Users/TR-TEY/Fechner/xmldID2_OCr_fix_drift.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Juraj/B_scan.py b/script/Users/TR-TEY/Juraj/B_scan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Juraj/E_scan.py b/script/Users/TR-TEY/Juraj/E_scan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Juraj/FixedE.py b/script/Users/TR-TEY/Juraj/FixedE.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Juraj/Main.py b/script/Users/TR-TEY/Juraj/Main.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/EnergyScanID1only.py b/script/Users/TR-TEY/Sridhar/2017/EnergyScanID1only.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/EnergyScanID2only.py b/script/Users/TR-TEY/Sridhar/2017/EnergyScanID2only.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/field_sweep.py b/script/Users/TR-TEY/Sridhar/2017/field_sweep.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/field_sweepID1.py b/script/Users/TR-TEY/Sridhar/2017/field_sweepID1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/field_sweepID2.py b/script/Users/TR-TEY/Sridhar/2017/field_sweepID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/field_sweep_old.py b/script/Users/TR-TEY/Sridhar/2017/field_sweep_old.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/harmonic_ID1.xml b/script/Users/TR-TEY/Sridhar/2017/harmonic_ID1.xml old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/harmonic_ID2.xml b/script/Users/TR-TEY/Sridhar/2017/harmonic_ID2.xml old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/hyst_ID1.py b/script/Users/TR-TEY/Sridhar/2017/hyst_ID1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/hyst_ID2.py b/script/Users/TR-TEY/Sridhar/2017/hyst_ID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/hyst_ID2_Co.py b/script/Users/TR-TEY/Sridhar/2017/hyst_ID2_Co.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/hyst_ID2_Fe.py b/script/Users/TR-TEY/Sridhar/2017/hyst_ID2_Fe.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/test.py b/script/Users/TR-TEY/Sridhar/2017/test.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/test_field.py b/script/Users/TR-TEY/Sridhar/2017/test_field.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/test_fieldID1.py b/script/Users/TR-TEY/Sridhar/2017/test_fieldID1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/test_fieldID2.py b/script/Users/TR-TEY/Sridhar/2017/test_fieldID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID1&ID2.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID1&ID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID1.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID2.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Co.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Co.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Fe.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Fe.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Ru.py b/script/Users/TR-TEY/Sridhar/2017/xmcdID2_Ru.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder1.py b/script/Users/TR-TEY/ales/Holder1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder2.py b/script/Users/TR-TEY/ales/Holder2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder3.py b/script/Users/TR-TEY/ales/Holder3.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder4.py b/script/Users/TR-TEY/ales/Holder4.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder5.py b/script/Users/TR-TEY/ales/Holder5.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder6.py b/script/Users/TR-TEY/ales/Holder6.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/ales/Holder7.py b/script/Users/TR-TEY/ales/Holder7.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/Bor_test.py b/script/Users/TR-TEY/carlos/Bor_test.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/Boron.py b/script/Users/TR-TEY/carlos/Boron.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/Boron2.py b/script/Users/TR-TEY/carlos/Boron2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/Boron3.py b/script/Users/TR-TEY/carlos/Boron3.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/Boron4.py b/script/Users/TR-TEY/carlos/Boron4.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/goetite.py b/script/Users/TR-TEY/carlos/goetite.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/carlos/pa2.py b/script/Users/TR-TEY/carlos/pa2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/federico/2021_may_beamtime.py b/script/Users/TR-TEY/federico/2021_may_beamtime.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/federico/test.py b/script/Users/TR-TEY/federico/test.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/17apr2020_Circscan.py b/script/Users/TR-TEY/gesara/17apr2020_Circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/19okt2020_Circscan.py b/script/Users/TR-TEY/gesara/19okt2020_Circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/20feb2020.py b/script/Users/TR-TEY/gesara/20feb2020.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/20feb2020_Linearscan1.py b/script/Users/TR-TEY/gesara/20feb2020_Linearscan1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/20okt2020_Circscan_TF.py b/script/Users/TR-TEY/gesara/20okt2020_Circscan_TF.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/20okt2020_Powders.py b/script/Users/TR-TEY/gesara/20okt2020_Powders.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/21feb2020_Circscan1.py b/script/Users/TR-TEY/gesara/21feb2020_Circscan1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/Circscan.py b/script/Users/TR-TEY/gesara/Circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/Dy_circscan.py b/script/Users/TR-TEY/gesara/Dy_circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/FeSTO_circscan.py b/script/Users/TR-TEY/gesara/FeSTO_circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/FeSTO_linearscan.py b/script/Users/TR-TEY/gesara/FeSTO_linearscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/gesara/Fe_O_circscan.py b/script/Users/TR-TEY/gesara/Fe_O_circscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/16july2020_Linearscan.py b/script/Users/TR-TEY/steven/16july2020_Linearscan.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER1_V2.py b/script/Users/TR-TEY/steven/HOLDER1_V2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER2.py b/script/Users/TR-TEY/steven/HOLDER2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER2_v2.py b/script/Users/TR-TEY/steven/HOLDER2_v2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER3.py b/script/Users/TR-TEY/steven/HOLDER3.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER4.py b/script/Users/TR-TEY/steven/HOLDER4.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/HOLDER5.py b/script/Users/TR-TEY/steven/HOLDER5.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder1-FINAL.py b/script/Users/TR-TEY/steven/March2021_Holder1-FINAL.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder1.py b/script/Users/TR-TEY/steven/March2021_Holder1.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder2.py b/script/Users/TR-TEY/steven/March2021_Holder2.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder3.py b/script/Users/TR-TEY/steven/March2021_Holder3.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder4.py b/script/Users/TR-TEY/steven/March2021_Holder4.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder5.py b/script/Users/TR-TEY/steven/March2021_Holder5.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder6.py b/script/Users/TR-TEY/steven/March2021_Holder6.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder7.py b/script/Users/TR-TEY/steven/March2021_Holder7.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/March2021_Holder8.py b/script/Users/TR-TEY/steven/March2021_Holder8.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/SL6-F.py b/script/Users/TR-TEY/steven/SL6-F.py old mode 100755 new mode 100644 diff --git a/script/Users/TR-TEY/steven/test.py b/script/Users/TR-TEY/steven/test.py old mode 100755 new mode 100644 diff --git a/script/beamline_init/test.sh b/script/beamline_init/test.sh old mode 100755 new mode 100644 diff --git a/script/devices/chopper.py b/script/devices/chopper.py old mode 100755 new mode 100644 diff --git a/script/devices/norm.py b/script/devices/norm.py old mode 100755 new mode 100644 diff --git a/script/local.groovy b/script/local.groovy old mode 100755 new mode 100644 diff --git a/script/local.js b/script/local.js old mode 100755 new mode 100644 diff --git a/script/May2022_Holder1_ASSBs_low.py b/script/misc/May2022_Holder1_ASSBs_low.py similarity index 100% rename from script/May2022_Holder1_ASSBs_low.py rename to script/misc/May2022_Holder1_ASSBs_low.py diff --git a/script/StartingExample.py b/script/misc/StartingExample.py old mode 100755 new mode 100644 similarity index 100% rename from script/StartingExample.py rename to script/misc/StartingExample.py diff --git a/script/saved_dcument2_13sep2021 b/script/misc/saved_dcument2_13sep2021 similarity index 100% rename from script/saved_dcument2_13sep2021 rename to script/misc/saved_dcument2_13sep2021 diff --git a/script/saved_document_13sep2021 b/script/misc/saved_document_13sep2021 similarity index 100% rename from script/saved_document_13sep2021 rename to script/misc/saved_document_13sep2021 diff --git a/script/temp_save.py b/script/misc/temp_save.py similarity index 100% rename from script/temp_save.py rename to script/misc/temp_save.py diff --git a/script/test.py b/script/misc/test.py similarity index 100% rename from script/test.py rename to script/misc/test.py diff --git a/script/unknown b/script/misc/unknown similarity index 100% rename from script/unknown rename to script/misc/unknown diff --git a/script/old_scripts/AreaScan.py b/script/old_scripts/AreaScan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/DataManipulation.py b/script/old_scripts/DataManipulation.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/DelayScan.py b/script/old_scripts/DelayScan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Electric_field_loop.py b/script/old_scripts/Electric_field_loop.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Electric_field_loop2.py b/script/old_scripts/Electric_field_loop2.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Electric_field_loop3.py b/script/old_scripts/Electric_field_loop3.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Electric_field_loop4.py b/script/old_scripts/Electric_field_loop4.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Electric_field_twoval.py b/script/old_scripts/Electric_field_twoval.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyMultiScan.py b/script/old_scripts/EnergyMultiScan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan-backup_170520.py b/script/old_scripts/EnergyScan-backup_170520.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan-beforeThread.py b/script/old_scripts/EnergyScan-beforeThread.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan-withThreading.py b/script/old_scripts/EnergyScan-withThreading.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan.py b/script/old_scripts/EnergyScan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan1.py b/script/old_scripts/EnergyScan1.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanID1onl.py b/script/old_scripts/EnergyScanID1onl.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanID1only.py b/script/old_scripts/EnergyScanID1only.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanID2andID2only.py b/script/old_scripts/EnergyScanID2andID2only.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanID2only.py b/script/old_scripts/EnergyScanID2only.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanID2only_XMLD.py b/script/old_scripts/EnergyScanID2only_XMLD.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanTransmission.py b/script/old_scripts/EnergyScanTransmission.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScanXtreme.py b/script/old_scripts/EnergyScanXtreme.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan_TBT.py b/script/old_scripts/EnergyScan_TBT.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan_backup.py b/script/old_scripts/EnergyScan_backup.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/EnergyScan_backup_160208.py b/script/old_scripts/EnergyScan_backup_160208.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Extreme.py b/script/old_scripts/Extreme.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/MultiScan.py b/script/old_scripts/MultiScan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/PolSwitch.py b/script/old_scripts/PolSwitch.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/SetOffsets.py b/script/old_scripts/SetOffsets.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/Vinayak_prot.py b/script/old_scripts/Vinayak_prot.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/backup_Delay_scan.py b/script/old_scripts/backup_Delay_scan.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/field_sweepID2_Jaianth.py b/script/old_scripts/field_sweepID2_Jaianth.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/harmonic_ID1.xml b/script/old_scripts/harmonic_ID1.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/harmonic_ID2.xml b/script/old_scripts/harmonic_ID2.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/harmonic_xtreme.xml b/script/old_scripts/harmonic_xtreme.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/localXtreme.py b/script/old_scripts/localXtreme.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/scan_horizontal_infocus2.xml b/script/old_scripts/scan_horizontal_infocus2.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/scan_horizontal_outfocus.xml b/script/old_scripts/scan_horizontal_outfocus.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/scan_vertical.xml b/script/old_scripts/scan_vertical.xml old mode 100755 new mode 100644 diff --git a/script/old_scripts/test.py b/script/old_scripts/test.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/test2.py b/script/old_scripts/test2.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/test_field.py b/script/old_scripts/test_field.py old mode 100755 new mode 100644 diff --git a/script/old_scripts/xas_0H_juraj.py b/script/old_scripts/xas_0H_juraj.py old mode 100755 new mode 100644 diff --git a/script/tasks/CheckEiger.py b/script/tasks/CheckEiger.py old mode 100755 new mode 100644 diff --git a/script/templates/AreaScan.py b/script/templates/AreaScan.py old mode 100755 new mode 100644 diff --git a/script/templates/DelayScanBasic.py b/script/templates/DelayScanBasic.py old mode 100755 new mode 100644 diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py old mode 100755 new mode 100644 diff --git a/script/templates/EnergyScan_v2.py b/script/templates/EnergyScan_v2.py old mode 100755 new mode 100644 diff --git a/script/templates/LEEM_tilt_scan.py b/script/templates/LEEM_tilt_scan.py old mode 100755 new mode 100644 diff --git a/script/templates/OTFScanBasic.py b/script/templates/OTFScanBasic.py old mode 100755 new mode 100644 diff --git a/script/templates/PIDscan.py b/script/templates/PIDscan.py old mode 100755 new mode 100644 diff --git a/script/test/BenchGrab.py b/script/test/BenchGrab.py old mode 100755 new mode 100644 diff --git a/script/test/LEEM_example_scans.py b/script/test/LEEM_example_scans.py old mode 100755 new mode 100644 diff --git a/script/test/StartingExample.py b/script/test/StartingExample.py old mode 100755 new mode 100644 diff --git a/script/test/TestAverage.py b/script/test/TestAverage.py old mode 100755 new mode 100644 diff --git a/script/test/TestChangeExpTime.py b/script/test/TestChangeExpTime.py old mode 100755 new mode 100644 diff --git a/script/test/TestListener.py b/script/test/TestListener.py old mode 100755 new mode 100644 diff --git a/script/test/TestOTF2.py b/script/test/TestOTF2.py old mode 100755 new mode 100644 diff --git a/script/test/TestRsync.py b/script/test/TestRsync.py old mode 100755 new mode 100644 diff --git a/script/test/TestRsync2.py b/script/test/TestRsync2.py old mode 100755 new mode 100644 diff --git a/script/test/TestTcp.py b/script/test/TestTcp.py old mode 100755 new mode 100644 diff --git a/script/test/TestUserScript.py b/script/test/TestUserScript.py old mode 100755 new mode 100644 diff --git a/script/Test_Autofocus_Armin.py b/script/test/Test_Autofocus_Armin.py similarity index 100% rename from script/Test_Autofocus_Armin.py rename to script/test/Test_Autofocus_Armin.py diff --git a/script/test/X11MA_beamline.ipm b/script/test/X11MA_beamline.ipm old mode 100755 new mode 100644 diff --git a/script/test/X11MA_main_functions.ipm b/script/test/X11MA_main_functions.ipm old mode 100755 new mode 100644 diff --git a/script/test/X11MA_main_macros.ipm.tex.py b/script/test/X11MA_main_macros.ipm.tex.py old mode 100755 new mode 100644 diff --git a/script/test/dark.py b/script/test/dark.py old mode 100755 new mode 100644 diff --git a/script/test/data_api.py b/script/test/data_api.py old mode 100755 new mode 100644 diff --git a/script/test/demo_microscope.py b/script/test/demo_microscope.py old mode 100755 new mode 100644 diff --git a/script/test/fda.xml b/script/test/fda.xml old mode 100755 new mode 100644 diff --git a/script/test/otf_NCM111.py b/script/test/otf_NCM111.py old mode 100755 new mode 100644 diff --git a/script/test/otf_post_mortem.py b/script/test/otf_post_mortem.py old mode 100755 new mode 100644 diff --git a/script/test/otf_test.py b/script/test/otf_test.py old mode 100755 new mode 100644 diff --git a/script/test/rsync.py b/script/test/rsync.py old mode 100755 new mode 100644 diff --git a/script/test-valerie.py b/script/test/test-valerie.py similarity index 100% rename from script/test-valerie.py rename to script/test/test-valerie.py diff --git a/script/test/test.py b/script/test/test.py old mode 100755 new mode 100644 diff --git a/script/test/test2.py b/script/test/test2.py old mode 100755 new mode 100644 diff --git a/script/test_TFY.py b/script/test/test_TFY.py similarity index 100% rename from script/test_TFY.py rename to script/test/test_TFY.py diff --git a/script/test/test_autofocus.py b/script/test/test_autofocus.py old mode 100755 new mode 100644 diff --git a/script/test/test_eiger b/script/test/test_eiger old mode 100755 new mode 100644 diff --git a/script/test/test_eiger.py b/script/test/test_eiger.py old mode 100755 new mode 100644 diff --git a/script/test/test_file_name b/script/test/test_file_name old mode 100755 new mode 100644 diff --git a/script/test_highE.py b/script/test/test_highE.py similarity index 100% rename from script/test_highE.py rename to script/test/test_highE.py diff --git a/script/test_speed.py b/script/test/test_speed.py similarity index 100% rename from script/test_speed.py rename to script/test/test_speed.py diff --git a/script/utils.py b/script/utils.py old mode 100755 new mode 100644