Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge run22 into master #68

Merged
merged 114 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
fd44e81
fakedetector correction of notation confusion between q and s
fredericpoitevin Feb 21, 2024
28a4e4b
Merge pull request #48 from pcdshub/fakedetector_typo
lg345 Feb 21, 2024
6508d88
adding Lelands changes
themindatlarge Feb 23, 2024
97d84ba
macro.py changes
themindatlarge Feb 23, 2024
8ca9f57
fixed macro.py
themindatlarge Feb 23, 2024
a471f1e
Optional DAQ in attenuator scans
gadorlhiac Mar 13, 2024
3958b3c
ENH Make attenuator scan wait time adjustable when not using the DAQ.
gadorlhiac Mar 14, 2024
84f34ed
Merge pull request #49 from pcdshub/ENH/optional_daq_attenscan
themindatlarge Mar 14, 2024
a58e65a
BUG Correct array indexing for EBUILD timetool PV
gadorlhiac Mar 19, 2024
3aacf47
BUG Make it possible to break out of double loop
gadorlhiac Mar 19, 2024
905c745
MNT Print a message if drift correction goes one minute without a goo…
gadorlhiac Mar 20, 2024
ba25e81
MNT Add missing type hint
gadorlhiac Mar 21, 2024
da0b150
Merge pull request #50 from pcdshub/BUG/timetool_correct
lg345 Mar 21, 2024
054530f
add preset inj_xyz
themindatlarge May 13, 2024
7e7a1a1
removed dev/transfocate as not used anymore
themindatlarge May 14, 2024
ae0ad7b
copied over l1032322.py from January Yano time at XPP
themindatlarge May 14, 2024
f399f46
removed beamline_071523.py
themindatlarge May 14, 2024
2fec336
created first draft of l1019822 code
themindatlarge May 14, 2024
74cee47
l1019822.py ready for testing
themindatlarge May 14, 2024
8b7aa3b
yano code working
themindatlarge May 14, 2024
3aa31c2
fixed set_delay and added args for all shutters
themindatlarge May 14, 2024
4e9c95b
fixed event sequencer convensions for 20 and 30 Hz
themindatlarge May 14, 2024
2863d4a
Fixed event codes
themindatlarge May 14, 2024
70ebc73
fixed 120Hz added 60 Hz
themindatlarge May 14, 2024
0a14dc9
fixed T0 and shamefully brought back Lelands TFS code after I deleted it
themindatlarge May 15, 2024
d394529
trying to fix soft keyboard interrupt by adding daq.begin to class (b…
themindatlarge May 16, 2024
f3098bc
finally figured out contorled autorun exit
themindatlarge May 16, 2024
ab9bc6b
bug fixes for l1019822.py
themindatlarge May 17, 2024
8921cc3
made the code humberto proof
themindatlarge May 19, 2024
a8de4fb
Merge pull request #54 from pcdshub/53-code-for-june-2024-dot-experim…
themindatlarge May 29, 2024
7993814
Added internal begin and post functions to autorun
themindatlarge May 29, 2024
47d5837
gitting caught up
themindatlarge May 29, 2024
263d9a3
getting caught up again
themindatlarge May 29, 2024
3d10aa3
change delay to daq_delay
themindatlarge May 30, 2024
664c8dc
dev work done
themindatlarge Jun 10, 2024
cbef36c
Merge pull request #55 from pcdshub/20-soft-exit-for-autorun
themindatlarge Jun 10, 2024
cd56e85
Add Yano class
themindatlarge Jun 11, 2024
62aa843
add yano to beamline.py
themindatlarge Jun 11, 2024
28c685c
Pull static inputs within Class
themindatlarge Jun 11, 2024
6425c4a
move post
themindatlarge Jun 11, 2024
298c984
lowercase yano
themindatlarge Jun 11, 2024
56ddcd9
brought yano outside of class
themindatlarge Jun 11, 2024
ba23ff2
added l1029722 just in case
themindatlarge Jun 11, 2024
04f9843
add selfs
themindatlarge Jun 11, 2024
79cb2ad
re-factored yano class
themindatlarge Jun 11, 2024
3f45d89
fixed beamline.py
themindatlarge Jun 11, 2024
5065df4
Merge pull request #57 from pcdshub/56-add-yano-user-class-permanently
themindatlarge Jun 12, 2024
1ea4ce3
mv xfel_gui to bash_utilies and add take/makepeds
themindatlarge Jun 12, 2024
8786941
fixed makepeds path
themindatlarge Jun 12, 2024
d492529
removed stand alone xfel_gui
themindatlarge Jun 12, 2024
b180471
added awr
themindatlarge Jun 12, 2024
d88d43e
add bash_utilities to beamline.py
themindatlarge Jun 12, 2024
1a23131
fixed str
themindatlarge Jun 12, 2024
63758ea
interactive command
themindatlarge Jun 12, 2024
52cc551
takepeds and awr working
themindatlarge Jun 12, 2024
8897b36
removed some subprocess
themindatlarge Jun 12, 2024
d66fa7d
add camviewer and restartdaq
themindatlarge Jun 12, 2024
924dc50
change restartdaq and cameras to subprocess
themindatlarge Jun 12, 2024
3225872
fix makepeds
themindatlarge Jun 12, 2024
4158f26
fixed makepeds path
themindatlarge Jun 12, 2024
f206b58
Merge pull request #59 from pcdshub/58-pull-in-command-line-tools
themindatlarge Jun 12, 2024
7f7f9bc
added cctbx
themindatlarge Jun 12, 2024
85d6878
fixed cctbx class
themindatlarge Jun 12, 2024
8b51548
fixed path
themindatlarge Jun 12, 2024
f54a58c
check_settings fixed
themindatlarge Jun 12, 2024
0505249
typo
themindatlarge Jun 12, 2024
515ee51
typo
themindatlarge Jun 12, 2024
f42a81f
updated aliases for laser in hutch python.
Jun 18, 2024
8733740
update mfx_atm_y_motor
themindatlarge Jun 18, 2024
60ba871
Merge pull request #61 from pcdshub/60-add-cctbx-class
themindatlarge Jun 18, 2024
a53ae00
added newport motors for laser
rcjwoods Jun 20, 2024
1b2cdfd
changed new laser motor names to match the .edl screen
rcjwoods Jun 20, 2024
32cb660
Merge pull request #63 from rcjwoods/run22
lg345 Jun 21, 2024
273cf57
Looks like some minor white space changes. Just getting the commit ou…
Jun 21, 2024
b93c5d8
Merge remote-tracking branch 'origin/run22' into 62-code-for-l10279
Jun 21, 2024
6a51caa
Aliased lens_v,h,f to outside of the las object so they can be called…
Jun 21, 2024
7c1163d
added a 4th laser lens motor, lens_g
rcjwoods Jun 25, 2024
eecb2a6
Merge pull request #64 from rcjwoods/run22
rcjwoods Jun 25, 2024
6016a2a
small changes
themindatlarge Jun 25, 2024
af7bbcd
Merge pull request #65 from pcdshub/62-code-for-l10279
themindatlarge Jun 25, 2024
3283c87
make bash_utilities a class
themindatlarge Jun 25, 2024
9e1ccf6
typo
themindatlarge Jun 25, 2024
48d0fb1
add camera list and focus scan to bash utilities
themindatlarge Jun 26, 2024
d2b2c6c
Add cctbx on both ends
themindatlarge Jun 26, 2024
25fb5b4
simplified cctbx
themindatlarge Jun 26, 2024
33fa376
copies of cctbx on s3df
themindatlarge Jun 26, 2024
4a5e54d
typo
themindatlarge Jun 26, 2024
2b8b152
remove return from camera_list
themindatlarge Jun 27, 2024
8a038e9
add notch check
themindatlarge Jun 27, 2024
c4de438
add user arg to notch check
themindatlarge Jun 28, 2024
59265d2
typo
themindatlarge Jun 28, 2024
125a132
forgot self
themindatlarge Jun 28, 2024
26242cb
typo
themindatlarge Jun 28, 2024
a941fa7
added 60Hz laser to mfx-timing
themindatlarge Jul 1, 2024
5703777
typo
themindatlarge Jul 1, 2024
d956dec
changed call for bash_utilities from cl to bs
themindatlarge Jul 1, 2024
d17e26e
add 20 and 120 Hz with laser to MFX_Timing
themindatlarge Jul 1, 2024
c16631c
refactored mfx_timing
themindatlarge Jul 1, 2024
fa053ea
new load for mfx_timing and add second event seq arg
themindatlarge Jul 1, 2024
35d29f8
Fixed sequencer arg
themindatlarge Jul 1, 2024
9e5a271
add check sequence
themindatlarge Jul 1, 2024
03b483e
import sleep
themindatlarge Jul 1, 2024
cb7746c
typo
themindatlarge Jul 1, 2024
1d0d1f1
fix laser arg
themindatlarge Jul 1, 2024
bb1b662
reverse sequence assignment
themindatlarge Jul 1, 2024
45b6fc1
add stops when setting new sequence
themindatlarge Jul 1, 2024
91250d9
added docs
themindatlarge Jul 1, 2024
02b107c
fixed mfx_timing
themindatlarge Jul 2, 2024
4ce8312
fixed focus scan call
themindatlarge Jul 2, 2024
51e3ca4
update notch check
themindatlarge Jul 11, 2024
0f4d3c8
ignore presets
themindatlarge Jul 11, 2024
f629e5a
preset commit test
themindatlarge Aug 13, 2024
869535b
gitignore presets
themindatlarge Aug 16, 2024
12dd7a6
Merge pull request #66 from pcdshub/60-add-cctbx-class
themindatlarge Aug 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ logs
# Ignore generated database file
mfx/db.txt

# Ignore changed presets
presets/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
1 change: 0 additions & 1 deletion dev/devpath/nabs

This file was deleted.

2 changes: 1 addition & 1 deletion dev/pcdsdevices
Submodule pcdsdevices updated from 6b5c87 to 090908
Loading
Loading