Code

Merge GUI to Main#56

Code

Merged

HKaras merged 216 commits intomainJeschkeLab/autoDEER:mainfrom GUIJeschkeLab/autoDEER:GUICopy head branch name to clipboardApr 3, 2024

+12,173-3,103

Commits

Commits on Nov 28, 2022

• Merge pull request #40 from HKaras/main

  Show description for 08629fd
  HKaras

  authored
  08629fd

Commits on Jun 29, 2023

• Merge pull request #48 from JeschkeLab/main

  Show description for a463181
  HKaras

  authored
  a463181

Commits on Sep 11, 2023

• GUI Update

  HKaras

  committed
  b844488

• Some basic changes

  HKaras

  committed
  ad914ba

• Import fixes

  HKaras

  committed
  2074c91

• Path fix

  HKaras

  committed
  0d2f808

• Fix connection issues

  HKaras

  committed
  a457710

• Tune pulses in worker

  HKaras

  committed
  68d886e

Commits on Sep 12, 2023

• Update ETH_awg.py

  HKaras

  committed
  f4fe930

• Minor Bug fixes

  HKaras

  committed
  f312fd4

• Bug fixes

  HKaras

  committed
  2f13b6a

Commits on Sep 19, 2023

• New pulse optimisation

  HKaras

  committed
  49c56d6

• Bug Fixes

  HKaras

  committed
  9629a38

• Improved dummy interface

  HKaras

  committed
  35c66f3

• - Improved GUI

  Show description for fa08b56
  HKaras

  committed
  fa08b56

Commits on Sep 25, 2023

• Changed to num_scans

  HKaras

  committed
  b0dd0da

• Add autoupdate to quickdeer

  HKaras

  committed
  b7afe40

• Update

  HKaras

  committed
  644daae

Commits on Sep 26, 2023

• Add pdf generator

  HKaras

  committed
  1182c86

• Improvements

  HKaras

  committed
  de0239e

• Fix tdip calc and remove progress bars

  HKaras

  committed
  5dfd6a6

Commits on Oct 5, 2023

• Doc update

  HKaras

  committed
  c567f7c

• Add reptime experiment and analysis

  HKaras

  committed
  034717e

• Restructure of gui files

  HKaras

  committed
  da0e49d

Commits on Oct 6, 2023

• Update to pulse spel writer to handle srt scan

  HKaras

  committed
  c74b322

Commits on Oct 9, 2023

• Add logo to pdf

  HKaras

  committed
  a80c7b7

• Add reptime scan to worker

  HKaras

  committed
  57cb456

• bugfixes

  HKaras

  committed
  4d6563d

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  e8a440f

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  dd84c18

Commits on Oct 10, 2023

• Minor bug fixes

  HKaras

  committed
  fd7feb6

Commits on Oct 11, 2023

• Added multi-core option

  HKaras

  committed
  6d395c6

• Improvements

  Show description for 779c73d
  HKaras

  committed
  779c73d

Commits on Oct 18, 2023

• No mandatory PYQT6

  HKaras

  committed
  db2c247

• Readd Model to DEERanalysis

  HKaras

  committed
  a504d36

• Auto stash before merge of "GUI" and "origin/GUI"

  HKaras

  committed
  d5d81e5

• Noidea what happened

  HKaras

  committed
  2cd03f0

• Minor changes

  HKaras

  committed
  17bfb87

• bug fix

  HKaras

  committed
  0cc7df9

• Add regparam to DEERanalysis

  HKaras

  committed
  2288001

Commits on Oct 19, 2023

• Update reporter.py

  HKaras

  committed
  6abef62

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  427cbc9

Commits on Oct 20, 2023

• Some fixes

  HKaras

  committed
  454816a

Commits on Oct 26, 2023

• Brute optimse pulses

  HKaras

  committed
  7d0d0fd

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  60e4bf6

Commits on Oct 27, 2023

• Added dt recomendation and improved criteria

  HKaras

  committed
  744b78a

Commits on Nov 9, 2023

• PulseSpel writer bug fixes

  HKaras

  committed
  e539ab2

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  478a0c1

• Auto stash before merge of "GUI" and "origin/GUI"

  HKaras

  committed
  d2f7669

• MPFU tune rework

  HKaras

  committed
  35ba093

• MPFU tune update

  HKaras

  committed
  dc700de

• Added gcd function for floats

  HKaras

  committed
  1796cc4

• MPFU fsweep update

  HKaras

  committed
  5d1a64a

Commits on Nov 10, 2023

• Update pulse spel writer

  HKaras

  committed
  0776d67

• Minor bug fixes to pulsespel writer

  HKaras

  committed
  3b58bbc

• first ELDOR tune

  HKaras

  committed
  34a31be

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  4447a62

• Pulsespel writer does moving pulses.

  HKaras

  committed
  2a7f41f

• Auto stash before merge of "GUI" and "origin/GUI"

  HKaras

  committed
  70ca02d

Commits on Nov 14, 2023

• Test classes update

  HKaras

  committed
  92fea5b

• Criteria Tests

  HKaras

  committed
  37f60d0

Commits on Nov 15, 2023

• Testing update

  HKaras

  committed
  8c0217d

Commits on Nov 16, 2023

• Big tests update

  HKaras

  committed
  c14a3ac

• More tests and dataset

  HKaras

  committed
  dae3d52

• Purge dataset and other data

  HKaras

  committed
  aed561b

• Larger sequences testset

  HKaras

  committed
  9d429d6

• Updated Dependencies

  HKaras

  committed
  6f3e548

Commits on Nov 21, 2023

• Improved freq_cal file

  HKaras

  committed
  11efcb7

• Added complex threaded experminets

  Show description for 7813f0e
  HKaras

  committed
  7813f0e

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  ef18e88

• Adds mock tune_rectpulse to MPFU

  HKaras

  committed
  11c5c26

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  e2b3716

• Bug fixes

  HKaras

  committed
  3de4c83

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  1e94cbd

• reptime support in Pulsespel writer

  HKaras

  committed
  b71e36e

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  2d00218

• Reptime fix

  HKaras

  committed
  5bd4ab3

• Fixes bugs in XeprLink

  HKaras

  committed
  7fea06a

• Catches connection Error

  HKaras

  committed
  b4ead5d

• minor bug fixes

  HKaras

  committed
  f00ccec

• Big expansion of dummy plus deerlab param in yaml

  HKaras

  committed
  79d20de

Commits on Nov 22, 2023

• Resonator Profile on MPFU mostly

  Show description for bbe1a89
  HKaras

  committed
  bbe1a89

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  ce26c50

Commits on Nov 23, 2023

• Moved default pulses out of GUI code

  HKaras

  committed
  f573510

Commits on Nov 27, 2023

• Large scale changes for Bruker compatibility

  HKaras

  committed
  fec3195

• Fixes issue in PulseSpel writer

  HKaras

  committed
  616758c

• Reptime scans can't use sweep cmd

  HKaras

  committed
  989a126

Commits on Nov 29, 2023

• respro bug fix

  HKaras

  committed
  d977c39

Commits on Nov 30, 2023

• AWG update

  HKaras

  committed
  1c82d1a

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  87adf59

• Resonator Profile update

  HKaras

  committed
  a57c837

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  42506db

• Improved Resonator Selection

  HKaras

  committed
  c1836a2

Commits on Dec 1, 2023

• Minor improvements

  HKaras

  committed
  8570f20

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  2a5391e

• Added a user option to control expected sample conc.

  HKaras

  committed
  4818855

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  6e681e3

Commits on Dec 7, 2023

• AWG_updates

  HKaras

  committed
  ef60c4a

• New uwb_eval to use match filter

  HKaras

  committed
  0c4e2ac

Commits on Dec 13, 2023

• Minor changes

  HKaras

  committed
  2c625d2

• Auto stash before merge of "GUI" and "origin/GUI"

  HKaras

  committed
  a2f13ec

• Logging window added

  HKaras

  committed
  894812a

• Basic stopping

  HKaras

  committed
  a09c82e

• phase correction in field sweep

  HKaras

  committed
  dc1fc9b

• Updated config files

  HKaras

  committed
  1b02f0b

Commits on Dec 14, 2023

• Search for pulselength in dataarray

  HKaras

  committed
  7401815

• Bug fixes

  HKaras

  committed
  b727dcb

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  fc4f248

• Bug fix

  HKaras

  committed
  8a2a413

Commits on Dec 15, 2023

• bug fix

  HKaras

  committed
  4b5e2f5

Commits on Jan 8, 2024

• Added T2 Relaxation

  HKaras

  committed
  d9f92ae

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  cb18078

Commits on Jan 9, 2024

• Repeat resonator profile if large shift

  HKaras

  committed
  0f21366

• Log termination criteria

  HKaras

  committed
  327d944

• Ability to combine criteria

  Show description for 94ab7a4
  HKaras

  committed
  94ab7a4

• bug fix main.py

  HKaras

  committed
  7f25245

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  a996d5c

• Expand ETH_awg to handle large sequences

  HKaras

  committed
  91e080e

• Fixed bug with stopping

  HKaras

  committed
  d999f74

Commits on Jan 10, 2024

• Added 2DDecoherence

  HKaras

  committed
  1f928c5

Commits on Jan 11, 2024

• Rounds values to 2ns for MPFU

  HKaras

  committed
  844c246

Commits on Jan 12, 2024

• Big shift in tuning and d0 calc

  HKaras

  committed
  590220b

Commits on Jan 15, 2024

• Update sequences.py

  HKaras

  committed
  267563a

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  03fba46

Commits on Jan 18, 2024

• Added xarray to tools

  HKaras

  committed
  66d9847

• Added respro to pulse_overview

  HKaras

  committed
  05f7bd5

• In MPFU set main attenuator to zero

  HKaras

  committed
  b5dff7c

Commits on Jan 19, 2024

• Minor fixes

  HKaras

  committed
  95c7fbc

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  83191c8

Commits on Jan 22, 2024

• Move to being more automatic

  HKaras

  committed
  5da58e2

• Update tools.py

  HKaras

  committed
  a2f2fe5

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  7108a5c

• Bruker improvments

  HKaras

  committed
  3d96109

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  4ecc39a

• ESEEM + DEER-setting + Xepr-retry

  HKaras

  committed
  4b50e9b

Commits on Jan 25, 2024

• Saving tuning and min pulse length

  HKaras

  committed
  3654874

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  1015346

Commits on Jan 26, 2024

• Noise level per shot

  HKaras

  committed
  858bf5d

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  0d5c4b5

Commits on Jan 29, 2024

• Amplitude sweeps in PulseSpel Writer

  HKaras

  committed
  dfc85b4

• Bruker AWG files

  HKaras

  committed
  da109df

Commits on Jan 30, 2024

• Docs update

  HKaras

  committed
  d46f2d9

Commits on Feb 5, 2024

• Hardcode in the ETH detection width

  Show description for dbf4af2
  HKaras

  committed
  dbf4af2

• Update ResPro.py

  Show description for 70ea587
  HKaras

  committed
  70ea587

Commits on Feb 8, 2024

• Changes

  HKaras

  committed
  3dc93b0

Commits on Mar 6, 2024

• Latest Bruker Push

  HKaras

  committed
  0488d3e

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  647a5bd

• Normalise data when phase correct

  HKaras

  committed
  9f8eaae

• Remove MaxField Line on EDFS

  HKaras

  committed
  019f14b

• No Matched filter for EDFS

  HKaras

  committed
  da3166b

• Adjustable fc_guess

  HKaras

  committed
  683bd82

• Major shift in DEER Parameter Selection

  HKaras

  committed
  859e043

• Build shape function

  HKaras

  committed
  4e8adc5

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  4877679

• Add single pathway stuff to DeerAnalsysis

  HKaras

  committed
  ff0fc5c

• Improve Reporter

  HKaras

  committed
  3535660

• Add dim control to CP

  HKaras

  committed
  03a8dbb

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  0ccfb12

Commits on Mar 10, 2024

• Improved detection of pulse sequence type

  HKaras

  committed
  fbc7f6e

Commits on Mar 13, 2024

• Adding Variable Labelling Efficency

  HKaras

  committed
  855691d

• Log Termination Time

  HKaras

  committed
  74be455

• Auto stash before merge of "GUI" and "origin/GUI"

  HKaras

  committed
  92afc6a

• Fix estimate time bug

  HKaras

  committed
  e64c69c

Commits on Mar 15, 2024

• Remove normalisation from phase correction

  HKaras

  committed
  325e107

• Minor bug fixes

  HKaras

  committed
  3aafb17

• Improved names of pulses

  HKaras

  committed
  a451f49

• Saves pulse and sequence names to dataset

  HKaras

  committed
  fd0a1ec

• Update Setup.py

  HKaras

  committed
  ca7720e

Commits on Mar 17, 2024

• bug fixes

  HKaras

  committed
  e48fc84

• Split sequence up if variable modified on 2 axes

  HKaras

  committed
  5150fd9

• plot step in relaxation

  HKaras

  committed
  3da643c

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  e6c21f6

Commits on Mar 18, 2024

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  cb4d4a0

• Bug fixin

  HKaras

  committed
  31ce15c

• Merge remote-tracking branch 'origin/GUI' into GUI

  HKaras

  committed
  454261d

Commits on Mar 24, 2024

• Increased averages and variable dt in CP

  HKaras

  committed
  b57bc0f

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  219fdd6

Commits on Mar 25, 2024

• Bug Fixes

  HKaras

  committed
  ae929c2

Commits on Mar 26, 2024

• Logging for dummy interface

  HKaras

  committed
  9f38c41

• Higher quality plots

  HKaras

  committed
  10f96e8

• Build sequence from dataset

  HKaras

  committed
  3068a42

• combo figure update

  HKaras

  committed
  d892b2d

• combo_figure bug fix

  HKaras

  committed
  28d3619

• Update figures

  HKaras

  committed
  b7022bc

• edgecolors bug fix

  HKaras

  committed
  97e0627

• CP_relax scale temp bug fix

  HKaras

  committed
  e294eb6

• Adding correction factor to account for sensitivity imbalances

  HKaras

  committed
  3ae0e9b

• Auto adjusting of r axis

  HKaras

  committed
  ec30d7a

• decay check function

  HKaras

  committed
  f59383a

• Algorithum updates

  Show description for 9a0be0d
  HKaras

  committed
  9a0be0d

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  d676d5a

• Update .gitignore

  HKaras

  committed
  62415dd

Commits on Mar 27, 2024

• Bug fix in correction factor calculation

  HKaras

  committed
  f831cca

Commits on Apr 2, 2024

• Updates to graphics

  HKaras

  committed
  a19bcc0

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  45ffd26

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  65a7068

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  cb556d2

• Docs update

  HKaras

  committed
  f175f4f

• Update setup.py

  HKaras

  committed
  91f91b5

• Update build_docs.yml

  HKaras

  authored
  492c6c9

• Update Build & Publish Docs.yml

  HKaras

  authored
  9f44c69

• Update Setup.py

  HKaras

  committed
  c041d9b

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  cf60342

• Reduced wildcare imports in __init__.py

  HKaras

  committed
  eb78123

Commits on Apr 3, 2024

• Add colors

  HKaras

  committed
  e318e95

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  85f745c

• Some autoapi updates

  HKaras

  committed
  bff0802

• Another doc update

  HKaras

  committed
  79b4793

• Update build_docs.yml

  HKaras

  authored
  dccf258

• Update build_docs.yml

  HKaras

  authored
  3d31694

• Update build_docs.yml

  HKaras

  authored
  6d7356f

• Update build_docs.yml

  HKaras

  authored
  3b372fd

• Merge branch 'GUI' of https://github.com/JeschkeLab/autoDEER into GUI

  HKaras

  committed
  b356218

• Plotting update

  HKaras

  committed
  cc557e0

• API docs give absolute paths

  HKaras

  committed
  8bcf015

• Update build_docs.yml

  HKaras

  authored
  f35c99e