Commits · 6d460e8624f0c14ca1def5eb5252e59869504447 · Thomas Kluyver / ToolBox

Mar 27, 2020
- Merge branch 'ol_pId' into 'master' · 6d460e86
  Laurent Mercadier authored 4 years ago
  
  ol_pId See merge request SCS/ToolBox!78
  6d460e86
- source argument can be used to give name of peak Id dimension · 51e79fd1
  Laurent Mercadier authored 4 years ago
  
  51e79fd1
- Merge branch 'repRate' into 'master' · 6ad3d7f1
  Laurent Mercadier authored 4 years ago
  
  Improved repRate() function See merge request SCS/ToolBox!77
  6ad3d7f1
- Improved repRate() function · ccc14a8b
  Laurent Mercadier authored 4 years ago
  
  ccc14a8b
Mar 17, 2020
- Adds source argument in fastAdc to rename the peak dimension accordingly · fcb27cf7
  Laurent Mercadier authored 5 years ago
  
  fcb27cf7
Mar 13, 2020
- Merge branch 'gpc_mnemonics' into 'master' · e4ea7f80
  Laurent Mercadier authored 5 years ago
  
  Handles case where fit does not work See merge request SCS/ToolBox!75
  e4ea7f80
- Handles case where fit does not work · b16d3c06
  Laurent Mercadier authored 5 years ago
  
  b16d3c06
- Merge branch 'gpc_mnemonics' into 'master' · a7df0ed4
  Laurent Mercadier authored 5 years ago
  
  Added mnemonics for GPC motors, improved knife edge function See merge request SCS/ToolBox!74
  a7df0ed4
- Added mnemonics for GPC motors, improved knife edge function · 77c198d1
  Laurent Mercadier authored 5 years ago
  
  77c198d1
Mar 10, 2020
- Merge branch 'auto_fast_adc' into 'master' · a4d8d960
  Laurent Mercadier authored 5 years ago
  
  Improved autoFindFastAdcPeaks() See merge request SCS/ToolBox!73
  a4d8d960
- Merge branch 'master' into 'auto_fast_adc' · 86bda1ba
  Laurent Mercadier authored 5 years ago
  
  # Conflicts: # xgm.py
  86bda1ba
- Re-add option to integrate over or take extremum of peak · 54c10151
  Laurent Mercadier authored 5 years ago
  
  54c10151
- Merge branch 'bam' into 'master' · 25ec1920
  Laurent Mercadier authored 5 years ago
  
  Bam See merge request SCS/ToolBox!72
  25ec1920
- Improved autoFindFastAdcPeaks() · 1bd27bbe
  Laurent Mercadier authored 5 years ago
  
  1bd27bbe
- Rename BAM array dimnension to match XGM, TIM... · 253d56d8
  Laurent Mercadier authored 5 years ago
  
  253d56d8
- Detailed docstring in sortBAMdata() · 91499d8d
  Laurent Mercadier authored 5 years ago
  
  91499d8d
- Adds function sortBAMdata() to extract BAM values according to the bunchPatternTable · 18722256
  Laurent Mercadier authored 5 years ago
  
  18722256
Feb 28, 2020
- Merge branch 'fadc_peak_value' into 'master' · e0d3745a
  Laurent Mercadier authored 5 years ago
  
  Adds option to select peak (max) value instead of integrating over peak of fast ADC See merge request SCS/ToolBox!71
  e0d3745a
- Adds option to select peak (max) value instead of integrating over peak of fast ADC · 04337cc1
  Laurent Mercadier authored 5 years ago
  
  04337cc1
Feb 27, 2020
- Merge branch 'gpc_delay_stage' into 'master' · 686e2947
  Laurent Mercadier authored 5 years ago
  
  Adds GPC EOS delay line See merge request SCS/ToolBox!70
  686e2947
- Adds GPC EOS delay line · 14d43d10
  Laurent Mercadier authored 5 years ago
  
  14d43d10
Feb 26, 2020
- Merge branch 'fluorescence' into 'master' · 62640598
  Alexander Yaroslavtsev authored 5 years ago
  
  Adds absorption calculation from fluorescence See merge request SCS/ToolBox!69
  62640598
- Adds absorption calculation from fluorescence · bda46e1b
  Loïc Le Guyader authored 5 years ago and Alexander Yaroslavtsev committed 5 years ago
  
  bda46e1b
- Adds bunch arrival monitors mnemonics · 43dc7eb4
  Laurent Mercadier authored 5 years ago
  
  43dc7eb4
Feb 25, 2020
- Merge branch 'xfel_kernel' into 'master' · 293916da
  Loïc Le Guyader authored 5 years ago
  
  Xfel kernel See merge request SCS/ToolBox!68
  293916da
- Xfel kernel · 12b2aa63
  Loïc Le Guyader authored 5 years ago
  
  12b2aa63
Feb 19, 2020
- Merge branch 'autoFastADC' into 'master' · 523cdd3e
  Laurent Mercadier authored 5 years ago
  
  Auto fast adc See merge request SCS/ToolBox!67
  523cdd3e
- Find trace using threshold value instead of pulse pattern · 88bd7df7
  Laurent Mercadier authored 5 years ago
  
  88bd7df7
Nov 19, 2019
- Merge branch 'bunch_pattern' into 'master' · a429b230
  Laurent Mercadier authored 5 years ago
  
  Bunch pattern See merge request SCS/ToolBox!66
  a429b230
- Merge branch 'master' into 'bunch_pattern' · d68fe2a6
  Laurent Mercadier authored 5 years ago
  
  # Conflicts: # __init__.py
  d68fe2a6
Nov 18, 2019
- Merge branch 'auto_fast_adc' into 'master' · e6135f5f
  Laurent Mercadier authored 5 years ago
  
  Auto fast adc See merge request !65
  e6135f5f
- Adds axisRange parameter, returns fitting function when full=True · 20c42486
  Laurent Mercadier authored 5 years ago
  
  20c42486
- Adds function to automatically find ADC peaks · 1f092c28
  Laurent Mercadier authored 5 years ago
  
  1f092c28
- Merge branch 'DPS_imager' into 'master' · 6b0511d3
  Laurent Mercadier authored 5 years ago
  
  Adds DPS2 Imager2 mnemonics See merge request !64
  6b0511d3
- Adds DPS2 Imager2 mnemonics · 6814e080
  Laurent Mercadier authored 5 years ago
  
  6814e080
Nov 17, 2019
- Merge branch 'tim_warning' into 'master' · 438a5a4d
  Laurent Mercadier authored 5 years ago
  
  Fix warning condition for TIM apd See merge request SCS/ToolBox!63
  438a5a4d
- Fix warning condition for TIM apd · d001acf0
  Laurent Mercadier authored 5 years ago
  
  d001acf0
- moved bunch pattern functions to new file · cbff6058
  Laurent Mercadier authored 5 years ago
  
  cbff6058
- Generalized extractSaseBunchPattern() and renamed it to extractBunchPattern() · dbb705b5
  Laurent Mercadier authored 5 years ago
  
  dbb705b5
Nov 16, 2019
- Merge branch 'attributes' into 'master' · 0c25255e
  Laurent Mercadier authored 5 years ago
  
  improved attributes copy in concatenateRuns() See merge request SCS/ToolBox!62
  0c25255e