Commits · e7679aed457411f3702f2c65cb963c874a10722c · kmap / xsocs

11 Jul, 2018 4 commits
- Merge branch 'master' into 'requirements' · e7679aed
  Thomas Vincent authored Jul 11, 2018
```
# Conflicts:
#   setup.py
```
  e7679aed
- Merge branch 'spec-calib' into 'master' · aebe559b
  Carsten Richter authored Jul 11, 2018
```
Read calibration and energy from spec

Closes #31 and #35

See merge request !65
```
  aebe559b
- Merge branch 'project' into 'master' · 44d4d59a
  Carsten Richter authored Jul 11, 2018
```
Update project files

Closes #22 and #19

See merge request !62
```
  44d4d59a
- Merge branch 'force-pyqt5' into 'master' · 07b03582
  Carsten Richter authored Jul 11, 2018
```
Make sure to use PyQt5

Closes #37

See merge request !61
```
  07b03582
10 Jul, 2018 3 commits
- Change missleading names of attributes in AcqParamsWidget · b646f86a
  Thomas Vincent authored Jul 10, 2018
  
  b646f86a
- load calibration and energy from spec if available · ca118cb4
  Thomas Vincent authored Jul 10, 2018
  
  ca118cb4
- docstring and code clean-up · cfcee93b
  Thomas Vincent authored Jul 10, 2018
  
  cfcee93b
06 Jul, 2018 10 commits
- init logging from the main · ff4c2004
  Thomas Vincent authored Jul 06, 2018
  
  ff4c2004
- sync __init__.py with silx · 6777983f
  Thomas Vincent authored Jul 06, 2018
  
  6777983f
- sync version.py with that of silx · 2f8734f3
  Thomas Vincent authored Jul 06, 2018
  
  2f8734f3
- requires silx 0.8.0 · 08886ccf
  Thomas Vincent authored Jul 06, 2018
  
  08886ccf
- update requirements · 67ac568a
  Thomas Vincent authored Jul 06, 2018
  
  67ac568a
- Force usage of PyQt5 in XSocs · e3b56e0b
  Thomas Vincent authored Jul 06, 2018
  
  e3b56e0b
- Add cython to required build packages · 99b797d6
  Thomas Vincent authored Jul 06, 2018
  
  99b797d6
- Remove cytohnized files from the repository · cbafc886
  Thomas Vincent authored Jul 06, 2018
  
  cbafc886
- synchronize project files with latest version from silx · 3f8f316e
  Thomas Vincent authored Jul 06, 2018
  
  3f8f316e
- pinpoint sphinx version · d3107a5a
  Thomas Vincent authored Jul 06, 2018
  
  d3107a5a
22 Jun, 2018 2 commits
- Merge branch 'qspace-mask' into 'master' · c73a2254
  Carsten Richter authored Jun 22, 2018
```
Add a mask for the QSpace conversion

See merge request !59
```
  c73a2254
- Merge branch 'select-intensity' into 'master' · 4812e9f7
  Carsten Richter authored Jun 22, 2018
```
Select intensity

See merge request !58
```
  4812e9f7
11 May, 2018 1 commit
- Merge branch 'merge-scans' into 'master' · 2967b1a5
  Carsten Richter authored May 11, 2018
```
Merge scans

See merge request !54
```
  2967b1a5
07 May, 2018 6 commits
- property name consistency with setter · 525bfa4e
  Thomas Vincent authored May 07, 2018
  
  525bfa4e
- Add a test with a mask · 25f1f370
  Thomas Vincent authored May 07, 2018
  
  25f1f370
- Save used mask in h5 qspace file · a78f1f56
  Thomas Vincent authored May 07, 2018
  
  a78f1f56
- Fix typo · 94acd206
  Thomas Vincent authored May 07, 2018
  
  94acd206
- Control qspace conversion mask from the GUI · ef3ed44a
  Thomas Vincent authored May 07, 2018
  
  ef3ed44a
- Add possibility to use a mask when binning and median filter are · 8e678ca3
  Thomas Vincent authored May 07, 2018
```
disabled
```
  8e678ca3
04 May, 2018 5 commits
- Update docstring · 3d9e77a8
  Thomas Vincent authored May 04, 2018
  
  3d9e77a8
- Replace PlotTree by a QTreeWidget · 2ce211d6
  Thomas Vincent authored May 04, 2018
  
  2ce211d6
- Major rework of IntensityView · cea1e397
  Thomas Vincent authored May 04, 2018
```
- Replace IntensityTree with a QTableWidget
- Add option to select sorting positioner
- Keep previous functionalities
```
  cea1e397
- Add a way to get all positioners · bd137dbb
  Thomas Vincent authored May 04, 2018
  
  bd137dbb
- Fix issue of access to hdf5 file (probably due to concurrent opening of · 0d7951f4
  Thomas Vincent authored May 04, 2018
```
file)
```
  0d7951f4
16 Apr, 2018 1 commit
- Merge branch 'ignore-pscan-consistency' into 'master' · 8e10bf09
  Carsten Richter authored Apr 16, 2018
```
Allow to merge with inconsistent pscan commands

See merge request !56
```
  8e10bf09
13 Apr, 2018 1 commit
- Allow to merge with inconsistent pscan commands · 4a20d96d
  Thomas Vincent authored Apr 13, 2018
  
  4a20d96d
06 Apr, 2018 5 commits
- Merge branch 'doc' into 'master' · 7958e7dc
  Carsten Richter authored Apr 06, 2018
```
Update doc

Closes #32

See merge request !55
```
  7958e7dc
- Update doc · 2cf809fa
  Thomas Vincent authored Apr 06, 2018
  
  2cf809fa
- Remove doc build warnings · 55db940d
  Thomas Vincent authored Apr 06, 2018
  
  55db940d
- Update sphinx doc (sync with silx) · 451c44c6
  Thomas Vincent authored Apr 06, 2018
  
  451c44c6
- Simplify README to point to doc (avoid duplicates) · 316651aa
  Thomas Vincent authored Apr 06, 2018
  
  316651aa
05 Apr, 2018 2 commits
- Merge branch 'normalization' into 'master' · fb409f80
  Carsten Richter authored Apr 05, 2018
```
Add optional normalization to IntensityView and QSpace conversion

Closes #10

See merge request !53
```
  fb409f80
- Add a small script application to merge .h5 files into a new master · 16a0a24c
  Thomas Vincent authored Apr 05, 2018
  
  16a0a24c