Code

Merge run22 into master#68

Code

Merged

themindatlarge merged 114 commits intomasterpcdshub/mfx:masterfrom run22pcdshub/mfx:run22Copy head branch name to clipboardAug 26, 2024

+2,987-551

Commits

Commits on Feb 21, 2024

• fakedetector correction of notation confusion between q and s

  fredericpoitevin

  committed
  fd44e81

  Copy full SHA for fd44e81

• Merge pull request #48 from pcdshub/fakedetector_typo

  Show description for 28a4e4b
  lg345

  authored
  28a4e4b

  Copy full SHA for 28a4e4b

Commits on Feb 23, 2024

• adding Lelands changes

  themindatlarge

  committed
  6508d88

  Copy full SHA for 6508d88

• macro.py changes

  themindatlarge

  committed
  97d84ba

  Copy full SHA for 97d84ba

• fixed macro.py

  themindatlarge

  committed
  8ca9f57

  Copy full SHA for 8ca9f57

Commits on Mar 13, 2024

• Optional DAQ in attenuator scans

  gadorlhiac

  committed
  a471f1e

  Copy full SHA for a471f1e

Commits on Mar 14, 2024

• ENH Make attenuator scan wait time adjustable when not using the DAQ.

  gadorlhiac

  committed
  3958b3c

  Copy full SHA for 3958b3c

• Merge pull request #49 from pcdshub/ENH/optional_daq_attenscan

  Show description for 84f34ed
  themindatlarge

  authored
  84f34ed

  Copy full SHA for 84f34ed

Commits on Mar 19, 2024

• BUG Correct array indexing for EBUILD timetool PV

  gadorlhiac

  committed
  a58e65a

  Copy full SHA for a58e65a

• BUG Make it possible to break out of double loop

  gadorlhiac

  committed
  3aacf47

  Copy full SHA for 3aacf47

Commits on Mar 20, 2024

• MNT Print a message if drift correction goes one minute without a good measurement.

  gadorlhiac

  committed
  905c745

  Copy full SHA for 905c745

Commits on Mar 21, 2024

• MNT Add missing type hint

  gadorlhiac

  committed
  ba25e81

  Copy full SHA for ba25e81

• Merge pull request #50 from pcdshub/BUG/timetool_correct

  Show description for da0b150
  lg345

  authored
  da0b150

  Copy full SHA for da0b150

Commits on May 13, 2024

• add preset inj_xyz

  themindatlarge

  committed
  054530f

  Copy full SHA for 054530f

Commits on May 14, 2024

• removed dev/transfocate as not used anymore

  themindatlarge

  committed
  7e7a1a1

  Copy full SHA for 7e7a1a1

• copied over l1032322.py from January Yano time at XPP

  themindatlarge

  committed
  ae0ad7b

  Copy full SHA for ae0ad7b

• removed beamline_071523.py

  themindatlarge

  committed
  f399f46

  Copy full SHA for f399f46

• created first draft of l1019822 code

  themindatlarge

  committed
  2fec336

  Copy full SHA for 2fec336

• l1019822.py ready for testing

  themindatlarge

  committed
  74cee47

  Copy full SHA for 74cee47

• yano code working

  themindatlarge

  committed
  8b7aa3b

  Copy full SHA for 8b7aa3b

• fixed set_delay and added args for all shutters

  themindatlarge

  committed
  3aa31c2

  Copy full SHA for 3aa31c2

• fixed event sequencer convensions for 20 and 30 Hz

  themindatlarge

  committed
  4e9c95b

  Copy full SHA for 4e9c95b

• Fixed event codes

  themindatlarge

  committed
  2863d4a

  Copy full SHA for 2863d4a

• fixed 120Hz added 60 Hz

  themindatlarge

  committed
  70ebc73

  Copy full SHA for 70ebc73

Commits on May 15, 2024

• fixed T0 and shamefully brought back Lelands TFS code after I deleted it

  themindatlarge

  committed
  0a14dc9

  Copy full SHA for 0a14dc9

Commits on May 16, 2024

• trying to fix soft keyboard interrupt by adding daq.begin to class (broken)

  themindatlarge

  committed
  d394529

  Copy full SHA for d394529

• finally figured out contorled autorun exit

  themindatlarge

  committed
  f3098bc

  Copy full SHA for f3098bc

Commits on May 17, 2024

• bug fixes for l1019822.py

  themindatlarge

  committed
  ab9bc6b

  Copy full SHA for ab9bc6b

Commits on May 19, 2024

• made the code humberto proof

  themindatlarge

  committed
  8921cc3

  Copy full SHA for 8921cc3

Commits on May 29, 2024

• Merge pull request #54 from pcdshub/53-code-for-june-2024-dot-experiments

  Show description for a8de4fb
  themindatlarge

  authored
  a8de4fb

  Copy full SHA for a8de4fb

• Added internal begin and post functions to autorun

  themindatlarge

  committed
  7993814

  Copy full SHA for 7993814

• gitting caught up

  themindatlarge

  committed
  47d5837

  Copy full SHA for 47d5837

• getting caught up again

  themindatlarge

  committed
  263d9a3

  Copy full SHA for 263d9a3

Commits on May 30, 2024

• change delay to daq_delay

  themindatlarge

  committed
  3d10aa3

  Copy full SHA for 3d10aa3

Commits on Jun 10, 2024

• dev work done

  themindatlarge

  committed
  664c8dc

  Copy full SHA for 664c8dc

• Merge pull request #55 from pcdshub/20-soft-exit-for-autorun

  Show description for cbef36c
  themindatlarge

  authored
  cbef36c

  Copy full SHA for cbef36c

Commits on Jun 11, 2024

• Add Yano class

  themindatlarge

  committed
  cd56e85

  Copy full SHA for cd56e85

• add yano to beamline.py

  themindatlarge

  committed
  62aa843

  Copy full SHA for 62aa843

• Pull static inputs within Class

  themindatlarge

  committed
  28c685c

  Copy full SHA for 28c685c

• move post

  themindatlarge

  committed
  6425c4a

  Copy full SHA for 6425c4a

• lowercase yano

  themindatlarge

  committed
  298c984

  Copy full SHA for 298c984

• brought yano outside of class

  themindatlarge

  committed
  56ddcd9

  Copy full SHA for 56ddcd9

• added l1029722 just in case

  themindatlarge

  committed
  ba23ff2

  Copy full SHA for ba23ff2

• add selfs

  themindatlarge

  committed
  04f9843

  Copy full SHA for 04f9843

• re-factored yano class

  themindatlarge

  committed
  79cb2ad

  Copy full SHA for 79cb2ad

• fixed beamline.py

  themindatlarge

  committed
  3f45d89

  Copy full SHA for 3f45d89

Commits on Jun 12, 2024

• Merge pull request #57 from pcdshub/56-add-yano-user-class-permanently

  Show description for 5065df4
  themindatlarge

  authored
  5065df4

  Copy full SHA for 5065df4

• mv xfel_gui to bash_utilies and add take/makepeds

  themindatlarge

  committed
  1ea4ce3

  Copy full SHA for 1ea4ce3

• fixed makepeds path

  themindatlarge

  committed
  8786941

  Copy full SHA for 8786941

• removed stand alone xfel_gui

  themindatlarge

  committed
  d492529

  Copy full SHA for d492529

• added awr

  themindatlarge

  committed
  b180471

  Copy full SHA for b180471

• add bash_utilities to beamline.py

  themindatlarge

  committed
  d88d43e

  Copy full SHA for d88d43e

• fixed str

  themindatlarge

  committed
  1a23131

  Copy full SHA for 1a23131

• interactive command

  themindatlarge

  committed
  63758ea

  Copy full SHA for 63758ea

• takepeds and awr working

  themindatlarge

  committed
  52cc551

  Copy full SHA for 52cc551

• removed some subprocess

  themindatlarge

  committed
  8897b36

  Copy full SHA for 8897b36

• add camviewer and restartdaq

  themindatlarge

  committed
  d66fa7d

  Copy full SHA for d66fa7d

• change restartdaq and cameras to subprocess

  themindatlarge

  committed
  924dc50

  Copy full SHA for 924dc50

• fix makepeds

  themindatlarge

  committed
  3225872

  Copy full SHA for 3225872

• fixed makepeds path

  themindatlarge

  committed
  4158f26

  Copy full SHA for 4158f26

• Merge pull request #59 from pcdshub/58-pull-in-command-line-tools

  Show description for f206b58
  themindatlarge

  authored
  f206b58

  Copy full SHA for f206b58

• added cctbx

  themindatlarge

  committed
  7f7f9bc

  Copy full SHA for 7f7f9bc

• fixed cctbx class

  themindatlarge

  committed
  85d6878

  Copy full SHA for 85d6878

• fixed path

  themindatlarge

  committed
  8b51548

  Copy full SHA for 8b51548

• check_settings fixed

  themindatlarge

  committed
  f54a58c

  Copy full SHA for f54a58c

• typo

  themindatlarge

  committed
  0505249

  Copy full SHA for 0505249

• typo

  themindatlarge

  committed
  515ee51

  Copy full SHA for 515ee51

Commits on Jun 18, 2024

• updated aliases for laser in hutch python.

  

  Leland Bruce Gee

  committed
  f42a81f

  Copy full SHA for f42a81f

• update mfx_atm_y_motor

  themindatlarge

  committed
  8733740

  Copy full SHA for 8733740

• Merge pull request #61 from pcdshub/60-add-cctbx-class

  Show description for 60ba871
  themindatlarge

  authored
  60ba871

  Copy full SHA for 60ba871

Commits on Jun 20, 2024

• added newport motors for laser

  rcjwoods

  committed
  a53ae00

  Copy full SHA for a53ae00

• changed new laser motor names to match the .edl screen

  rcjwoods

  committed
  1b2cdfd

  Copy full SHA for 1b2cdfd

Commits on Jun 21, 2024

• Merge pull request #63 from rcjwoods/run22

  Show description for 32cb660
  lg345

  authored
  32cb660

  Copy full SHA for 32cb660

• Looks like some minor white space changes. Just getting the commit out of the way to merge the lens stuff with this branch

  

  Leland Bruce Gee

  authored and

  Leland Bruce Gee

  committed
  273cf57

  Copy full SHA for 273cf57

• Merge remote-tracking branch 'origin/run22' into 62-code-for-l10279

  Show description for b93c5d8
  

  Leland Bruce Gee

  authored and

  Leland Bruce Gee

  committed
  b93c5d8

  Copy full SHA for b93c5d8

• Aliased lens_v,h,f to outside of the las object so they can be called directl as lens_v,h,f

  

  Leland Bruce Gee

  authored and

  Leland Bruce Gee

  committed
  6a51caa

  Copy full SHA for 6a51caa

Commits on Jun 25, 2024

• added a 4th laser lens motor, lens_g

  rcjwoods

  committed
  7c1163d

  Copy full SHA for 7c1163d

• Merge pull request #64 from rcjwoods/run22

  Show description for eecb2a6
  rcjwoods

  authored
  eecb2a6

  Copy full SHA for eecb2a6

• small changes

  themindatlarge

  committed
  6016a2a

  Copy full SHA for 6016a2a

• Merge pull request #65 from pcdshub/62-code-for-l10279

  Show description for af7bbcd
  themindatlarge

  authored
  af7bbcd

  Copy full SHA for af7bbcd

• make bash_utilities a class

  themindatlarge

  committed
  3283c87

  Copy full SHA for 3283c87

• typo

  themindatlarge

  committed
  9e1ccf6

  Copy full SHA for 9e1ccf6

Commits on Jun 26, 2024

• add camera list and focus scan to bash utilities

  themindatlarge

  committed
  48d0fb1

  Copy full SHA for 48d0fb1

• Add cctbx on both ends

  themindatlarge

  committed
  d2b2c6c

  Copy full SHA for d2b2c6c

• simplified cctbx

  themindatlarge

  committed
  25fb5b4

  Copy full SHA for 25fb5b4

• copies of cctbx on s3df

  themindatlarge

  committed
  33fa376

  Copy full SHA for 33fa376

• typo

  themindatlarge

  committed
  4a5e54d

  Copy full SHA for 4a5e54d

Commits on Jun 27, 2024

• remove return from camera_list

  themindatlarge

  committed
  2b8b152

  Copy full SHA for 2b8b152

• add notch check

  themindatlarge

  committed
  8a038e9

  Copy full SHA for 8a038e9

Commits on Jun 28, 2024

• add user arg to notch check

  themindatlarge

  committed
  c4de438

  Copy full SHA for c4de438

• typo

  themindatlarge

  committed
  59265d2

  Copy full SHA for 59265d2

• forgot self

  themindatlarge

  committed
  125a132

  Copy full SHA for 125a132

• typo

  themindatlarge

  committed
  26242cb

  Copy full SHA for 26242cb

Commits on Jul 1, 2024

• added 60Hz laser to mfx-timing

  themindatlarge

  committed
  a941fa7

  Copy full SHA for a941fa7

• typo

  themindatlarge

  committed
  5703777

  Copy full SHA for 5703777

• changed call for bash_utilities from cl to bs

  themindatlarge

  committed
  d956dec

  Copy full SHA for d956dec

• add 20 and 120 Hz with laser to MFX_Timing

  themindatlarge

  committed
  d17e26e

  Copy full SHA for d17e26e

• refactored mfx_timing

  themindatlarge

  committed
  c16631c

  Copy full SHA for c16631c

• new load for mfx_timing and add second event seq arg

  themindatlarge

  committed
  fa053ea

  Copy full SHA for fa053ea

• Fixed sequencer arg

  themindatlarge

  committed
  35d29f8

  Copy full SHA for 35d29f8

• add check sequence

  themindatlarge

  committed
  9e5a271

  Copy full SHA for 9e5a271

• import sleep

  themindatlarge

  committed
  03b483e

  Copy full SHA for 03b483e

• typo

  themindatlarge

  committed
  cb7746c

  Copy full SHA for cb7746c

• fix laser arg

  themindatlarge

  committed
  1d0d1f1

  Copy full SHA for 1d0d1f1

• reverse sequence assignment

  themindatlarge

  committed
  bb1b662

  Copy full SHA for bb1b662

• add stops when setting new sequence

  themindatlarge

  committed
  45b6fc1

  Copy full SHA for 45b6fc1

• added docs

  themindatlarge

  committed
  91250d9

  Copy full SHA for 91250d9

Commits on Jul 2, 2024

• fixed mfx_timing

  themindatlarge

  committed
  02b107c

  Copy full SHA for 02b107c

• fixed focus scan call

  themindatlarge

  committed
  4ce8312

  Copy full SHA for 4ce8312

Commits on Jul 11, 2024

• update notch check

  themindatlarge

  committed
  51e3ca4

  Copy full SHA for 51e3ca4

• ignore presets

  themindatlarge

  committed
  0f4d3c8

  Copy full SHA for 0f4d3c8

Commits on Aug 13, 2024

• preset commit test

  themindatlarge

  committed
  f629e5a

  Copy full SHA for f629e5a

Commits on Aug 16, 2024

• gitignore presets

  themindatlarge

  committed
  869535b

  Copy full SHA for 869535b

• Merge pull request #66 from pcdshub/60-add-cctbx-class

  Show description for 12dd7a6
  themindatlarge

  authored
  12dd7a6

  Copy full SHA for 12dd7a6