Merge remote-tracking branch 'origin/feature/10383_fits_workspace' (cb75525d) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

cb75525d

Commit cb75525d authored 10 years ago by Raquel Alvarez Banos

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/10383_fits_workspace'

parents 33e0b7a8 0bf06199

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h 3 additions, 3 deletions

Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
Code/Mantid/Framework/API/src/MatrixWorkspace.cpp 10 additions, 7 deletions

Code/Mantid/Framework/API/src/MatrixWorkspace.cpp
Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h 38 additions, 9 deletions

.../Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h 25 additions, 18 deletions

...ramework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp 402 additions, 250 deletions

Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp
Code/Mantid/Framework/DataHandling/src/SaveNXTomo.cpp 261 additions, 197 deletions

Code/Mantid/Framework/DataHandling/src/SaveNXTomo.cpp
Code/Mantid/Framework/DataHandling/test/LoadFITSTest.h 11 additions, 14 deletions

Code/Mantid/Framework/DataHandling/test/LoadFITSTest.h
Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h 7 additions, 1 deletion

...Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h
Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp 86 additions, 0 deletions

Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp

with 843 additions and 499 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment