Commits · e66e8e00aa66dce5204558d281f1004bf8f69f4f · Thomas Kluyver / ToolBox

Jun 01, 2019
- Merge branch 'FastADC' into 'master' · e66e8e00
  Loïc Le Guyader authored 5 years ago
  
  Fast adc See merge request SCS/ToolBox!28
  e66e8e00
May 31, 2019
- Adds 'run' attribute in matchXgmTimPulseId() and mergeFastAdcPeaks() · 26e783a7
  Laurent Mercadier authored 5 years ago
  
  26e783a7
May 29, 2019
- Adds Fast ADC peak integration functions in xgm.py · 7dc0b834
  Laurent Mercadier authored 5 years ago
  
  7dc0b834
May 26, 2019
- Adds FastADC, AFS delay line and phase shifter · 4301ae4f
  Laurent Mercadier authored 5 years ago
  
  4301ae4f
May 17, 2019
- Merge branch 'navitar' · 3c20bb31
  Mercadier authored 5 years ago
  
  3c20bb31
- Adds navitar camera and sa1 and sa3 XGM separated bunches · 17cdbaaa
  Loïc Le Guyader authored 5 years ago
  
  17cdbaaa
May 02, 2019
- Merge branch 'XASfix' into 'master' · 8a736e9b
  Loïc Le Guyader authored 5 years ago
  
  Fix the calculation of XAS spectra with bins number or bins width See merge request SCS/ToolBox!26
  8a736e9b
- Fix the calculation of XAS spectra with bins number or bins width · 0ab7193e
  Loïc Le Guyader authored 5 years ago
  
  0ab7193e
- Merge branch 'noPPinfo' into 'master' · 5ef09113
  Loïc Le Guyader authored 5 years ago
  
  No pulse pattern info case See merge request !24
  5ef09113
May 01, 2019
- raise TypeError if npulses missing when no pulse pattern info is available · aa19e723
  Laurent Mercadier authored 5 years ago
  
  aa19e723
Apr 30, 2019
- Adds arguments in matchXgmTimPulseId() for no bunch pattern info case · 0ae0897c
  Laurent Mercadier authored 5 years ago
  
  0ae0897c
- Merge branch 'xas' into 'master' · 838bcd6e
  Loïc Le Guyader authored 5 years ago
  
  Adds the XAS and XMCD absorption spectra calculation See merge request SCS/ToolBox!25
  838bcd6e
- Modified getTIMapd() for case of missing pattern info · 31772d3e
  Laurent Mercadier authored 5 years ago
  
  31772d3e
- Modified selectXGMinSASE() for missing bunch pattern info case · 50dd6b88
  Laurent Mercadier authored 5 years ago
  
  50dd6b88
- Adds the XAS and XMCD absorption spectra calculation · 99da2fe8
  Loïc Le Guyader authored 5 years ago
  
  99da2fe8
- Merge branch 'noSA3fix' into 'master' · 9c793e9e
  Laurent Mercadier authored 5 years ago
  
  Fix crash of matchXgmTimPulseId when SA3_XGM was not loaded See merge request SCS/ToolBox!23
  9c793e9e
- Fix crash of matchXgmTimPulseId when SA3_XGM was not loaded · 468d9f43
  Loïc Le Guyader authored 5 years ago
  
  468d9f43
Apr 29, 2019
- Merge branch 'rep_rate' into 'master' · 5e917e26
  Laurent Mercadier authored 5 years ago
  
  Adds function repRate() See merge request SCS/ToolBox!22
  5e917e26
- Adds function repRate() · d1f7d1cf
  Mercadier authored 5 years ago
  
  d1f7d1cf
- Merge branch 'tim_xgm_match' into 'master' · faa99930
  Laurent Mercadier authored 5 years ago
  
  drops initial MCPapd and MCPraw in matchXgmTimPulseId() See merge request SCS/ToolBox!21
  faa99930
- drops initial MCPapd and MCPraw in matchXgmTimPulseId() · 1ea5ad77
  Mercadier authored 5 years ago
  
  1ea5ad77
- Merge branch 'tim_checkApd' into 'master' · 44693057
  Laurent Mercadier authored 5 years ago
  
  Fixed bug and improved checkTimApdWindow() See merge request SCS/ToolBox!20
  44693057
Apr 28, 2019
- Fixed bug and improved checkTimApdWindow() · 5d99e1e3
  Laurent Mercadier authored 5 years ago
  
  5d99e1e3
Apr 27, 2019
- Merge branch 'xgm_tim' into 'master' · 73db4b60
  Laurent Mercadier authored 5 years ago
  
  merge 'xgm_tim' into 'master' See merge request SCS/ToolBox!17
  73db4b60
- gave names to XGM arrays in matchXgmTimPulseId() · 5b0d587e
  Laurent Mercadier authored 5 years ago
  
  5b0d587e
- gave names to XGM arrays in matchXgmTimPulseId() · d34e9782
  Laurent Mercadier authored 5 years ago
  
  d34e9782
- Merge branch 'xgm_tim' into 'master' · d1929900
  Laurent Mercadier authored 5 years ago
  
  Xgm tim See merge request SCS/ToolBox!15
  d1929900
- fixed typo · e3128bef
  Laurent Mercadier authored 5 years ago
  
  e3128bef
- added function to match XGM and TIM pulse Id · aa264a14
  Laurent Mercadier authored 5 years ago
  
  aa264a14
- fix typo in MCP[2,3,4]raw keys · fcd1612e
  Martin Teichmann authored 5 years ago
  
  fcd1612e
Apr 15, 2019
- Merge branch 'FastCCD_calibration' into 'master' · 86388633
  Loïc Le Guyader authored 5 years ago
  
  Fast ccd calibration See merge request SCS/ToolBox!14
  86388633
- Fix typo · 1b6610d3
  Loïc Le Guyader authored 5 years ago
  
  1b6610d3
Apr 12, 2019
- Update calibration to one file and new fields for mask, gain, and common mode correction · 0434e4de
  Loïc Le Guyader authored 5 years ago
  
  0434e4de
- Adds possibility to select multiple ROIs from a source · a4f2f31c
  Loïc Le Guyader authored 5 years ago
  
  a4f2f31c
- Fix typo · b380220c
  Loïc Le Guyader authored 5 years ago
  
  b380220c
- Adds subset option on load to selectively load some trains with by_index · 4b1dc254
  Loïc Le Guyader authored 5 years ago
  
  4b1dc254
- Adds FastCCD charge split classified and multiplicity patterns keys · 8abfd8b9
  Loïc Le Guyader authored 5 years ago
  
  8abfd8b9
- Gives the option to define a different data path formating string · 5b1ae75b
  Loïc Le Guyader authored 5 years ago
  
  5b1ae75b
Mar 25, 2019
- Merge branch 'tim_plot_fix' into 'master' · e8086845
  Laurent Mercadier authored 5 years ago
  
  Changed rasterize parameter to rasterized See merge request SCS/ToolBox!13
  e8086845
- Merge branch 'master' into 'tim_plot_fix' · 388be6fd
  Laurent Mercadier authored 5 years ago
  
  # Conflicts: # xgm.py
  388be6fd