Commits · 293916dabc02668b6f8c1780a2f4c3cb4431bba2 · Thomas Kluyver / ToolBox

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
- improved attributes copy in concatenateRuns() · 96e3a214
  Laurent Mercadier authored 5 years ago
  
  96e3a214
Nov 15, 2019
- Merge branch 'FastCCD-parallel-backend' into 'master' · 500833ea
  Loïc Le Guyader authored 5 years ago
  
  Using joblib instead of multiprocessing See merge request SCS/ToolBox!61
  500833ea
- Using joblib instead of multiprocessing · 3a2d9c7f
  Loïc Le Guyader authored 5 years ago
  
  3a2d9c7f
- Merge branch 'xas_plot_title' into 'master' · 4cb4f415
  Laurent Mercadier authored 5 years ago
  
  Fixes bug in XAS plot title See merge request !60
  4cb4f415
- Fixes bug in XAS plot title · 8b012a25
  Laurent Mercadier authored 5 years ago
  
  8b012a25
Nov 14, 2019
- Merge branch 'ai-fastccd' into 'master' · d452a318
  Loïc Le Guyader authored 5 years ago
  
  Ai fastccd See merge request SCS/ToolBox!59
  d452a318
- Ai fastccd · 84f29ac7
  Loïc Le Guyader authored 5 years ago
  
  84f29ac7
- Merge branch 'FastCCD-ai' into 'master' · 53f9f852
  Loïc Le Guyader authored 5 years ago
  
  Fast ccd ai See merge request SCS/ToolBox!58
  53f9f852
- Fast ccd ai · 1b7d88d9
  Loïc Le Guyader authored 5 years ago
  
  1b7d88d9
Nov 09, 2019
- Copied relevant masks, no need to load euxfel_bunch_pattern package · ca508756
  Laurent Mercadier authored 5 years ago
  
  ca508756
- Adds option in load() to generate sase bunch patterns from raw bunch pattern table · e03ba9c7
  Laurent Mercadier authored 5 years ago
  
  e03ba9c7
Nov 07, 2019
- Merge branch 'Fixdelay-in-DSSC1module' into 'master' · 45079747
  Loïc Le Guyader authored 5 years ago
  
  Fix delay claculation in DSSC1module.py See merge request SCS/ToolBox!57
  45079747
- Fix delay claculation in DSSC1module.py · 2ee31773
  Loïc Le Guyader authored 5 years ago
  
  2ee31773
- Merge branch 'camera_mnemonics' into 'master' · e8ff7017
  Laurent Mercadier authored 5 years ago
  
  Adds mnemonics for Vertical FDM and ILH 8CAM1 See merge request SCS/ToolBox!56
  e8ff7017
- Adds mnemonics for Vertical FDM and ILH 8CAM1 · b174de8b
  Laurent Mercadier authored 5 years ago
  
  b174de8b
- Fix XAS for data with NaN · 05e006a0
  Loïc Le Guyader authored 5 years ago
  
  05e006a0
- discard DSSC1module saturated shots · c7fb9eed
  Loïc Le Guyader authored 5 years ago
  
  c7fb9eed
Nov 03, 2019
- Merge branch 'DSSC1module' into 'master' · c8d0095a
  Loïc Le Guyader authored 5 years ago
  
  Dssc1module See merge request SCS/ToolBox!54
  c8d0095a
- Dssc1module · 30f19660
  Loïc Le Guyader authored 5 years ago
  
  30f19660
Oct 30, 2019
- Merge branch 'tim' into 'master' · 58ea0a39
  Laurent Mercadier authored 5 years ago
  
  Tim See merge request SCS/ToolBox!53
  58ea0a39
Oct 29, 2019
- Prevent temporary dimension to clash with existing dimension · 76307127
  Loïc Le Guyader authored 5 years ago
  
  76307127
- Adds documentation, simplifies selectSASEfromXGM() · 660045ed
  Laurent Mercadier authored 5 years ago
  
  660045ed
Oct 28, 2019
- Adds warning if apd parameters were wrong during acquisition · b8e48021
  Laurent Mercadier authored 5 years ago
  
  b8e48021
- Fixes some bugs · 4c1cf2df
  Laurent Mercadier authored 5 years ago
  
  4c1cf2df