Commits · 72b2ae360c0b05b3b2694412a5937796e52a0e19 · mantidproject / mantid

This project is mirrored from https://github.com/mantidproject/mantid.git. Pull mirroring updated Jan 28, 2023.

10 Jul, 2014 4 commits
- Merge remote-tracking branch 'origin/master' into feature/9209_can_file_in_diffraction · 72b2ae36
  Samuel Jackson authored Jul 10, 2014
```
Refs #9209

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
```
  72b2ae36
- Refs #9209 Fix plotting for can subtraction. · 14b57b3b
  Samuel Jackson authored Jul 10, 2014
  
  14b57b3b
- Merge branch 'feature/9209_can_file_in_diffraction' of... · 402c7508
  Samuel Jackson authored Jul 10, 2014
```
Merge branch 'feature/9209_can_file_in_diffraction' of github.com:mantidproject/mantid into feature/9209_can_file_in_diffraction
```
  402c7508
- Refs #9209 Correct units. · d7bb69fe
  Samuel Jackson authored Jul 10, 2014
  
  d7bb69fe
08 Jul, 2014 5 commits
- Refs #9209 Update parameter files with naming scheme. · efbf4f4d
  Samuel Jackson authored Jul 08, 2014
  
  efbf4f4d
- Refs #9209 Rename workspace in reduction to fit format expected. · f4eba034
  Samuel Jackson authored Jul 08, 2014
  
  f4eba034
- Merge remote-tracking branch 'origin/feature/9810_saveascii_spectrum_id' · b40b467b
  Samuel Jackson authored Jul 08, 2014
  
  b40b467b
- Merge remote-tracking branch 'origin/bugfix/9720_apply_corrections_fails_with_older_files' · 28aa2f03
  Peter Parker authored Jul 08, 2014
  
  28aa2f03
- Merge remote-tracking branch 'origin/feature/9684_eqsans_transmission' · 1f0434a5
  Nick Draper authored Jul 08, 2014
  
  1f0434a5
07 Jul, 2014 16 commits
- Merge remote-tracking branch 'origin/bugfix/9830_diagnostics_error' · 8c4bff66
  Michael Reuter authored Jul 07, 2014
  
  8c4bff66
- Refs #9209 Add support for diffraction runs to Apply Corrections. · 8e0ce368
  Samuel Jackson authored Jul 07, 2014
```
This only adds support using a can file with it. Calculate corrections
can be supported but will take more time than we have for release.
```
  8e0ce368
- Revert "Refs #9209 Add post processing step to diffraction." · b3a52c10
  Samuel Jackson authored Jul 07, 2014
```
This reverts commit a7a42862.
```
  b3a52c10
- Revert "Refs #9209 Modify interface to support can file." · 95c4d764
  Samuel Jackson authored Jul 07, 2014
```
This reverts commit 00b2e3c0.
```
  95c4d764
- Merge remote-tracking branch 'origin/feature/9805_bilby_eventdata' · 3d7e88d7
  Nick Draper authored Jul 07, 2014
  
  3d7e88d7
- Refs #9720 Fix typo. · efda758b
  Samuel Jackson authored Jul 07, 2014
  
  efda758b
- Refs #9720 Restructure GUI code to prevent it accidentally quitting. · 5c70b758
  Samuel Jackson authored Jul 07, 2014
  
  5c70b758
- Merge remote-tracking branch 'origin/bugfix/9808_failing_unittests_gcc48' · a9a1a8b8
  Michael Reuter authored Jul 07, 2014
  
  a9a1a8b8
- Merge remote-tracking branch 'origin/feature/9464_scale_pd' · 7ad7f124
  Zhou, Wenduo authored Jul 07, 2014
  
  7ad7f124
- Merge remote-tracking branch 'origin/feature/9799_SphinxDocs' · dfaec705
  Roman Tolchenov authored Jul 07, 2014
  
  dfaec705
- Refs #9830 Move logging statement to more sensible location. · 3cdb28e7
  Samuel Jackson authored Jul 07, 2014
  
  3cdb28e7
- refs #977 Par and Phx descriptions reformatted as a tables. · d7479725
  Alex Buts authored Jul 07, 2014
  
  d7479725
- refs #9799 More comments to the code, which has not been executed. · 73add231
  Alex Buts authored Jul 07, 2014
```
+ minor changes to convertToMD
```
  73add231
- refs #9799 Fixing links in ConvertToMD · 7b9811de
  Alex Buts authored Jul 07, 2014
  
  7b9811de
- refs #9799 Trying to fix warning 8 · 0a29ad9b
  Alex Buts authored Jul 07, 2014
  
  0a29ad9b
- Merge remote-tracking branch 'origin/feature/9824_fix_create_transmission_workspace' · 43413b83
  Peter Parker authored Jul 07, 2014
  
  43413b83
06 Jul, 2014 4 commits
- refs #9799 removed references to MDTransfFactory page from properties · 202415f4
  Alex Buts authored Jul 06, 2014
  
  202415f4
- refs #9799 resolving conflicts with master · 4556301a
  Alex Buts authored Jul 06, 2014
```
Merge branch 'master' into feature/9799_SphinxDocs

Conflicts:
	Code/Mantid/docs/source/algorithms/GroupDetectors-v2.rst
	Code/Mantid/docs/source/algorithms/LoadDetectorInfo-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/SofQW2-v1.rst
	Code/Mantid/docs/source/algorithms/SofQW3-v1.rst
```
  4556301a
- refs #9799 syntax error in properties · 365b3228
  Alex Buts authored Jul 06, 2014
  
  365b3228
- refs #9799 Cross references fixed · d5c23986
  Alex Buts authored Jul 06, 2014
  
  d5c23986
04 Jul, 2014 11 commits
- refs #9799 CentroidPeaksMD and the disabling test in FindPeaksMD · 7de3b4b7
  Alex Buts authored Jul 04, 2014
  
  7de3b4b7
- refs #9799 running FindPeaksMD-v1.rst · 77f6d8af
  Alex Buts authored Jul 04, 2014
```
it is long but let it run for now.
```
  77f6d8af
- refs #9824. Allow single point detector. · 860b3371
  Owen Arnold authored Jul 04, 2014
  
  860b3371
- remove cppcheck warning. re #9805 · 656dfb27
  Anders Markvardsen authored Jul 04, 2014
  
  656dfb27
- Merge remote-tracking branch 'origin/feature/9569_icat_for_refl' · 904d1153
  Roman Tolchenov authored Jul 04, 2014
  
  904d1153
- Retrieve result before deleting gsl structure. · e287a34f
  Gigg, Martyn Anthony authored Jul 04, 2014
```
Fixes an error found by valgrind.
Refs #9808
```
  e287a34f
- Initialize variables in FindPeaks before passing by reference. · 5660b873
  Gigg, Martyn Anthony authored Jul 04, 2014
```
Fixes the GetDetOffsetsMultiPeaks unit test on Fedora 20, which was
discovered using valgrind and the --undef-value-errors=yes option.
Refs #9808
```
  5660b873
- Merge remote-tracking branch 'origin/feature/8909_tiled_graph_displays' · b8775339
  Samuel Jackson authored Jul 04, 2014
  
  b8775339
- Merge remote-tracking branch 'origin/feature/9813_table_ws_transpose_crash' · 17a50b1b
  Karl Palmen authored Jul 04, 2014
  
  17a50b1b
- Re #8909. Fix GCC warning · 8c0cdfe6
  Roman Tolchenov authored Jul 04, 2014
  
  8c0cdfe6
- refs #9799 Integrate peaks V1 and V2 · 34adc7a2
  Alex Buts authored Jul 04, 2014
  
  34adc7a2