Context Navigation

Ticket #11209 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Merge MDEvents & DataObjects libraries

Reported by:	Martyn Gigg	Owned by:	Martyn Gigg
Priority:	major	Milestone:	Release 3.4
Component:	Python	Keywords:
Cc:		Blocked By:
Blocking:	#9807	Tester:	Owen Arnold

Description

They were created separately due to the fact that Vates was an optional component within Mantid. This is no longer the case and they should be considered a single librariy of the data storage classes for Mantid.

Change History

comment:1 Changed 6 years ago by Martyn Gigg

Status changed from new to inprogress

Do the initial move of non-algorithm related classes to DataObjects

Currently nothing will compile. Refs #11209

Changeset: 77f2804ca733105a0d29692dc92e0c0592268d2b

comment:2 Changed 6 years ago by Martyn Gigg

DataObjects library now compiles

Refs #11209

Changeset: f0e315200859b8862b332865b3d5ca20059f894d

comment:3 Changed 6 years ago by Martyn Gigg

DataObjectsTest now compiles.

They don't run yet as they are dependent on some algorithms being available. Refs #11209

Changeset: 93b83c3b5b14f1fdd588ee7c3ce559172c64d9b9

comment:4 Changed 6 years ago by Martyn Gigg

Add a class that is able to produce faked MD data.

Refs #11209

Changeset: 0fd1c3dc955c6b17d394aad905e5424dea005977

comment:5 Changed 6 years ago by Martyn Gigg

Move the algorithms from MDEvents to MDAlgorithms.

Refs #11209

Changeset: b25197527eb9ff2fc3c62cb4980029172ee61ab7

comment:6 Changed 6 years ago by Martyn Gigg

Check point namespace move.

Refs #11209

Changeset: c065e8385082c2d1b1d422f60d043d28790e680a

comment:7 Changed 6 years ago by Martyn Gigg

Further porting from MDEvents to MDAlgorithms.

There is still a single unit test failure. Refs #11209

Changeset: 4772202b34ace313e34b2f0c951cc2281bd9aa9d

comment:8 Changed 6 years ago by Martyn Gigg

Fix remaining unit test.

Refs #11209

Changeset: 8a584a19ec53a4712143077e116dd1aae1bcf9f4

comment:9 Changed 6 years ago by Martyn Gigg

Move remaining non-code parts to DataObjects

Refs #11209

Changeset: 1cc84b824b268414f72c71d48d17acdc1c22c0b9

comment:10 Changed 6 years ago by Martyn Gigg

Add back an orphaned test.

Refs #11209

Changeset: 1cac353863d8a618968fea61d29332d725595b28

comment:11 Changed 6 years ago by Martyn Gigg

Remove MDEvents library

Refs #11209

Changeset: 9844342883368dd9b5633225b0e4625f0add4802

comment:12 Changed 6 years ago by Martyn Gigg

Move ConvertMDHistoToMatrixWorkspace to MDAlgorithms

It removes MDAlgorithms as a dependency from Algorithms. Refs #11209

Changeset: bdb3afcfba26e412ea6eaf43473604bb17933cb2

comment:13 Changed 6 years ago by Martyn Gigg

Remove MDEvents usage from Algorithms.

Refs #11209

Changeset: 9f2bbc8da5b7346373f5c0da96320499fcd6d616

comment:14 Changed 6 years ago by Martyn Gigg

Crystal compiles and runs without MDEvents.

Refs #11209

Changeset: 5bc31d48875438c43d6706b63f3f4fd1ca66ee08

comment:15 Changed 6 years ago by Martyn Gigg

SINQ library compiles

Refs #11209

Changeset: 98fabc6c84416112c01831a82fbedd219c1a520c

comment:16 Changed 6 years ago by Martyn Gigg

Python test helpers compile.

Refs #11209

Changeset: 0a09505fef31295793869369cf359e41613b8ad6

comment:17 Changed 6 years ago by Martyn Gigg

Vates now compiles against DataObjects

Refs #11209

Changeset: 8d0796a39c44c5227a617687dbf9fad795c48c04

comment:18 Changed 6 years ago by Martyn Gigg

Add back FrameworkManager calls to test constructors

Unfortunately these are required as the algorithms are in the wrong package. Refs #11209

Changeset: 16e962b4b81135cec33cf1a6af616711faa0b509

comment:19 Changed 6 years ago by Martyn Gigg

Merge branch 'master' into 11209_merge_mdevents_and_dataobjects

Conflicts:

Code/Mantid/Framework/Algorithms/CMakeLists.txt Code/Mantid/Framework/Algorithms/test/CreateSampleWorkspaceTest.h Code/Mantid/Framework/DataObjects/src/MDBoxFlatTree.cpp Code/Mantid/Framework/DataObjects/src/MDEventWorkspace.cpp Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h Code/Mantid/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h Code/Mantid/Framework/MDAlgorithms/test/Integrate3DEventsTest.h Code/Mantid/Framework/MDAlgorithms/test/LoadMDTest.h Code/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h Code/Mantid/Framework/MDEvents/CMakeLists.txt Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h Code/Mantid/Framework/TestHelpers/src/MDEventsTestHelper.cpp Code/Mantid/Vates/VatesAPI/test/MDEWRebinningPresenterTest.h

Refs #11209

Changeset: dcd1f75b45b9107bf70e0306949ece414b633b6d

comment:20 Changed 6 years ago by Martyn Gigg

Merge branch 'master' into 11209_merge_mdevents_and_dataobjects

Conflicts:

Code/Mantid/Framework/Algorithms/CMakeLists.txt Code/Mantid/Framework/Algorithms/test/CreateSampleWorkspaceTest.h Code/Mantid/Framework/DataObjects/src/MDBoxFlatTree.cpp Code/Mantid/Framework/DataObjects/src/MDEventWorkspace.cpp Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h Code/Mantid/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h Code/Mantid/Framework/MDAlgorithms/test/Integrate3DEventsTest.h Code/Mantid/Framework/MDAlgorithms/test/LoadMDTest.h Code/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h Code/Mantid/Framework/MDEvents/CMakeLists.txt Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h Code/Mantid/Framework/TestHelpers/src/MDEventsTestHelper.cpp Code/Mantid/Vates/VatesAPI/test/MDEWRebinningPresenterTest.h

Refs #11209

Changeset: ce422248aca1ebc029ccc0074bbe071637b08df3