Ticket #11209 (closed: fixed)
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: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: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: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
comment:11 Changed 6 years ago by Martyn Gigg
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
comment:16 Changed 6 years ago by Martyn Gigg
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
comment:21 Changed 6 years ago by Martyn Gigg
- Status changed from inprogress to verify
- Resolution set to fixed
This is being verified as pull request #446.
comment:22 Changed 6 years ago by Martyn Gigg
Fix the MergeMDFiles test.
It looks like the it got broken by a bad merge-conflict resolution. Refs #11209
Changeset: f72a6c0ed9920d120890caf36dda4f333d902d0b
comment:23 Changed 6 years ago by Martyn Gigg
comment:24 Changed 6 years ago by Martyn Gigg
Move IntegrateEllipsoids to MDAlgorithms.
Refs #11209
Changeset: 8c4d0826de395e2cd2aa78d72454ebfa94417dcb
comment:25 Changed 6 years ago by Martyn Gigg
comment:26 Changed 6 years ago by Federico Montesino Pouzols
Jenkins, retest this please
comment:27 Changed 6 years ago by Martyn Gigg
Merge branch 'master' into 11209_merge_mdevents_and_dataobjects
Conflicts:
Code/Mantid/Framework/MDAlgorithms/src/FitMD.cpp Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp
Refs #11209
Changeset: 96e28cba3b08cac297b767657fdcee751e731210
comment:28 Changed 6 years ago by Martyn Gigg
Jenkins, retest this please
comment:29 Changed 6 years ago by Martyn Gigg
comment:30 Changed 6 years ago by Martyn Gigg
Fix problems from bad merge-conflict resolution
Refs #11209
Changeset: 9d5468777e901dddbf979fa46dcea913530e3cdc
comment:31 Changed 6 years ago by Martyn Gigg
Jenkins, retest this please
comment:32 Changed 6 years ago by Martyn Gigg
Jenkins, retest this please
comment:33 Changed 6 years ago by Martyn Gigg
Jenkins, retest this please
comment:34 Changed 6 years ago by Owen Arnold
- Status changed from verify to verifying
- Tester set to Owen Arnold
comment:35 Changed 6 years ago by Owen Arnold
- Status changed from verifying to closed
Merge pull request #446 from mantidproject/11209_merge_mdevents_and_dataobjects
Remove MDEvents library
Full changeset: 0ddd9bee9f16a93fc0eab1cdcc650c134bbbd247
comment:36 Changed 6 years ago by Owen Arnold
The current structure looks logical in the expanded packages, updates seem to have been done carefully. All tests passing.
comment:37 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 12048
Do the initial move of non-algorithm related classes to DataObjects
Currently nothing will compile. Refs #11209
Changeset: 77f2804ca733105a0d29692dc92e0c0592268d2b