Merge branch 'main' into 'jmcchesn-main-patch-24654'
# Conflicts: # iexcode/APRES_cheatsheet.md
No related branches found
No related tags found
Showing
- iexcode/APRES_cheatsheet.md 1 addition, 1 deletioniexcode/APRES_cheatsheet.md
- iexcode/instruments/AD_utilities.py 46 additions, 13 deletionsiexcode/instruments/AD_utilities.py
- iexcode/instruments/ARPES.py 3 additions, 1 deletioniexcode/instruments/ARPES.py
- iexcode/instruments/IEX_BL_config.py 2 additions, 2 deletionsiexcode/instruments/IEX_BL_config.py
- iexcode/instruments/IEX_VPU.py 4 additions, 1 deletioniexcode/instruments/IEX_VPU.py
- iexcode/instruments/Kappa.py 50 additions, 31 deletionsiexcode/instruments/Kappa.py
- iexcode/instruments/Kappa_det.py 15 additions, 9 deletionsiexcode/instruments/Kappa_det.py
- iexcode/instruments/Lakeshore_335.py 171 additions, 249 deletionsiexcode/instruments/Lakeshore_335.py
- iexcode/instruments/Motors.py 6 additions, 0 deletionsiexcode/instruments/Motors.py
- iexcode/instruments/Octupole.py 2 additions, 0 deletionsiexcode/instruments/Octupole.py
- iexcode/instruments/Scienta.py 17 additions, 4 deletionsiexcode/instruments/Scienta.py
- iexcode/instruments/VLS_PGM.py 12 additions, 8 deletionsiexcode/instruments/VLS_PGM.py
- iexcode/instruments/Vortex.py 1 addition, 1 deletioniexcode/instruments/Vortex.py
- iexcode/instruments/cfg.py 0 additions, 1 deletioniexcode/instruments/cfg.py
- iexcode/instruments/electron_analyzer.py 11 additions, 9 deletionsiexcode/instruments/electron_analyzer.py
- iexcode/instruments/m3r_align.py 17 additions, 16 deletionsiexcode/instruments/m3r_align.py
- iexcode/instruments/scanRecord.py 39 additions, 21 deletionsiexcode/instruments/scanRecord.py
- iexcode/instruments/xrays.py 14 additions, 8 deletionsiexcode/instruments/xrays.py
- iexcode/macros/BL_shutdown.py 17 additions, 7 deletionsiexcode/macros/BL_shutdown.py
- iexcode/macros/Kappa_optimization.py 134 additions, 169 deletionsiexcode/macros/Kappa_optimization.py
Loading
Please register or sign in to comment