Ticket #1637 (closed: fixed)

Opened 10 years ago

Last modified 5 years ago

MDWorkspace implementation

Reported by: Nick Draper Owned by: Alex Buts
Priority: critical Milestone: Iteration 27
Component: VATES Keywords:
Cc: Blocked By:
Blocking: Tester: Owen Arnold

Description


Change History

comment:1 Changed 10 years ago by Nick Draper

  • Priority changed from major to critical

comment:2 Changed 10 years ago by Alex Buts

(In [6185]) refs #1637 -- basic description of N-D workspace has been added to Documentation

comment:3 Changed 10 years ago by Alex Buts

(In [6195]) refs #1637 -- MDWorkspace description is almost completed

comment:4 Changed 10 years ago by Alex Buts

(In [6196]) refs #1637 -- cosmetic (minor) changes

comment:5 Changed 10 years ago by Alex Buts

(In [6199]) refs #1637 -- cosmetic (minor) changes

comment:6 Changed 10 years ago by Alex Buts

(In [6207]) refs #1637 -- changes to documentation: More detailed description of the InstrumentDescrition component has been added

comment:7 Changed 10 years ago by Alex Buts

(In [6208]) refs #1637 -- minor changes to documentation

comment:8 Changed 10 years ago by Alex Buts

(In [6209]) refs #1637 -- cosmetic (minor) changes to documentation

comment:9 Changed 10 years ago by Alex Buts

(In [6339]) refs #1637 -- semi-draft code for workspace. Have not been finished yet, so not in working order

comment:10 Changed 10 years ago by Alex Buts

(In [6349]) refs #1637 -- semi-draft code for workspace. Have not been finished yet, so not in working order

comment:11 Changed 10 years ago by Alex Buts

(In [6357]) refs #1637 -- semi-draft code for workspace committed to continue work on another machine

comment:12 Changed 10 years ago by Alex Buts

(In [6366]) refs #1637 -- read_dnd enabled but not completed; committed to continue work on another machine.

comment:13 Changed 10 years ago by Alex Buts

(In [6367]) refs #1637 -- read_dnd enabled but not completed; committed to continue work on another machine.

comment:14 Changed 10 years ago by Alex Buts

(In [6368]) refs #1637 -- read_dnd enabled but not completed; committed to continue work on another machine.

comment:15 Changed 10 years ago by Alex Buts

(In [6369]) refs #1637 -- read_dnd enabled but not completed; committed to continue work on another machine.

comment:16 Changed 10 years ago by Alex Buts

(In [6370]) refs #1637 -- read_dnd enabled but not completed; committed to continue work on another machine.

comment:17 Changed 10 years ago by Alex Buts

(In [6372]) refs #1637 -- semi-draft code for workspace: DND read works; committed to continue work on another machine

comment:18 Changed 10 years ago by Alex Buts

(In [6511]) refs #1637 -- semi-draft code for workspace: DND read works; committed to continue work on another machine

comment:19 Changed 10 years ago by Alex Buts

(In [6514]) refs #1637 -- DND class completed and works properly;

comment:20 Changed 10 years ago by Alex Buts

(In [6515]) refs #1637 -- sqw class renamed according to MANTID requests

comment:21 Changed 10 years ago by Alex Buts

(In [6516]) refs #1637 -- sqw class renamed according to MANTID requests

comment:22 Changed 10 years ago by Alex Buts

(In [6517]) refs #1637 -- parts of rebinning algorithm startd. ;

comment:23 Changed 10 years ago by Alex Buts

(In [6520]) refs #1637 -- prototype workspace committed as a separate branch

comment:24 Changed 10 years ago by Alex Buts

(In [6529]) refs #1637 -- MD-workspace code added to MANTID; Compiles but tests do not work yet.

comment:25 Changed 10 years ago by Russell Taylor

(In [6530]) Exclude MDDataObjects tests from being built as the library is not yet being built. At the same time enable the ICat tests as I assume the disabling of these was only supposed to be temporary. Re #1637.

comment:26 Changed 10 years ago by Alex Buts

(In [6550]) refs #1637 -- MD-workspace generally adopted to MANTID, e.g compiles with it but does not yet works; HDF libs have to be modified properly.

comment:27 Changed 10 years ago by Alex Buts

(In [6574]) refs #1637 -- szip source code has been added to third party and modified to work under VS-2010

comment:28 Changed 10 years ago by Alex Buts

(In [6578]) refs #1637 -- hdf5 source code has been updated to v 1.8.5.sp1 and rebuild to work under VS-2010

comment:29 Changed 10 years ago by Alex Buts

(In [6579]) refs #1637 -- hdf5 source code has been updated to v 1.8.5.sp1 and rebuild to work under VS-2010

comment:30 Changed 10 years ago by Alex Buts

(In [6580]) refs #1637 -- hdf5 source code has been updated to v 1.8.5.sp1 and rebuild to work under VS-2010

comment:31 Changed 10 years ago by Alex Buts

(In [6581]) refs #1637 -- hdf5 added debug and release dll

comment:32 Changed 10 years ago by Alex Buts

(In [6582]) refs #1637 -- hdf5 32-bit debug dll modified to understand what is missing

comment:33 Changed 10 years ago by Alex Buts

(In [6598]) refs #1637 - HDF-1.8.5 proper hdf5 32 bit debug and release versions have been build

comment:34 Changed 10 years ago by Alex Buts

(In [6602]) refs #1637 Added Vates folder to test data

comment:35 Changed 10 years ago by Alex Buts

(In [6603]) refs #1637 Matlab hdf-5 test dataset moved into Test\VATES folder

comment:36 Changed 10 years ago by Alex Buts

(In [6604]) refs #1637 crude workspace prototype is created and passes all tests; MDPixels part still left untouched

comment:37 Changed 10 years ago by Martyn Gigg

(In [6611]) Revert changes to HDF5 library until the NeXus API is rebuilt against the newer version of HDF. Re #1637

comment:38 Changed 10 years ago by Alex Buts

(In [6613]) refs #1637 -- hdf5 additional version of hdf5 libs for Hdf5-1.8.5 has been added to allow two versions of HDF coexist temporary

comment:39 Changed 10 years ago by Alex Buts

(In [6614]) refs #1637 -- hdf5 additional debug version of hdf5 libs for Hdf5-1.8.5 has been added

comment:40 Changed 10 years ago by Alex Buts

(In [6618]) refs #1637 MDGeometry lost before has been added

comment:41 Changed 10 years ago by Alex Buts

(In [6625]) refs #1637 Test for all existing parts of the MD workspace has been added and work in some way.

comment:42 Changed 10 years ago by Alex Buts

(In [6637]) refs #1637 missing part of the test has been added.

comment:43 Changed 10 years ago by Alex Buts

(In [6638]) refs #1637 -- 64 bit DLL for HDF-1.8.5 were added

comment:44 Changed 10 years ago by Alex Buts

(In [6639]) refs #1637 minor modifications to the projects attempting to build 64 bit version (not successful)

comment:45 Changed 10 years ago by Alex Buts

(In [6643]) refs #1637 IMDWorkspace has been added to API and Matrix Workspace inherits from it rather than from Workspace

comment:46 Changed 10 years ago by Alex Buts

(In [6652]) refs #1637 some works with MD-workspace tests. The tests compile but does not provide some files needed for base class (workspace) to run.

need further investigations.

Short description on how HDF5-1.8.5 was build under Win (very crude) added /README_MANTID.txt

comment:47 Changed 10 years ago by Alex Buts

(In [6670]) refs #1637 crude MD workspace works; memory management needed as not written yet

comment:48 Changed 10 years ago by Alex Buts

(In [6684]) refs #1637 minor modifications to tests and cosmetic changes to the reader -- it now allocates memory for buffer if finds a NULL pointer (bad design, will be modified later) Properties sufficient to run test from the VS2010 have been added and have to be copied in test/Debug or test/Release folders for tests to run properly

comment:49 Changed 10 years ago by Alex Buts

(In [6685]) refs #1637 modifications to folders structure to adhere to standard MANTID practice

comment:50 Changed 10 years ago by Alex Buts

(In [6686]) refs #1637 modifications to folders structure to adhere to standard MANTID practice

comment:51 Changed 10 years ago by Alex Buts

(In [6687]) refs #1637 modifications to folders structure to adhere to standard MANTID practice completed; all works

comment:52 Changed 10 years ago by Alex Buts

(In [6690]) refs #1637 test runner has been added

comment:53 Changed 10 years ago by Owen Arnold

(In [6694]) refs #1637 Fixed to link to MDDataObjects.lib

comment:54 Changed 10 years ago by Alex Buts

(In [6705]) refs #1637 tests modified to run path-independently (in theory) runTests.bat modified properly (Mantid.user.properties need to be adjusted to test folder)

comment:55 Changed 10 years ago by Alex Buts

(In [6722]) refs #1637 minor modifications to tests and project structure (filters work properly)

comment:56 Changed 10 years ago by Alex Buts

(In [6732]) refs #1637 minor modifications to tests and project structure (filters work properly)

comment:57 Changed 10 years ago by Alex Buts

(In [6734]) refs #1637 run tests run on PC again

comment:58 Changed 10 years ago by Alex Buts

(In [6742]) refs #1637 MDWorkspace.h class is added

comment:59 Changed 10 years ago by Alex Buts

(In [6814]) refs #1637 missing piece of the code has been added

comment:60 Changed 10 years ago by Russell Taylor

(In [6819]) Enable DECLARE_WORKSPACE macro use for MDWorkspace (or, more generally, for workspaces not in the DataObjects namespace. Workspaces now need to include their namespace when registering, as is already the case for Algorithms (this can be accomplished by calling DECLARE_WORKSPACE from within the namespace). Re #1637.

comment:61 Changed 10 years ago by Russell Taylor

(In [6820]) Fix test. Re #1637.

comment:62 Changed 10 years ago by Alex Buts

(In [6831]) refs #1637 slicing property code has been moved to API as this is a property after all

comment:63 Changed 10 years ago by Alex Buts

(In [6832]) refs #1637 slicing property header has been moved to API as this is a property after all

comment:64 Changed 10 years ago by Alex Buts

(In [6833]) refs #1637 slicing property code moved to code

comment:65 Changed 10 years ago by Alex Buts

(In [6834]) refs #1637 slicing property header moved to correct place

comment:66 Changed 10 years ago by Alex Buts

(In [6835]) refs #1637 -- slicing property.h deleted temporary as it not redy for build

comment:67 Changed 10 years ago by Alex Buts

(In [6836]) refs #1637 -- slicing property.cpp deleted temporary as it not redy for build

comment:68 Changed 10 years ago by Alex Buts

(In [6842]) refs #1637 -- slicing properties were returned to the repository until new version of the code which used in in API is ready

comment:69 Changed 10 years ago by Alex Buts

(In [6843]) refs #1637 -- slicing properties were returned to the repository until new version of the code which used in in API is ready

comment:70 Changed 10 years ago by Alex Buts

(In [7069]) refs #1637 point3D got accessors and mutators, MDDataObjects modified with parts of WorkspaceGeometry moved into other parts of MANTID tests for MD workspace are currently not functioning

comment:71 Changed 10 years ago by Alex Buts

(In [7087]) refs #1637 current state MD workspaces MD geometry has moved into Geometry

comment:72 Changed 10 years ago by Alex Buts

(In [7088]) refs #1637 Geometry together with MDGeometry tests successful but not completed and messy

comment:73 Changed 10 years ago by Alex Buts

(In [7097]) refs #1637 Missed files from MD Geometry

comment:74 Changed 10 years ago by Alex Buts

(In [7100]) refs #1637 GCC-specific Modification for MD geometry to compile.

comment:75 Changed 10 years ago by Alex Buts

(In [7102]) refs #1637 modifications for MD geometry with lost functionality to satisfy GCC

comment:76 Changed 10 years ago by Alex Buts

(In [7103]) refs #1637 to suppress one of the GCC messages

comment:77 Changed 10 years ago by Martyn Gigg

(In [7104]) Reinstate lost behaviour and keep gcc happy. Re #1637

comment:78 Changed 10 years ago by Martyn Gigg

(In [7105]) Fix a couple of test builds by including the appropriate header. Re #1637

comment:79 Changed 10 years ago by Alex Buts

(In [7266]) refs #1637 refs #1640 rough CP rebinning code and workspace which works with CP rebinning. needs further testing, especially for proper reshaping.

comment:80 Changed 10 years ago by Alex Buts

(In [7269]) refs #1637 MDPropertyGeometry fixed to satisfy g++

comment:81 Changed 10 years ago by Alex Buts

(In [7271]) refs #1637 something strange in template instantiation -- attempting to fix for g++

comment:82 Changed 10 years ago by Alex Buts

(In [7272]) refs #1637reverted the broken test

comment:83 Changed 10 years ago by Alex Buts

(In [7274]) refs #1637 MD workspace property removed

comment:84 Changed 10 years ago by Martyn Gigg

(In [7276]) Get the build going again. Re #1637

comment:85 Changed 10 years ago by Alex Buts

(In [7287]) refs #1637 MD workspace holder deleted. modifications to files to work without it. minor changes to ImplicitFunction.h to allow compilation.

comment:86 Changed 10 years ago by Alex Buts

(In [7288]) refs #1637 workspace factory modified to avoid ambiguity between MatrixWorkspace and IMDWorkspace

comment:87 Changed 10 years ago by Alex Buts

(In [7297]) refs #1637 composite implicit functions reverted to proper state.

comment:88 Changed 10 years ago by Owen Arnold

(In [7302]) refs #1637. Error made by last modifier. Line should not have been removed.

comment:89 Changed 10 years ago by Alex Buts

(In [7316]) refs #1637 MDWorkspace added back to repository

comment:90 Changed 10 years ago by Alex Buts

(In [7383]) refs #1640 refs #1637 Almost all code from the MD workspaces moved to CPrebinning algorithm. Memory corruption as a result, but should compile.

comment:91 Changed 10 years ago by Alex Buts

(In [7391]) refs #1637 Studio projects modified to allow Windows build after recent changes in geometry

comment:92 Changed 10 years ago by Alex Buts

(In [7398]) refs #1640 refs #1637 rebinding code has been moved into cpr rebining class. All works so far -- some tests still be useful for rebinning.

comment:93 Changed 10 years ago by Alex Buts

(In [7454]) refs #1637 All tests for MD geometry finalised for orthogonal slices and work properly CPR tests are due.

comment:94 Changed 10 years ago by Alex Buts

(In [7457]) refs #1637 Minor modifications to keep gcc happy

comment:95 Changed 10 years ago by Owen Arnold

(In [7522]) refs #1637. Fix. Must be able to new-up MDDimension without being a friend.

comment:96 Changed 10 years ago by Alex Buts

(In [7533]) refs #1637 Owen chrefs #1637 MDData and MDPixels renamed accordingly with discussions from 09/11/2010 Owen changes incorporated into the Workspace

comment:97 Changed 10 years ago by Alex Buts

(In [7536]) refs #1637 documents and CP rebinding modified according to changes in MDWorkspace refs #1640 CP modified according to MD workspace but fails on file property and MDWorskpace property

comment:98 Changed 10 years ago by Owen Arnold

(In [7564]) refs #1637. Modified relationship between MDPoint and MDCell and MDDimension.

comment:99 Changed 10 years ago by Owen Arnold

(In [7567]) refs #1637. Modification to MDCell to work in terms of MDPoint rather than abstraction.

comment:100 Changed 10 years ago by Alex Buts

(In [7576]) refs #1637 Missing data file commited

comment:101 Changed 10 years ago by Alex Buts

(In [7577]) refs #1637 project include missing file properly

comment:102 Changed 10 years ago by Alex Buts

(In [7578]) refs #1637 missing test headers added

comment:103 Changed 10 years ago by Alex Buts

(In [7598]) refs #1637 MDDataPoint (MD-pixel) and test for it added to MDDataObjects

comment:104 Changed 10 years ago by Alex Buts

(In [7601]) refs #1637 Event data test has been added to MDDataPoint (MD-pixel) cosmetic changes to function names

comment:105 Changed 10 years ago by Alex Buts

(In [7616]) refs #1637 MDDataPoint verified and modified for possibility to have 32 bit data indexes

comment:106 Changed 10 years ago by Owen Arnold

(In [7617]) refs #1637. IMDWorkspace over MatrixWorkspace. Complete method bodies.

comment:107 Changed 10 years ago by Owen Arnold

(In [7670]) refs #1637. IMDWorkspace over MatrixWorkspace. Minor fixes to primitive argument types. Minor modifications for operator[] usage for speed-up.

comment:108 Changed 10 years ago by Alex Buts

(In [7683]) refs #1637 MDDataPoint enhanced and finalized;

comment:109 Changed 10 years ago by Alex Buts

(In [7726]) refs #1637 missing reference to Python debug lib included into VS studio project

comment:110 Changed 10 years ago by Alex Buts

(In [7759]) refs #1637 minor modifications to files to satisfy linux

comment:111 Changed 10 years ago by Alex Buts

(In [7761]) refs #1637 minor changes to MDDataPoint, its components and tests to bring naming to in agreement with other MD Workspace names

comment:112 Changed 10 years ago by Alex Buts

(In [7784]) refs #1637 simpe test for geometry description has been added to the svn

comment:113 Changed 10 years ago by Owen Arnold

(In [7788]) refs #1637. Change IMDWorkspace interface to give components as share_pointers.

comment:114 Changed 10 years ago by Owen Arnold

(In [7798]) refs #1637. Give better compatibility for MDWorkspace and MatrixWorkspace in terms of IMDWorkspace. MDGeometry modified to use shared_ptr for vectors.

comment:115 Changed 10 years ago by Alex Buts

(In [7838]) refs #1637 missing project file for algorithm testing under VS has been added

comment:116 Changed 10 years ago by Alex Buts

(In [7839]) refs #1637 IMD_FileFormat got new methods, responsible for loading new parts of the dataset; correspondent methods implemented in MatlabDataFormat #1977 refractoring brought to a working state

comment:117 Changed 10 years ago by Alex Buts

(In [7840]) refs #1637 IMD_FileFormat got new methods, responsible for loading new parts of the dataset; correspondent methods implemented in MatlabDataFormat #1977 refractoring brought to a working state

comment:118 Changed 10 years ago by Alex Buts

(In [7846]) refs #1637 fixing Linux errors

comment:119 Changed 10 years ago by Russell Taylor

(In [7847]) Fix linux/mac build and clear compiler warnings. Re #1637.

comment:120 Changed 10 years ago by Alex Buts

(In [7861]) refs #1637 MDDataPoint ->copyPixel function fixed and test for it has been added

comment:121 Changed 10 years ago by Alex Buts

(In [8050]) refs #1637 missing project file for algorithm testing under VS has been added

comment:122 Changed 10 years ago by Alex Buts

(In [8051]) refs #1637 bug fix in MDPropertyGeometryTest accounting to last changes in MDDimensionDescription.h

comment:123 Changed 10 years ago by Alex Buts

(In [8055]) refs #1637 comments and checks to MD Geometry

comment:124 Changed 10 years ago by Owen Arnold

(In [8065]) refs #1637. Move towards proper ownership of MDWorkspace objects generated via IMDWorkspace.

comment:125 Changed 10 years ago by Alex Buts

(In [8112]) refs #1637 Additional tests for MDImage and bug fixes; refs #2024 tests and improvements for reader.

comment:126 Changed 10 years ago by Alex Buts

(In [8123]) refs #1637 IMD_FileFormat got getFileName method. Tests for MDDataObjects modified to know about it.

comment:127 Changed 10 years ago by Alex Buts

(In [8125]) refs #1637 some modifications to MDDataPoint to keep the linux happy (not all of them)

comment:128 Changed 10 years ago by Alex Buts

(In [8127]) refs #1637 Additional tests and checks for MDGeometry

comment:129 Changed 10 years ago by Owen Arnold

(In [8128]) refs #1637 make gcc compatible. Remove GOTOs. Assist templated class resolution.

comment:130 Changed 10 years ago by Alex Buts

(In [8129]) refs #1637 Additional tests and checks for MDImage

comment:131 Changed 10 years ago by Nick Draper

  • Milestone changed from Iteration 26 to Iteration 27

Bulk move of tickets to iteration 27, if your ticket is essential for Iteration 26 then move it back.

comment:132 Changed 10 years ago by Alex Buts

(In [8268]) refs #1637 missing file added

comment:133 Changed 10 years ago by Alex Buts

(In [8579]) refs #1881 HDf5 has been sorted out for VATES and Win (at least 32) MDDataObjects and MDAlgorithms build successfully, so redundant VS projects deleted Tests have not been sorted yet, so remain as VS projects linked to cmake-generated solution

refs #1637 testDataGenerator class added as class to "read" artificial data for rebinning. (not fully functional yet)

comment:134 Changed 10 years ago by Michael Reuter

(In [8584]) Fix Unix compilation issue. This refs #1637.

comment:135 Changed 10 years ago by Alex Buts

(In [8640]) refs #1637 Additional test to check if the load_MDWorkspace algorithm loads MD image correctly

comment:136 Changed 10 years ago by Alex Buts

(In [8730]) refs #1637 access to MDDavaPoints has been rewired through MDDataPoints class hiding MDDataReader

comment:137 Changed 10 years ago by Alex Buts

(In [8796]) refs #1637 pixels locations moved into MDDataPoints

comment:138 Changed 10 years ago by Alex Buts

(In [8863]) refs #1640 simplified cprRebinningNx3 to achieve higher efficiency refs #1637 more tests for workspace components

comment:139 Changed 10 years ago by Alex Buts

(In [8876]) refs #1637 more tests and more reliable code

comment:140 Changed 10 years ago by Alex Buts

(In [9373]) refs #1640 rebinning, keep pixels in memory completed refs #1637 MDDataPoints manage pixels data placed in memory

comment:141 Changed 10 years ago by Alex Buts

  • Status changed from new to verify
  • Resolution set to worksforme

comment:142 Changed 10 years ago by Nick Draper

  • Resolution changed from worksforme to fixed

comment:143 Changed 10 years ago by Owen Arnold

  • Status changed from verify to verifying
  • Tester set to Owen Arnold

comment:144 Changed 10 years ago by Owen Arnold

  • Status changed from verifying to closed

Complete first pass implementation of MDWorkspace. Usage verified via unit tests and MDAlgorithms (CentrePieceRebinning).

MDImage/MDAlgorithm improvements pending next iteration #2411.

comment:145 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 2484

Note: See TracTickets for help on using tickets.