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.

Sign up for GitHub

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

Jump to bottom

Merge run22 into master #68

Merged
merged 114 commits into from
Aug 26, 2024
Merged

Merge run22 into master #68

merged 114 commits into from
Aug 26, 2024

Conversation

themindatlarge
Copy link
Collaborator

At the end of run22 we are merging the stable staging branch of run22 into master with the following changes:

  • ENH/optional_daq_attenscan
  • BUG/timetool_correct
  • 53-code-for-june-2024-dot-experiments
  • 20-soft-exit-for-autorun
  • 56-add-yano-user-class-permanently
  • 58-pull-in-command-line-tools
  • origin/62-code-for-l10279
  • 60-add-cctbx-class

fredericpoitevin and others added 30 commits February 21, 2024 07:51
@fredericpoitevin
fakedetector correction of notation confusion between q and s
fd44e81
@lg345
Merge pull request #48 from pcdshub/fakedetector_typo
28a4e4b 
fakedetector correction of notation confusion between q and s. Looks correct now.
@themindatlarge
adding Lelands changes
6508d88
@themindatlarge
macro.py changes
97d84ba
@themindatlarge
fixed macro.py
8ca9f57
@gadorlhiac
Optional DAQ in attenuator scans
a471f1e
@gadorlhiac
ENH Make attenuator scan wait time adjustable when not using the DAQ.
3958b3c
@themindatlarge
Merge pull request #49 from pcdshub/ENH/optional_daq_attenscan
84f34ed 
Optional DAQ in attenuator scans
@gadorlhiac
BUG Correct array indexing for EBUILD timetool PV
a58e65a
@gadorlhiac
BUG Make it possible to break out of double loop
3aacf47
@gadorlhiac
MNT Print a message if drift correction goes one minute without a goo…
905c745 
…d measurement.
@gadorlhiac
MNT Add missing type hint
ba25e81
@lg345
Merge pull request #50 from pcdshub/BUG/timetool_correct
da0b150 
BUG/timetool correct
@themindatlarge
add preset inj_xyz
054530f
@themindatlarge
removed dev/transfocate as not used anymore
7e7a1a1
@themindatlarge
copied over l1032322.py from January Yano time at XPP
ae0ad7b
@themindatlarge
removed beamline_071523.py
f399f46
@themindatlarge
created first draft of l1019822 code
2fec336
@themindatlarge
l1019822.py ready for testing
74cee47
@themindatlarge
yano code working
8b7aa3b
@themindatlarge
fixed set_delay and added args for all shutters
3aa31c2
@themindatlarge
fixed event sequencer convensions for 20 and 30 Hz
4e9c95b
@themindatlarge
Fixed event codes
2863d4a
@themindatlarge
fixed 120Hz added 60 Hz
70ebc73
@themindatlarge
fixed T0 and shamefully brought back Lelands TFS code after I deleted it
0a14dc9
@themindatlarge
trying to fix soft keyboard interrupt by adding daq.begin to class (b…
d394529 
…roken)
@themindatlarge
finally figured out contorled autorun exit
f3098bc
@themindatlarge
bug fixes for l1019822.py
ab9bc6b
@themindatlarge
made the code humberto proof
8921cc3
@themindatlarge
Merge pull request #54 from pcdshub/53-code-for-june-2024-dot-experim…
a8de4fb 
…ents

53 code for june 2024 dot experiments
themindatlarge and others added 27 commits June 27, 2024 13:11
@themindatlarge
remove return from camera_list
2b8b152
@themindatlarge
add notch check
8a038e9
@themindatlarge
add user arg to notch check
c4de438
@themindatlarge
typo
59265d2
@themindatlarge
forgot self
125a132
@themindatlarge
typo
26242cb
@themindatlarge
added 60Hz laser to mfx-timing
a941fa7
@themindatlarge
typo
5703777
@themindatlarge
changed call for bash_utilities from cl to bs
d956dec
@themindatlarge
add 20 and 120 Hz with laser to MFX_Timing
d17e26e
@themindatlarge
refactored mfx_timing
c16631c
@themindatlarge
new load for mfx_timing and add second event seq arg
fa053ea
@themindatlarge
Fixed sequencer arg
35d29f8
@themindatlarge
add check sequence
9e5a271
@themindatlarge
import sleep
03b483e
@themindatlarge
typo
cb7746c
@themindatlarge
fix laser arg
1d0d1f1
@themindatlarge
reverse sequence assignment
bb1b662
@themindatlarge
add stops when setting new sequence
45b6fc1
@themindatlarge
added docs
91250d9
@themindatlarge
fixed mfx_timing
02b107c
@themindatlarge
fixed focus scan call
4ce8312
@themindatlarge
update notch check
51e3ca4
@themindatlarge
ignore presets
0f4d3c8
@themindatlarge
preset commit test
f629e5a
@themindatlarge
gitignore presets
869535b
@themindatlarge
Merge pull request #66 from pcdshub/60-add-cctbx-class
12dd7a6 
60 add cctbx class
@themindatlarge themindatlarge merged commit 187edbc into master Aug 26, 2024
4 checks passed
@rcjwoods rcjwoods deleted the run22 branch October 29, 2024 17:03
@rcjwoods rcjwoods restored the run22 branch October 29, 2024 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@themindatlarge @fredericpoitevin @lg345 @gadorlhiac @rcjwoods