WIP: Trexafs#44

Open

emusterman wants to merge 82 commits into

mainfrom

Commits on Jul 27, 2022

Add time-resolved exafs scans

Andy Kiss
authored and
Andrew Kiss
committed
Changed user information

Andy Kiss
authored and
Andrew Kiss
committed
WIP Debugging at beamline

Andy Kiss
authored and
SRX Operator
committed

Commits on Aug 1, 2022

V7 Changes
Andy Kiss
committed

Commits on Aug 3, 2022

After our coding session
Andy Kiss
committed

Commits on Aug 5, 2022

V8 before we fix things

Andy Kiss
authored and
SRX Operator
committed
Added AND and DIV classes to Zebra

Andy Kiss
authored and
SRX Operator
committed
Added stage sigs to zebra

Andy Kiss
authored and
SRX Operator
committed
Make laser controls work

Andy Kiss
authored and
SRX Operator
committed

Commits on Aug 6, 2022

Change zebra staging delay back to 10 ms

Andy Kiss
authored and
SRX Operator
committed
WIP: End of day commit

Andy Kiss
authored and
SRX Operator
committed
Got the scaler and xs to work!

Andy Kiss
authored and
SRX Operator
committed

Commits on Aug 8, 2022

Added debugging statements for setting up Merlin

Andy Kiss
authored and
Andrew Kiss
committed

Commits on Aug 9, 2022

Added triggering for merlin and flyer complete/collect
Andy Kiss
committed

Commits on Aug 10, 2022

Commits on Aug 11, 2022

Got the X3X and scaler saving data and visible in DB

Andy Kiss
authored and
SRX Operator
committed
Add function to save all scaler points

Andy Kiss
authored and
SRX Operator
committed
Remove checking for ME4/XS4

Andy Kiss
authored and
SRX Operator
committed
Change set to actually write file path

Andy Kiss
authored and
SRX Operator
committed
Single time-series is working with xs, merlin, scaler

Andy Kiss
authored and
SRX Operator
committed

Commits on Aug 12, 2022

Always move z first. Added dets to md

Andy Kiss
authored and
SRX Operator
committed
Add time-resolved exafs scans

Andy Kiss
authored and
SRX Operator
committed
Changed user information

Andy Kiss
authored and
SRX Operator
committed
WIP Debugging at beamline

Andy Kiss
authored and
SRX Operator
committed
V7 Changes

Andy Kiss
authored and
SRX Operator
committed
After our coding session

Andy Kiss
authored and
SRX Operator
committed
V8 before we fix things

Andy Kiss
authored and
SRX Operator
committed
Added AND and DIV classes to Zebra

Andy Kiss
authored and
SRX Operator
committed
Added stage sigs to zebra

Andy Kiss
authored and
SRX Operator
committed
Make laser controls work

Andy Kiss
authored and
SRX Operator
committed
WIP: End of day commit

Andy Kiss
authored and
SRX Operator
committed
Got the scaler and xs to work!

Andy Kiss
authored and
SRX Operator
committed
Added debugging statements for setting up Merlin

Andy Kiss
authored and
SRX Operator
committed
Added triggering for merlin and flyer complete/collect

Andy Kiss
authored and
SRX Operator
committed
Cleaned with small edits

emusterman
authored and
SRX Operator
committed
Minor edits after meeting review

emusterman
authored and
SRX Operator
committed
Got the X3X and scaler saving data and visible in DB

Andy Kiss
authored and
SRX Operator
committed
Add function to save all scaler points

Andy Kiss
authored and
SRX Operator
committed
Remove checking for ME4/XS4

Andy Kiss
authored and
SRX Operator
committed
Change set to actually write file path

Andy Kiss
authored and
SRX Operator
committed
Single time-series is working with xs, merlin, scaler

Andy Kiss
authored and
SRX Operator
committed
Always move z first. Added dets to md

Andy Kiss
authored and
SRX Operator
committed
Merge branch 'trexafs' of https://github.com/NSLS-II-SRX/profile_collection into trexafs
SRX Operator
committed

Commits on Aug 22, 2022

Commits on Aug 26, 2022

lazer testing updates
SRX Operator
committed

Commits on Sep 1, 2022

updates from Sep 1 testing
SRX Operator
committed

Commits on Sep 2, 2022

updates from Sep. 2 testing
SRX Operator
committed

Commits on Sep 6, 2022

Sept 6th beamline testing
SRX Operator
committed

Commits on Sep 19, 2022

Changes after testing

Andy Kiss
authored and
SRX Operator
committed

Commits on Sep 20, 2022

Commits on Oct 26, 2022

Merge remote-tracking branch 'origin' into trexafs
Andy Kiss
committed

Commits on Nov 10, 2022

Merge branch 'master' of https://github.com/NSLS-II-SRX/profile_collection into trexafs
SRX Operator
committed
Fixes from beamline testing

Andy Kiss
authored and
SRX Operator
committed
more changes

Andy Kiss
authored and
SRX Operator
committed

Commits on Dec 2, 2022

Better implement merlin and dexela into fly scans

Andy Kiss
authored and
SRX Operator
committed
Changes from Nov 2022 beamtime

Andy Kiss
authored and
SRX Operator
committed

Commits on Feb 28, 2023

Merge with master

Andy Kiss
authored and
Andrew Kiss
committed

Commits on Mar 3, 2023

Changes from end of run March 2023

Andy Kiss
authored and
SRX Operator
committed