Code

WIP: Trexafs#44

Code

Open

emusterman wants to merge 82 commits intomasterNSLS-II-SRX/profile_collection:masterfrom trexafsNSLS-II-SRX/profile_collection:trexafsCopy head branch name to clipboard

+1,735-64

Commits

Commits on Jul 27, 2022

• Add time-resolved exafs scans

  

  Andy Kiss

  authored and

  Andrew Kiss

  committed
  a3fd419

  Copy full SHA for a3fd419

• Changed user information

  

  Andy Kiss

  authored and

  Andrew Kiss

  committed
  56f0aec

  Copy full SHA for 56f0aec

• WIP Debugging at beamline

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  a4f8953

  Copy full SHA for a4f8953

Commits on Aug 1, 2022

• V7 Changes

  

  Andy Kiss

  committed
  62ba69e

  Copy full SHA for 62ba69e

Commits on Aug 3, 2022

• After our coding session

  

  Andy Kiss

  committed
  faa032b

  Copy full SHA for faa032b

Commits on Aug 5, 2022

• V8 before we fix things

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  e89db6c

  Copy full SHA for e89db6c

• Added AND and DIV classes to Zebra

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  721101d

  Copy full SHA for 721101d

• Added stage sigs to zebra

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  b58a982

  Copy full SHA for b58a982

• Make laser controls work

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  a3beb28

  Copy full SHA for a3beb28

Commits on Aug 6, 2022

• Change zebra staging delay back to 10 ms

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  024a8d7

  Copy full SHA for 024a8d7

• WIP: End of day commit

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  e346fce

  Copy full SHA for e346fce

• Got the scaler and xs to work!

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  c3682fb

  Copy full SHA for c3682fb

Commits on Aug 8, 2022

• Added debugging statements for setting up Merlin

  

  Andy Kiss

  authored and

  Andrew Kiss

  committed
  2d68f5f

  Copy full SHA for 2d68f5f

Commits on Aug 9, 2022

• Added triggering for merlin and flyer complete/collect

  

  Andy Kiss

  committed
  3a53a7d

  Copy full SHA for 3a53a7d

Commits on Aug 10, 2022

• Cleaned with small edits

  emusterman

  committed
  da23b51

  Copy full SHA for da23b51

• Minor edits after meeting review

  emusterman

  committed
  81e8caa

  Copy full SHA for 81e8caa

Commits on Aug 11, 2022

• Got the X3X and scaler saving data and visible in DB

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  a382dc0

  Copy full SHA for a382dc0

• Add function to save all scaler points

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  737430c

  Copy full SHA for 737430c

• Remove checking for ME4/XS4

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  48240b0

  Copy full SHA for 48240b0

• Change set to actually write file path

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  da7a1ca

  Copy full SHA for da7a1ca

• Single time-series is working with xs, merlin, scaler

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  66c992d

  Copy full SHA for 66c992d

Commits on Aug 12, 2022

• Always move z first. Added dets to md

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  d5eb1df

  Copy full SHA for d5eb1df

• Add time-resolved exafs scans

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  320d4bb

  Copy full SHA for 320d4bb

• Changed user information

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  64e5cf9

  Copy full SHA for 64e5cf9

• WIP Debugging at beamline

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  478de25

  Copy full SHA for 478de25

• V7 Changes

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  3e741df

  Copy full SHA for 3e741df

• After our coding session

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  cdb8868

  Copy full SHA for cdb8868

• V8 before we fix things

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  5ffcf3f

  Copy full SHA for 5ffcf3f

• Added AND and DIV classes to Zebra

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  b85def2

  Copy full SHA for b85def2

• Added stage sigs to zebra

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  b1a92a0

  Copy full SHA for b1a92a0

• Make laser controls work

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  6dff981

  Copy full SHA for 6dff981

• WIP: End of day commit

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  51e6ac6

  Copy full SHA for 51e6ac6

• Got the scaler and xs to work!

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  1744fbb

  Copy full SHA for 1744fbb

• Added debugging statements for setting up Merlin

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  b9c4c4c

  Copy full SHA for b9c4c4c

• Added triggering for merlin and flyer complete/collect

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  48d59e3

  Copy full SHA for 48d59e3

• Cleaned with small edits

  

  emusterman

  authored and

  SRX Operator

  committed
  3ac274c

  Copy full SHA for 3ac274c

• Minor edits after meeting review

  

  emusterman

  authored and

  SRX Operator

  committed
  9a4a3be

  Copy full SHA for 9a4a3be

• Got the X3X and scaler saving data and visible in DB

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  d33b11e

  Copy full SHA for d33b11e

• Add function to save all scaler points

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  aaeaa92

  Copy full SHA for aaeaa92

• Remove checking for ME4/XS4

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  6be2297

  Copy full SHA for 6be2297

• Change set to actually write file path

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  50e0203

  Copy full SHA for 50e0203

• Single time-series is working with xs, merlin, scaler

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  a61359f

  Copy full SHA for a61359f

• Always move z first. Added dets to md

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  3670ce7

  Copy full SHA for 3670ce7

• Merge branch 'trexafs' of https://github.com/NSLS-II-SRX/profile_collection into trexafs

  

  SRX Operator

  committed
  cdfbc6b

  Copy full SHA for cdfbc6b

Commits on Aug 18, 2022

• updates from beamtime

  

  SRX Operator

  committed
  a9c9b5f

  Copy full SHA for a9c9b5f

• logging set to info

  emusterman

  committed
  c4266a6

  Copy full SHA for c4266a6

• saving knife edge raw data

  emusterman

  committed
  622714a

  Copy full SHA for 622714a

• added text to knife edge plots

  emusterman

  committed
  6ea48a2

  Copy full SHA for 6ea48a2

• updated text, forced opacity

  emusterman

  committed
  80a6c73

  Copy full SHA for 80a6c73

• Can align along just one direction now

  emusterman

  committed
  388ce29

  Copy full SHA for 388ce29

• better meta data and TODO list

  emusterman

  committed
  0bcea47

  Copy full SHA for 0bcea47

• delay time added after laser on

  emusterman

  committed
  868d524

  Copy full SHA for 868d524

• mild cleaning

  emusterman

  committed
  a319981

  Copy full SHA for a319981

Commits on Aug 19, 2022

• added both beam plot for alignment

  emusterman

  committed
  917fbe6

  Copy full SHA for 917fbe6

• vlm stage move can be disabled during beam alignment

  emusterman

  committed
  b7818e1

  Copy full SHA for b7818e1

• beam alignment move more verbose

  emusterman

  committed
  d6cae01

  Copy full SHA for d6cae01

• edge function added, testing needed

  emusterman

  committed
  edf4146

  Copy full SHA for edf4146

Commits on Aug 22, 2022

• fixed some plotting issues

  emusterman

  committed
  e8fa041

  Copy full SHA for e8fa041

• new edge function with variable slopes

  emusterman

  committed
  da2d745

  Copy full SHA for da2d745

Commits on Aug 26, 2022

• lazer testing updates

  

  SRX Operator

  committed
  2430ce2

  Copy full SHA for 2430ce2

Commits on Sep 1, 2022

• updates from Sep 1 testing

  

  SRX Operator

  committed
  ffe6ed2

  Copy full SHA for ffe6ed2

Commits on Sep 2, 2022

• updates from Sep. 2 testing

  

  SRX Operator

  committed
  5f741af

  Copy full SHA for 5f741af

Commits on Sep 6, 2022

• Sept 6th beamline testing

  

  SRX Operator

  committed
  3de6712

  Copy full SHA for 3de6712

Commits on Sep 19, 2022

• Changes after testing

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  cf04843

  Copy full SHA for cf04843

Commits on Sep 20, 2022

• Can now fit 1 or 2 edges

  emusterman

  committed
  61a61ed

  Copy full SHA for 61a61ed

• removed range check TODO, not needed

  emusterman

  committed
  31bc9ee

  Copy full SHA for 31bc9ee

• Fixed errors in plot_beam_alignment

  emusterman

  committed
  1779caa

  Copy full SHA for 1779caa

Commits on Oct 25, 2022

• added beam alignments plot

  emusterman

  committed
  4d4cb26

  Copy full SHA for 4d4cb26

• Generated z-coords for point arrays

  emusterman

  committed
  0d2f939

  Copy full SHA for 0d2f939

• Added conditionals to gen_pos for z-coords

  emusterman

  committed
  f2f8b44

  Copy full SHA for f2f8b44

• Added z-coordinate moves and checks

  emusterman

  committed
  73050fc

  Copy full SHA for 73050fc

• Time delay before data collection added to batch plan

  emusterman

  committed
  a31facf

  Copy full SHA for a31facf

• A bit of cleanup

  emusterman

  committed
  ec29bae

  Copy full SHA for ec29bae

• Added logscan_detailed to time series

  emusterman

  committed
  a49fe15

  Copy full SHA for a49fe15

Commits on Oct 26, 2022

• Merge remote-tracking branch 'origin' into trexafs

  

  Andy Kiss

  committed
  c39589a

  Copy full SHA for c39589a

Commits on Nov 10, 2022

• Merge branch 'master' of https://github.com/NSLS-II-SRX/profile_collection into trexafs

  

  SRX Operator

  committed
  534fc8e

  Copy full SHA for 534fc8e

• Fixes from beamline testing

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  9740aec

  Copy full SHA for 9740aec

• more changes

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  6abe4b9

  Copy full SHA for 6abe4b9

Commits on Dec 2, 2022

• Better implement merlin and dexela into fly scans

  Show description for a52a11c
  

  Andy Kiss

  authored and

  SRX Operator

  committed
  a52a11c

  Copy full SHA for a52a11c

• Changes from Nov 2022 beamtime

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  15de2c0

  Copy full SHA for 15de2c0

Commits on Feb 28, 2023

• Merge with master

  

  Andy Kiss

  authored and

  Andrew Kiss

  committed
  786db9f

  Copy full SHA for 786db9f

Commits on Mar 3, 2023

• Changes from end of run March 2023

  

  Andy Kiss

  authored and

  SRX Operator

  committed
  756cfc2

  Copy full SHA for 756cfc2