Ticket #5336 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Refactor ConvertToMDEvents to work like ConvertUnits factory

Reported by: Alex Buts Owned by: Alex Buts
Priority: major Milestone: Release 2.2
Component: Mantid Keywords:
Cc: Blocked By:
Blocking: Tester: Martyn Gigg

Description (last modified by Alex Buts) (diff)

A lot of enhancement is still possible but they can be addressed by separate tickets.

Change History

comment:1 Changed 8 years ago by Alex Buts

refs #5336 Separated AddToWS from ConvertCoord in TestPerformance

Actually added just preprocessor definition, which can exclude operators responsible for adding to MD event workspace.

Changeset: 937ee8b7de4119f96dd43dd84c9ef950564aceb3

comment:2 Changed 8 years ago by Alex Buts

refs #5336 fix unix warnings

pedantic

Changeset: 95f9206d11f6b0b1a3ead788a1d270a07bcc96d0

comment:3 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: a058d69b336e6225ec55a6f87a232b0c80a4cdca

comment:4 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: d008e74fb9de9e134bf4f60f831670b5af4ea58b

comment:5 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 4f531507c5abd4a86ad73081ae232549c3577fd8

comment:6 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 8d7061a5dda0490495af62dff7c6a2ead949faec

comment:7 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4157c3d3a7068f36daf4dd7a37e6f4733b09e1a1

comment:8 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 9553b18012f1cfc454e5aa027a120802a9295780

comment:9 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 672cd23986f30e77a4f6c03d419c134cffe34c1f

comment:10 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 30dcd6c8ab110f91ca1df2a1588daf8b058c050b

comment:11 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 36dff9fe824cd597411be9cf5db77c9a1b5a2e5e

comment:12 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d67b7009e7181884b082483fa5c07588261f5d58

comment:13 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: b08dc3ebecd9c31a75c63d95c58dc0e59d32209d

comment:14 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: c167862141a6ee80a85289dcffc9ca4c0a208d7c

comment:15 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: ad92a5ddaa63e4433c548832b90d998316766521

comment:16 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: a091851d2480d1913f7ad608595eb083663d9372

comment:17 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f1cce0d03398adefa0afa881ab606dede47a09d4

comment:18 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 26742590d40e007790f5ec9717f2a3feeb58a088

comment:19 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 129457f8554ad8f09cdf7f62d7a7621a93995fd2

comment:20 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: b85378d65824e1046654a2110d6cd9891fefcb7b

comment:21 Changed 8 years ago by Alex Buts

refs #5336 Clone experiment info should be const method?

Changeset: 252f167236f8fe08106801dbb6df8fabc7e23ec6

comment:22 Changed 8 years ago by Alex Buts

refs #5336 Event lists got const accessors

Changeset: 0e9cac416c1bd0c39ca0024b03297a00a80505f4

comment:23 Changed 8 years ago by Alex Buts

refs #5336 Clone experiment info should be const method?

Changeset: 252f167236f8fe08106801dbb6df8fabc7e23ec6

comment:24 Changed 8 years ago by Alex Buts

refs #5336 Event lists got const accessors

Changeset: 0e9cac416c1bd0c39ca0024b03297a00a80505f4

comment:25 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 5c1ace88a124267da074fc3f379844e5b411e504

comment:26 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: aa177efbca7fb2e9d7a7303399b0284e600258b7

comment:27 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 0226a8244bbfa621fabc23ec86122d8f5d6e0e82

comment:28 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 5d7c2ad56e671213b88d00d0fb4d5af8c62ffdc6

comment:29 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: ef67179073d5eb9035066e92e0190916f8ebb3ed

comment:30 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a108548c8f689877236417c1fbbaf2472c6a56e1

comment:31 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 2ce54e1a812fac476bb5f7b1bfbb1526bc8abd22

comment:32 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 35628727345eeea5cf562161a3eb51b3f982d4e4

comment:33 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: dafc208d3ad61e5cc83c413f3c221eda2743876c

comment:34 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: eb1aecf3466929a1f04ee6ecc19b4b7aa3b407a0

comment:35 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: cffd3e9e6da4936afc2ec429b47f3089077d928a

comment:36 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 15ef5ca87bc3beac57bccbad5836c5767b4c5a7b

comment:37 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 9053462b103c795facc1f267030be1e40db7b1b0

comment:38 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: d54e825001c98da52554277bef11e63a7d0d66eb

comment:39 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 013d4f7cc69614a92808ea1cc4f60140fb0865cb

comment:40 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 544667477035c928804c1091ae04093e0711a4a0

comment:41 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 46b09440d7dde7c03a27cde5e44b5999c2e07182

comment:42 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 24403a35200a0f8c84130a85e93d51913159d8cc

comment:43 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9b591fc23b68dfb937f879195d92e2a8f74b63bb

comment:44 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: cb0db599618a7daec888d0c5886c1da2d4e525ee

comment:45 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 3cc06f706d3c12f7e28fa8c252e1526955f6d644

comment:46 Changed 8 years ago by Alex Buts

refs #5336 solving conflicts caused by cherrypicking

and synchronization with remote

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfNoQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitConversionHelper.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsBase.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsEvents.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/UnitConversionHelper.cpp

Changeset: b4b76d7c875b345bff53af059fa8d5f801e1bcaf

comment:47 Changed 8 years ago by Alex Buts

refs #5336 enabling CreateMDWorkspaceAlgDialog

and fixing small bug in ConvertToMDEvents

refs #5151 removing dependence form MDAlgorithms

but adding dependence on MDEvents

Changeset: e4ddb6140e3f3ddd223fbda91c9274235acdd85c

comment:48 Changed 8 years ago by Alex Buts

refs #5336 Various trivial bugs

Changeset: 15f7edacf35385cc6b8ac786739743b2e4d1d38b

comment:49 Changed 8 years ago by Alex Buts

refs #5336 More tests and some bug fixed

Changeset: b1c1cea8fe05651bee3c303f37d5184f2e86d52d

comment:50 Changed 8 years ago by Alex Buts

refs #5336 More tests

Changeset: 6e5c0df4d6c37d5237b9f85ee14cbe053ed1036b

comment:51 Changed 8 years ago by Alex Buts

refs #5336 Uncompleted additional tests

Changeset: 9f32c63a4a5b96f8060bda1189550cc8a739c91a

comment:52 Changed 8 years ago by Alex Buts

refs #5336 Clone experiment info should be const method?

Changeset: 252f167236f8fe08106801dbb6df8fabc7e23ec6

comment:53 Changed 8 years ago by Alex Buts

refs #5336 Event lists got const accessors

Changeset: 0e9cac416c1bd0c39ca0024b03297a00a80505f4

comment:54 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f3e5d5ff867191332384eaeec25545bdd9ba7821

comment:55 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 6cb8a0fa7cc0521d7c4a9dfa20a56800aafe9f36

comment:56 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 57ff67909c6c3899527fadd89600565b88567f3c

comment:57 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 91df822826257031d7df1a4beadce71dcdb90567

comment:58 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4c6a31edb46ac171c9643c9ec3f8e211e3f6c6c8

comment:59 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 01c94a805a18f7f278dedec9b21e190b9185aaea

comment:60 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 39b7ff3dd442c8076f8ca8639bfe76bb45db7e7b

comment:61 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 28c5fa53925c8b37e41a3c029070111c88abe0e9

comment:62 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: f39d754403fa838430400ce876ec6106b17292b2

comment:63 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 7eb6d78c1e7748d475405fbb3672bebafaeba579

comment:64 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: 1bb100af651b939087f2c7a026c7427c5fd747be

comment:65 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: ed197909051cca0d9e813a07eb12f4075e0d5e9c

comment:66 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: a09c05c946e2a94b13b108359a2c32f3a6be82f2

comment:67 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 6bb7bdf619b2a296b5abb97f7a68855649a8b86d

comment:68 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f97c99a091c882517097a146817b5e602c638728

comment:69 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 972bca4e4d96e25e946a48c056d9dfe5bd912ece

comment:70 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: d942ab9f474a3bf8dfcc8552c66f54a495158736

comment:71 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1032f02aeb007d87280517e7cb5bfe478eba5395

comment:72 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9f18040e0b5dddc6597758b577e3550d52d4807c

comment:73 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 30656ba3c69311cd5d71cd9ec5f604f508b7d2c9

comment:74 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 13cecdd9e13bd53ee03c05739b18dbc0d164b4a6

comment:75 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 38de8f7a73366c55976abcdc06c158ad0343d1cb

comment:76 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: b8ce66c264c7e1fcf947b3bc3611a3d22bd8e166

comment:77 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: ba5ce402c7004ace0be4fee5ada322a43fa7d978

comment:78 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: acc5e0d9afd49f3f74830077984d1e90ad89fdc3

comment:79 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 207dfcc1899e0301009a7fc4eb2ef119b80b68af

comment:80 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a41eacbaa0c03e74b4498bf1e293a62bd59441d3

comment:81 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 169e4d2f8119a31f3f1187176bd3fed67bb95c00

comment:82 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: f4f77aadd4de0046a0581e58ef093628d1df9128

comment:83 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 09c6c6a7760886d2e9c647f73b2b15bef6321192

comment:84 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 3c3c03facaf2390ac0b8c10941a4ed598d3d5bce

comment:85 Changed 8 years ago by Alex Buts

refs #5336 merging with main

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp

Changeset: ad4ea42112bd4f8cb72f5436da27fdab473ec32f

comment:86 Changed 8 years ago by Alex Buts

refs #5336 Enabled Event VS histo conversion test

Changeset: 23332ab4a4a54b840fae276420e304314c664b01

comment:87 Changed 8 years ago by Alex Buts

refs #5336 Subalg factory test enabled

Changeset: 311d0efafa28fb562ea8f4f89a6eed912cef247e

comment:88 Changed 8 years ago by Alex Buts

refs #5336 Unit conversion helper test enabled

Changeset: a7ed64bd5cba1a984f3d6e5ed042a5c95a8ce3e2

comment:89 Changed 8 years ago by Alex Buts

refs #5336 Performance test refactored and enabled

Changeset: cfbe372103e9f15bf829f76940e1f5ed2c63e9ee

comment:90 Changed 8 years ago by Alex Buts

refs #5336 axis tests finished

and the underlying classes modified using new definitions

Changeset: 094b6f6370f3bfe1c0d045068be0b178cc6a7e67

comment:91 Changed 8 years ago by Alex Buts

refs #5336 small comments

Changeset: 8ce213d958264dec786e1ec9ad1ef486aa2fa1b9

comment:92 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: a058d69b336e6225ec55a6f87a232b0c80a4cdca

comment:93 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: d008e74fb9de9e134bf4f60f831670b5af4ea58b

comment:94 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 4f531507c5abd4a86ad73081ae232549c3577fd8

comment:95 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 8d7061a5dda0490495af62dff7c6a2ead949faec

comment:96 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4157c3d3a7068f36daf4dd7a37e6f4733b09e1a1

comment:97 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 9553b18012f1cfc454e5aa027a120802a9295780

comment:98 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 672cd23986f30e77a4f6c03d419c134cffe34c1f

comment:99 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 30dcd6c8ab110f91ca1df2a1588daf8b058c050b

comment:100 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 36dff9fe824cd597411be9cf5db77c9a1b5a2e5e

comment:101 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d67b7009e7181884b082483fa5c07588261f5d58

comment:102 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: b08dc3ebecd9c31a75c63d95c58dc0e59d32209d

comment:103 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: c167862141a6ee80a85289dcffc9ca4c0a208d7c

comment:104 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: ad92a5ddaa63e4433c548832b90d998316766521

comment:105 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: a091851d2480d1913f7ad608595eb083663d9372

comment:106 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f1cce0d03398adefa0afa881ab606dede47a09d4

comment:107 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 26742590d40e007790f5ec9717f2a3feeb58a088

comment:108 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 129457f8554ad8f09cdf7f62d7a7621a93995fd2

comment:109 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: b85378d65824e1046654a2110d6cd9891fefcb7b

comment:110 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 5c1ace88a124267da074fc3f379844e5b411e504

comment:111 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: aa177efbca7fb2e9d7a7303399b0284e600258b7

comment:112 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 0226a8244bbfa621fabc23ec86122d8f5d6e0e82

comment:113 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 5d7c2ad56e671213b88d00d0fb4d5af8c62ffdc6

comment:114 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: ef67179073d5eb9035066e92e0190916f8ebb3ed

comment:115 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a108548c8f689877236417c1fbbaf2472c6a56e1

comment:116 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 2ce54e1a812fac476bb5f7b1bfbb1526bc8abd22

comment:117 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 35628727345eeea5cf562161a3eb51b3f982d4e4

comment:118 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: dafc208d3ad61e5cc83c413f3c221eda2743876c

comment:119 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: eb1aecf3466929a1f04ee6ecc19b4b7aa3b407a0

comment:120 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: cffd3e9e6da4936afc2ec429b47f3089077d928a

comment:121 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 15ef5ca87bc3beac57bccbad5836c5767b4c5a7b

comment:122 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 9053462b103c795facc1f267030be1e40db7b1b0

comment:123 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: d54e825001c98da52554277bef11e63a7d0d66eb

comment:124 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 013d4f7cc69614a92808ea1cc4f60140fb0865cb

comment:125 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 544667477035c928804c1091ae04093e0711a4a0

comment:126 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 46b09440d7dde7c03a27cde5e44b5999c2e07182

comment:127 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 24403a35200a0f8c84130a85e93d51913159d8cc

comment:128 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9b591fc23b68dfb937f879195d92e2a8f74b63bb

comment:129 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: cb0db599618a7daec888d0c5886c1da2d4e525ee

comment:130 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 3cc06f706d3c12f7e28fa8c252e1526955f6d644

comment:131 Changed 8 years ago by Alex Buts

refs #5336 solving conflicts caused by cherrypicking

and synchronization with remote

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfNoQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitConversionHelper.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsBase.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsEvents.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/UnitConversionHelper.cpp

Changeset: b4b76d7c875b345bff53af059fa8d5f801e1bcaf

comment:132 Changed 8 years ago by Alex Buts

refs #5336 enabling CreateMDWorkspaceAlgDialog

and fixing small bug in ConvertToMDEvents

refs #5151 removing dependence form MDAlgorithms

but adding dependence on MDEvents

Changeset: e4ddb6140e3f3ddd223fbda91c9274235acdd85c

comment:133 Changed 8 years ago by Alex Buts

refs #5336 Various trivial bugs

Changeset: 15f7edacf35385cc6b8ac786739743b2e4d1d38b

comment:134 Changed 8 years ago by Alex Buts

refs #5336 More tests and some bug fixed

Changeset: b1c1cea8fe05651bee3c303f37d5184f2e86d52d

comment:135 Changed 8 years ago by Alex Buts

refs #5336 More tests

Changeset: 6e5c0df4d6c37d5237b9f85ee14cbe053ed1036b

comment:136 Changed 8 years ago by Alex Buts

refs #5336 Uncompleted additional tests

Changeset: 9f32c63a4a5b96f8060bda1189550cc8a739c91a

comment:137 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f3e5d5ff867191332384eaeec25545bdd9ba7821

comment:138 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 6cb8a0fa7cc0521d7c4a9dfa20a56800aafe9f36

comment:139 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 57ff67909c6c3899527fadd89600565b88567f3c

comment:140 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 91df822826257031d7df1a4beadce71dcdb90567

comment:141 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4c6a31edb46ac171c9643c9ec3f8e211e3f6c6c8

comment:142 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 01c94a805a18f7f278dedec9b21e190b9185aaea

comment:143 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 39b7ff3dd442c8076f8ca8639bfe76bb45db7e7b

comment:144 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 28c5fa53925c8b37e41a3c029070111c88abe0e9

comment:145 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: f39d754403fa838430400ce876ec6106b17292b2

comment:146 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 7eb6d78c1e7748d475405fbb3672bebafaeba579

comment:147 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: 1bb100af651b939087f2c7a026c7427c5fd747be

comment:148 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: ed197909051cca0d9e813a07eb12f4075e0d5e9c

comment:149 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: a09c05c946e2a94b13b108359a2c32f3a6be82f2

comment:150 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 6bb7bdf619b2a296b5abb97f7a68855649a8b86d

comment:151 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f97c99a091c882517097a146817b5e602c638728

comment:152 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 972bca4e4d96e25e946a48c056d9dfe5bd912ece

comment:153 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: d942ab9f474a3bf8dfcc8552c66f54a495158736

comment:154 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1032f02aeb007d87280517e7cb5bfe478eba5395

comment:155 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9f18040e0b5dddc6597758b577e3550d52d4807c

comment:156 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 30656ba3c69311cd5d71cd9ec5f604f508b7d2c9

comment:157 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 13cecdd9e13bd53ee03c05739b18dbc0d164b4a6

comment:158 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 38de8f7a73366c55976abcdc06c158ad0343d1cb

comment:159 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: b8ce66c264c7e1fcf947b3bc3611a3d22bd8e166

comment:160 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: ba5ce402c7004ace0be4fee5ada322a43fa7d978

comment:161 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: acc5e0d9afd49f3f74830077984d1e90ad89fdc3

comment:162 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 207dfcc1899e0301009a7fc4eb2ef119b80b68af

comment:163 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a41eacbaa0c03e74b4498bf1e293a62bd59441d3

comment:164 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 169e4d2f8119a31f3f1187176bd3fed67bb95c00

comment:165 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: f4f77aadd4de0046a0581e58ef093628d1df9128

comment:166 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 09c6c6a7760886d2e9c647f73b2b15bef6321192

comment:167 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 3c3c03facaf2390ac0b8c10941a4ed598d3d5bce

comment:168 Changed 8 years ago by Alex Buts

refs #5336 merging with main

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp

Changeset: ad4ea42112bd4f8cb72f5436da27fdab473ec32f

comment:169 Changed 8 years ago by Alex Buts

refs #5336 Enabled Event VS histo conversion test

Changeset: 23332ab4a4a54b840fae276420e304314c664b01

comment:170 Changed 8 years ago by Alex Buts

refs #5336 Subalg factory test enabled

Changeset: 311d0efafa28fb562ea8f4f89a6eed912cef247e

comment:171 Changed 8 years ago by Alex Buts

refs #5336 Unit conversion helper test enabled

Changeset: a7ed64bd5cba1a984f3d6e5ed042a5c95a8ce3e2

comment:172 Changed 8 years ago by Alex Buts

refs #5336 Performance test refactored and enabled

Changeset: cfbe372103e9f15bf829f76940e1f5ed2c63e9ee

comment:173 Changed 8 years ago by Alex Buts

refs #5336 axis tests finished

and the underlying classes modified using new definitions

Changeset: 094b6f6370f3bfe1c0d045068be0b178cc6a7e67

comment:174 Changed 8 years ago by Alex Buts

refs #5336 small comments

Changeset: 8ce213d958264dec786e1ec9ad1ef486aa2fa1b9

comment:175 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 63997a74662db0b4124503e7c8f3aa37c9e3cffa

comment:176 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 08cd552c3c3e759e16891482cc208579c874e01e

comment:177 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a37c8e2687aee179fdb481c3115b4c2de4eb0853

comment:178 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 397dc494b3a9ef5a12e8935b7e92fe686d9e4221

comment:179 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 1fd7f9d68550c95e41e95a56a96844ed4bbf62d5

comment:180 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: fd66f874ec27cc391eb6c649fa7e5f757567ed59

comment:181 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 0ad8e5eb9ef83341f2c8b68cf442055d11ea4289

comment:182 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 853a41a90fe0c3123895907dd8adf8b5755a2490

comment:183 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: ae2396c6dbb33e7652df297add219ab350dcd29b

comment:184 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d039d02a237ac66f34042a510e30793d3155ee66

comment:185 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: ada4a2f912b816aced4e080434976b7d02da4374

comment:186 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 6ae2daa9d5e2478d655bc8efca1ff09d041179a4

comment:187 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 3851f72b2f31a2ac287bc5a35916288e41b14c0e

comment:188 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 538f27960bdb3823c5552fc06a6766b8a7e2e665

comment:189 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 450ed2b066df96a501b5a1a7f9de4a97d9a80528

comment:190 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: fce12d4ef0201ee2532cb15439fe0e4103314366

comment:191 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: acd91912065dc738a11de9dc9d6654eee45f27e4

comment:192 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1898f8694f0e3a2e0956e61139f164d358bc2c2f

comment:193 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 5a6cf9a040e324330ec912a9d90c5e8e70153d53

comment:194 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 0bd566350e1aa5fbc834af0d663ad8d65ceb9574

comment:195 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 87c92cda2863e3b6718c802df0d4cf7a36daebec

comment:196 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f946a12f450772393e1d3208efd115f4075320bb

comment:197 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: a30976c6468ed8c850375da6caa55c3508a50680

comment:198 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a847cd05e717817d0f26665fa9c859f9719f3817

comment:199 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: d984390158ddeabfa69525d6df7bfdf286647210

comment:200 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 5542b1e4cd4e8c8212b226b9b8322179a7682ad3

comment:201 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 5aee0804c56cf7e8ff57915bd27dc55c2529ce3c

comment:202 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 4ff929d1c3a32af87c75dd87167e0a1626bf900a

comment:203 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 445a46e33d02ab85f2a3640f6bdf418e5614e267

comment:204 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 387f192097b967b1d57e2d8caa22bbb68c1f444a

comment:205 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 585c10e2e03eb78fb2af7fe3f68a2e5d11b7a723

comment:206 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 2aaa045366d6bd20024697c4b31af4dd2bfcac8c

comment:207 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 0303a1488254081fe656daa369d7e7f39d26ea4f

comment:208 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 6a59f76cc52d8c9c8d3e086b526d07699b40430b

comment:209 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: b6355e2d4fb4c9744f1868cdfe506a7e67b472eb

comment:210 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 8e65c7e5360ffcc414630707dfcabc17e0afebc2

comment:211 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: b9e6fcc85d46cc026cf6ec16682b2db0f133f9bb

comment:212 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 71abb7e48bf3d761cd42c8e2515133fd4b748673

comment:213 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 00c2051a1aa69d889bfe3c27f065738b80388064

comment:214 Changed 8 years ago by Alex Buts

refs #5336 mering remote (correct) vfun branch with local

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSTransform.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDEventWSWrapper.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/MDWSTransform.cpp Code/Mantid/Framework/MDEvents/test/MDWSTransfDescrTest.h

Changeset: 4ae9113bc0d3ac4cf312abbd9e9ed429211fd9a3

comment:215 Changed 8 years ago by Alex Buts

refs #5336 Minor problem after merge fixed

Changeset: ae5afd10dca996b45024e64d68c8fd1777a5af3b

comment:216 Changed 8 years ago by Alex Buts

refs #5336 gitignore configured

Changeset: d089246eeddc4ec1693b3e6a5598159c7b90dc90

comment:217 Changed 8 years ago by Alex Buts

refs #5336 Fixing unix error with transfTest

Changeset: 301a944e2a626e2c4a7ff7af51c63e7cba0fd4d0

comment:218 Changed 8 years ago by Alex Buts

refs #5336 fixing MDEventWSWrapperTest.h error

Changeset: 2dc05c0876dbeb65da495a60c21c42fa89fd8f51

comment:219 Changed 8 years ago by Alex Buts

refs #5336 Trying to get around MAC error

with defining static number of dimensions

Changeset: c22f543d1f4ad25aa48ad74b833afd1be8146155

comment:220 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix error with enum

Changeset: 06212cefe6f038b7f98793a670f645f97279403e

comment:221 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings

Changeset: 698c78809647e36f3f1e1939324aea461ba1e695

comment:222 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings in ConvToMDEventsEvents.h

Changeset: 711e0e70c315723fe5673a7fb6461265dc6f2692

comment:223 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warning about construction order.

Changeset: a6f8565c12839fab6fbf8fad64bb55f187203398

comment:224 Changed 8 years ago by Alex Buts

  • Status changed from new to accepted

comment:225 Changed 8 years ago by Alex Buts

  • Status changed from accepted to verify
  • Resolution set to fixed
  • Description modified (diff)

comment:226 Changed 8 years ago by Alex Buts

refs #5336 keeping Template metaprogramming version for a future

Changeset: 561e17809c802b2f47b4a1272d41e1e55f4b8d8a

comment:227 Changed 8 years ago by Alex Buts

refs #5336 some comments and little niceness

Changeset: e3690422a967043d7f3f7b25e89383b13c5e903e

comment:228 Changed 8 years ago by Alex Buts

refs #5336 appropriate tests moved to MDEvents

Changeset: 4210d8ef9b6dcb63937cb25e215062be0e3d9c19

comment:229 Changed 8 years ago by Alex Buts

refs #5336 moved tests to appropriate places

Changeset: beb7c83ba731fc0c70bb964d8d012fb1cd892172

comment:230 Changed 8 years ago by Alex Buts

refs #5336 Additional comments

Changeset: 09f9ae1f3afe571278c4dd1b4d9abfe6a134e8fb

comment:231 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: a058d69b336e6225ec55a6f87a232b0c80a4cdca

comment:232 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: d008e74fb9de9e134bf4f60f831670b5af4ea58b

comment:233 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 4f531507c5abd4a86ad73081ae232549c3577fd8

comment:234 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 8d7061a5dda0490495af62dff7c6a2ead949faec

comment:235 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4157c3d3a7068f36daf4dd7a37e6f4733b09e1a1

comment:236 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 9553b18012f1cfc454e5aa027a120802a9295780

comment:237 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 672cd23986f30e77a4f6c03d419c134cffe34c1f

comment:238 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 30dcd6c8ab110f91ca1df2a1588daf8b058c050b

comment:239 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 36dff9fe824cd597411be9cf5db77c9a1b5a2e5e

comment:240 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d67b7009e7181884b082483fa5c07588261f5d58

comment:241 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: b08dc3ebecd9c31a75c63d95c58dc0e59d32209d

comment:242 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: c167862141a6ee80a85289dcffc9ca4c0a208d7c

comment:243 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: ad92a5ddaa63e4433c548832b90d998316766521

comment:244 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: a091851d2480d1913f7ad608595eb083663d9372

comment:245 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f1cce0d03398adefa0afa881ab606dede47a09d4

comment:246 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 26742590d40e007790f5ec9717f2a3feeb58a088

comment:247 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 129457f8554ad8f09cdf7f62d7a7621a93995fd2

comment:248 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: b85378d65824e1046654a2110d6cd9891fefcb7b

comment:249 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 5c1ace88a124267da074fc3f379844e5b411e504

comment:250 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: aa177efbca7fb2e9d7a7303399b0284e600258b7

comment:251 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 0226a8244bbfa621fabc23ec86122d8f5d6e0e82

comment:252 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 5d7c2ad56e671213b88d00d0fb4d5af8c62ffdc6

comment:253 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: ef67179073d5eb9035066e92e0190916f8ebb3ed

comment:254 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a108548c8f689877236417c1fbbaf2472c6a56e1

comment:255 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 2ce54e1a812fac476bb5f7b1bfbb1526bc8abd22

comment:256 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 35628727345eeea5cf562161a3eb51b3f982d4e4

comment:257 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: dafc208d3ad61e5cc83c413f3c221eda2743876c

comment:258 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: eb1aecf3466929a1f04ee6ecc19b4b7aa3b407a0

comment:259 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: cffd3e9e6da4936afc2ec429b47f3089077d928a

comment:260 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 15ef5ca87bc3beac57bccbad5836c5767b4c5a7b

comment:261 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 9053462b103c795facc1f267030be1e40db7b1b0

comment:262 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: d54e825001c98da52554277bef11e63a7d0d66eb

comment:263 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 013d4f7cc69614a92808ea1cc4f60140fb0865cb

comment:264 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 544667477035c928804c1091ae04093e0711a4a0

comment:265 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 46b09440d7dde7c03a27cde5e44b5999c2e07182

comment:266 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 24403a35200a0f8c84130a85e93d51913159d8cc

comment:267 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9b591fc23b68dfb937f879195d92e2a8f74b63bb

comment:268 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: cb0db599618a7daec888d0c5886c1da2d4e525ee

comment:269 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 3cc06f706d3c12f7e28fa8c252e1526955f6d644

comment:270 Changed 8 years ago by Alex Buts

refs #5336 solving conflicts caused by cherrypicking

and synchronization with remote

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfNoQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitConversionHelper.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsBase.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsEvents.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/UnitConversionHelper.cpp

Changeset: b4b76d7c875b345bff53af059fa8d5f801e1bcaf

comment:271 Changed 8 years ago by Alex Buts

refs #5336 enabling CreateMDWorkspaceAlgDialog

and fixing small bug in ConvertToMDEvents

refs #5151 removing dependence form MDAlgorithms

but adding dependence on MDEvents

Changeset: e4ddb6140e3f3ddd223fbda91c9274235acdd85c

comment:272 Changed 8 years ago by Alex Buts

refs #5336 Various trivial bugs

Changeset: 15f7edacf35385cc6b8ac786739743b2e4d1d38b

comment:273 Changed 8 years ago by Alex Buts

refs #5336 More tests and some bug fixed

Changeset: b1c1cea8fe05651bee3c303f37d5184f2e86d52d

comment:274 Changed 8 years ago by Alex Buts

refs #5336 More tests

Changeset: 6e5c0df4d6c37d5237b9f85ee14cbe053ed1036b

comment:275 Changed 8 years ago by Alex Buts

refs #5336 Uncompleted additional tests

Changeset: 9f32c63a4a5b96f8060bda1189550cc8a739c91a

comment:276 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f3e5d5ff867191332384eaeec25545bdd9ba7821

comment:277 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 6cb8a0fa7cc0521d7c4a9dfa20a56800aafe9f36

comment:278 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 57ff67909c6c3899527fadd89600565b88567f3c

comment:279 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 91df822826257031d7df1a4beadce71dcdb90567

comment:280 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4c6a31edb46ac171c9643c9ec3f8e211e3f6c6c8

comment:281 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 01c94a805a18f7f278dedec9b21e190b9185aaea

comment:282 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 39b7ff3dd442c8076f8ca8639bfe76bb45db7e7b

comment:283 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 28c5fa53925c8b37e41a3c029070111c88abe0e9

comment:284 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: f39d754403fa838430400ce876ec6106b17292b2

comment:285 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 7eb6d78c1e7748d475405fbb3672bebafaeba579

comment:286 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: 1bb100af651b939087f2c7a026c7427c5fd747be

comment:287 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: ed197909051cca0d9e813a07eb12f4075e0d5e9c

comment:288 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: a09c05c946e2a94b13b108359a2c32f3a6be82f2

comment:289 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 6bb7bdf619b2a296b5abb97f7a68855649a8b86d

comment:290 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f97c99a091c882517097a146817b5e602c638728

comment:291 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 972bca4e4d96e25e946a48c056d9dfe5bd912ece

comment:292 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: d942ab9f474a3bf8dfcc8552c66f54a495158736

comment:293 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1032f02aeb007d87280517e7cb5bfe478eba5395

comment:294 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9f18040e0b5dddc6597758b577e3550d52d4807c

comment:295 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 30656ba3c69311cd5d71cd9ec5f604f508b7d2c9

comment:296 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 13cecdd9e13bd53ee03c05739b18dbc0d164b4a6

comment:297 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 38de8f7a73366c55976abcdc06c158ad0343d1cb

comment:298 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: b8ce66c264c7e1fcf947b3bc3611a3d22bd8e166

comment:299 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: ba5ce402c7004ace0be4fee5ada322a43fa7d978

comment:300 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: acc5e0d9afd49f3f74830077984d1e90ad89fdc3

comment:301 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 207dfcc1899e0301009a7fc4eb2ef119b80b68af

comment:302 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a41eacbaa0c03e74b4498bf1e293a62bd59441d3

comment:303 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 169e4d2f8119a31f3f1187176bd3fed67bb95c00

comment:304 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: f4f77aadd4de0046a0581e58ef093628d1df9128

comment:305 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 09c6c6a7760886d2e9c647f73b2b15bef6321192

comment:306 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 3c3c03facaf2390ac0b8c10941a4ed598d3d5bce

comment:307 Changed 8 years ago by Alex Buts

refs #5336 merging with main

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp

Changeset: ad4ea42112bd4f8cb72f5436da27fdab473ec32f

comment:308 Changed 8 years ago by Alex Buts

refs #5336 Enabled Event VS histo conversion test

Changeset: 23332ab4a4a54b840fae276420e304314c664b01

comment:309 Changed 8 years ago by Alex Buts

refs #5336 Subalg factory test enabled

Changeset: 311d0efafa28fb562ea8f4f89a6eed912cef247e

comment:310 Changed 8 years ago by Alex Buts

refs #5336 Unit conversion helper test enabled

Changeset: a7ed64bd5cba1a984f3d6e5ed042a5c95a8ce3e2

comment:311 Changed 8 years ago by Alex Buts

refs #5336 Performance test refactored and enabled

Changeset: cfbe372103e9f15bf829f76940e1f5ed2c63e9ee

comment:312 Changed 8 years ago by Alex Buts

refs #5336 axis tests finished

and the underlying classes modified using new definitions

Changeset: 094b6f6370f3bfe1c0d045068be0b178cc6a7e67

comment:313 Changed 8 years ago by Alex Buts

refs #5336 small comments

Changeset: 8ce213d958264dec786e1ec9ad1ef486aa2fa1b9

comment:314 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 63997a74662db0b4124503e7c8f3aa37c9e3cffa

comment:315 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 08cd552c3c3e759e16891482cc208579c874e01e

comment:316 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a37c8e2687aee179fdb481c3115b4c2de4eb0853

comment:317 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 397dc494b3a9ef5a12e8935b7e92fe686d9e4221

comment:318 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 1fd7f9d68550c95e41e95a56a96844ed4bbf62d5

comment:319 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: fd66f874ec27cc391eb6c649fa7e5f757567ed59

comment:320 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 0ad8e5eb9ef83341f2c8b68cf442055d11ea4289

comment:321 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 853a41a90fe0c3123895907dd8adf8b5755a2490

comment:322 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: ae2396c6dbb33e7652df297add219ab350dcd29b

comment:323 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d039d02a237ac66f34042a510e30793d3155ee66

comment:324 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: ada4a2f912b816aced4e080434976b7d02da4374

comment:325 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 6ae2daa9d5e2478d655bc8efca1ff09d041179a4

comment:326 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 3851f72b2f31a2ac287bc5a35916288e41b14c0e

comment:327 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 538f27960bdb3823c5552fc06a6766b8a7e2e665

comment:328 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 450ed2b066df96a501b5a1a7f9de4a97d9a80528

comment:329 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: fce12d4ef0201ee2532cb15439fe0e4103314366

comment:330 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: acd91912065dc738a11de9dc9d6654eee45f27e4

comment:331 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1898f8694f0e3a2e0956e61139f164d358bc2c2f

comment:332 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 5a6cf9a040e324330ec912a9d90c5e8e70153d53

comment:333 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 0bd566350e1aa5fbc834af0d663ad8d65ceb9574

comment:334 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 87c92cda2863e3b6718c802df0d4cf7a36daebec

comment:335 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f946a12f450772393e1d3208efd115f4075320bb

comment:336 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: a30976c6468ed8c850375da6caa55c3508a50680

comment:337 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a847cd05e717817d0f26665fa9c859f9719f3817

comment:338 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: d984390158ddeabfa69525d6df7bfdf286647210

comment:339 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 5542b1e4cd4e8c8212b226b9b8322179a7682ad3

comment:340 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 5aee0804c56cf7e8ff57915bd27dc55c2529ce3c

comment:341 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 4ff929d1c3a32af87c75dd87167e0a1626bf900a

comment:342 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 445a46e33d02ab85f2a3640f6bdf418e5614e267

comment:343 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 387f192097b967b1d57e2d8caa22bbb68c1f444a

comment:344 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 585c10e2e03eb78fb2af7fe3f68a2e5d11b7a723

comment:345 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 2aaa045366d6bd20024697c4b31af4dd2bfcac8c

comment:346 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 0303a1488254081fe656daa369d7e7f39d26ea4f

comment:347 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 6a59f76cc52d8c9c8d3e086b526d07699b40430b

comment:348 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: b6355e2d4fb4c9744f1868cdfe506a7e67b472eb

comment:349 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 8e65c7e5360ffcc414630707dfcabc17e0afebc2

comment:350 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: b9e6fcc85d46cc026cf6ec16682b2db0f133f9bb

comment:351 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 71abb7e48bf3d761cd42c8e2515133fd4b748673

comment:352 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 00c2051a1aa69d889bfe3c27f065738b80388064

comment:353 Changed 8 years ago by Alex Buts

refs #5336 mering remote (correct) vfun branch with local

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSTransform.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDEventWSWrapper.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/MDWSTransform.cpp Code/Mantid/Framework/MDEvents/test/MDWSTransfDescrTest.h

Changeset: 4ae9113bc0d3ac4cf312abbd9e9ed429211fd9a3

comment:354 Changed 8 years ago by Alex Buts

refs #5336 Minor problem after merge fixed

Changeset: ae5afd10dca996b45024e64d68c8fd1777a5af3b

comment:355 Changed 8 years ago by Alex Buts

refs #5336 gitignore configured

Changeset: d089246eeddc4ec1693b3e6a5598159c7b90dc90

comment:356 Changed 8 years ago by Alex Buts

refs #5336 Fixing Unix error

Changeset: 3bfb029e3d39bbc2ecf975f4c3e5bc83bbfa13ec

comment:357 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warning

Changeset: 4439e480ebe3aefc73d0f128b18969fb024dd33f

comment:358 Changed 8 years ago by Alex Buts

refs #5336 Fixing unix error with transfTest

Changeset: 301a944e2a626e2c4a7ff7af51c63e7cba0fd4d0

comment:359 Changed 8 years ago by Alex Buts

refs #5336 fixing MDEventWSWrapperTest.h error

Changeset: 2dc05c0876dbeb65da495a60c21c42fa89fd8f51

comment:360 Changed 8 years ago by Alex Buts

refs #5336 Trying to get around MAC error

with defining static number of dimensions

Changeset: c22f543d1f4ad25aa48ad74b833afd1be8146155

comment:361 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix error with enum

Changeset: 06212cefe6f038b7f98793a670f645f97279403e

comment:362 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings

Changeset: 698c78809647e36f3f1e1939324aea461ba1e695

comment:363 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings in ConvToMDEventsEvents.h

Changeset: 711e0e70c315723fe5673a7fb6461265dc6f2692

comment:364 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warning about construction order.

Changeset: a6f8565c12839fab6fbf8fad64bb55f187203398

comment:365 Changed 8 years ago by Alex Buts

refs #5336 some comments and little niceness

Changeset: e3690422a967043d7f3f7b25e89383b13c5e903e

comment:366 Changed 8 years ago by Alex Buts

refs #5336 appropriate tests moved to MDEvents

Changeset: 4210d8ef9b6dcb63937cb25e215062be0e3d9c19

comment:367 Changed 8 years ago by Alex Buts

refs #5336 moved tests to appropriate places

Changeset: beb7c83ba731fc0c70bb964d8d012fb1cd892172

comment:368 Changed 8 years ago by Alex Buts

refs #5336 Additional comments

Changeset: 09f9ae1f3afe571278c4dd1b4d9abfe6a134e8fb

comment:369 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: a058d69b336e6225ec55a6f87a232b0c80a4cdca

comment:370 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: d008e74fb9de9e134bf4f60f831670b5af4ea58b

comment:371 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 4f531507c5abd4a86ad73081ae232549c3577fd8

comment:372 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 8d7061a5dda0490495af62dff7c6a2ead949faec

comment:373 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4157c3d3a7068f36daf4dd7a37e6f4733b09e1a1

comment:374 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 9553b18012f1cfc454e5aa027a120802a9295780

comment:375 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 672cd23986f30e77a4f6c03d419c134cffe34c1f

comment:376 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 30dcd6c8ab110f91ca1df2a1588daf8b058c050b

comment:377 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 36dff9fe824cd597411be9cf5db77c9a1b5a2e5e

comment:378 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d67b7009e7181884b082483fa5c07588261f5d58

comment:379 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: b08dc3ebecd9c31a75c63d95c58dc0e59d32209d

comment:380 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: c167862141a6ee80a85289dcffc9ca4c0a208d7c

comment:381 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: ad92a5ddaa63e4433c548832b90d998316766521

comment:382 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: a091851d2480d1913f7ad608595eb083663d9372

comment:383 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f1cce0d03398adefa0afa881ab606dede47a09d4

comment:384 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 26742590d40e007790f5ec9717f2a3feeb58a088

comment:385 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 129457f8554ad8f09cdf7f62d7a7621a93995fd2

comment:386 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: b85378d65824e1046654a2110d6cd9891fefcb7b

comment:387 Changed 8 years ago by Alex Buts

refs #5336 Clone experiment info should be const method?

Changeset: 252f167236f8fe08106801dbb6df8fabc7e23ec6

comment:388 Changed 8 years ago by Alex Buts

refs #5336 Event lists got const accessors

Changeset: 0e9cac416c1bd0c39ca0024b03297a00a80505f4

comment:389 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 5c1ace88a124267da074fc3f379844e5b411e504

comment:390 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: aa177efbca7fb2e9d7a7303399b0284e600258b7

comment:391 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 0226a8244bbfa621fabc23ec86122d8f5d6e0e82

comment:392 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 5d7c2ad56e671213b88d00d0fb4d5af8c62ffdc6

comment:393 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: ef67179073d5eb9035066e92e0190916f8ebb3ed

comment:394 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a108548c8f689877236417c1fbbaf2472c6a56e1

comment:395 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 2ce54e1a812fac476bb5f7b1bfbb1526bc8abd22

comment:396 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 35628727345eeea5cf562161a3eb51b3f982d4e4

comment:397 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: dafc208d3ad61e5cc83c413f3c221eda2743876c

comment:398 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: eb1aecf3466929a1f04ee6ecc19b4b7aa3b407a0

comment:399 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: cffd3e9e6da4936afc2ec429b47f3089077d928a

comment:400 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 15ef5ca87bc3beac57bccbad5836c5767b4c5a7b

comment:401 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 9053462b103c795facc1f267030be1e40db7b1b0

comment:402 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: d54e825001c98da52554277bef11e63a7d0d66eb

comment:403 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 013d4f7cc69614a92808ea1cc4f60140fb0865cb

comment:404 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 544667477035c928804c1091ae04093e0711a4a0

comment:405 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: 46b09440d7dde7c03a27cde5e44b5999c2e07182

comment:406 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 24403a35200a0f8c84130a85e93d51913159d8cc

comment:407 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9b591fc23b68dfb937f879195d92e2a8f74b63bb

comment:408 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: cb0db599618a7daec888d0c5886c1da2d4e525ee

comment:409 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 3cc06f706d3c12f7e28fa8c252e1526955f6d644

comment:410 Changed 8 years ago by Alex Buts

refs #5336 solving conflicts caused by cherrypicking

and synchronization with remote

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfNoQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitConversionHelper.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsBase.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsEvents.cpp Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/UnitConversionHelper.cpp

Changeset: b4b76d7c875b345bff53af059fa8d5f801e1bcaf

comment:411 Changed 8 years ago by Alex Buts

refs #5336 enabling CreateMDWorkspaceAlgDialog

and fixing small bug in ConvertToMDEvents

refs #5151 removing dependence form MDAlgorithms

but adding dependence on MDEvents

Changeset: e4ddb6140e3f3ddd223fbda91c9274235acdd85c

comment:412 Changed 8 years ago by Alex Buts

refs #5336 Various trivial bugs

Changeset: 15f7edacf35385cc6b8ac786739743b2e4d1d38b

comment:413 Changed 8 years ago by Alex Buts

refs #5336 More tests and some bug fixed

Changeset: b1c1cea8fe05651bee3c303f37d5184f2e86d52d

comment:414 Changed 8 years ago by Alex Buts

refs #5336 More tests

Changeset: 6e5c0df4d6c37d5237b9f85ee14cbe053ed1036b

comment:415 Changed 8 years ago by Alex Buts

refs #5336 Uncompleted additional tests

Changeset: 9f32c63a4a5b96f8060bda1189550cc8a739c91a

comment:416 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f3e5d5ff867191332384eaeec25545bdd9ba7821

comment:417 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 6cb8a0fa7cc0521d7c4a9dfa20a56800aafe9f36

comment:418 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 57ff67909c6c3899527fadd89600565b88567f3c

comment:419 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 91df822826257031d7df1a4beadce71dcdb90567

comment:420 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 4c6a31edb46ac171c9643c9ec3f8e211e3f6c6c8

comment:421 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 01c94a805a18f7f278dedec9b21e190b9185aaea

comment:422 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 39b7ff3dd442c8076f8ca8639bfe76bb45db7e7b

comment:423 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 28c5fa53925c8b37e41a3c029070111c88abe0e9

comment:424 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: f39d754403fa838430400ce876ec6106b17292b2

comment:425 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 7eb6d78c1e7748d475405fbb3672bebafaeba579

comment:426 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: 1bb100af651b939087f2c7a026c7427c5fd747be

comment:427 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: ed197909051cca0d9e813a07eb12f4075e0d5e9c

comment:428 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: a09c05c946e2a94b13b108359a2c32f3a6be82f2

comment:429 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 6bb7bdf619b2a296b5abb97f7a68855649a8b86d

comment:430 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: f97c99a091c882517097a146817b5e602c638728

comment:431 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: 972bca4e4d96e25e946a48c056d9dfe5bd912ece

comment:432 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: d942ab9f474a3bf8dfcc8552c66f54a495158736

comment:433 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1032f02aeb007d87280517e7cb5bfe478eba5395

comment:434 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 9f18040e0b5dddc6597758b577e3550d52d4807c

comment:435 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 30656ba3c69311cd5d71cd9ec5f604f508b7d2c9

comment:436 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 13cecdd9e13bd53ee03c05739b18dbc0d164b4a6

comment:437 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 38de8f7a73366c55976abcdc06c158ad0343d1cb

comment:438 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: b8ce66c264c7e1fcf947b3bc3611a3d22bd8e166

comment:439 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: ba5ce402c7004ace0be4fee5ada322a43fa7d978

comment:440 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: acc5e0d9afd49f3f74830077984d1e90ad89fdc3

comment:441 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 207dfcc1899e0301009a7fc4eb2ef119b80b68af

comment:442 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: a41eacbaa0c03e74b4498bf1e293a62bd59441d3

comment:443 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 169e4d2f8119a31f3f1187176bd3fed67bb95c00

comment:444 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: f4f77aadd4de0046a0581e58ef093628d1df9128

comment:445 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 09c6c6a7760886d2e9c647f73b2b15bef6321192

comment:446 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 3c3c03facaf2390ac0b8c10941a4ed598d3d5bce

comment:447 Changed 8 years ago by Alex Buts

refs #5336 merging with main

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp

Changeset: ad4ea42112bd4f8cb72f5436da27fdab473ec32f

comment:448 Changed 8 years ago by Alex Buts

refs #5336 Enabled Event VS histo conversion test

Changeset: 23332ab4a4a54b840fae276420e304314c664b01

comment:449 Changed 8 years ago by Alex Buts

refs #5336 Subalg factory test enabled

Changeset: 311d0efafa28fb562ea8f4f89a6eed912cef247e

comment:450 Changed 8 years ago by Alex Buts

refs #5336 Unit conversion helper test enabled

Changeset: a7ed64bd5cba1a984f3d6e5ed042a5c95a8ce3e2

comment:451 Changed 8 years ago by Alex Buts

refs #5336 Performance test refactored and enabled

Changeset: cfbe372103e9f15bf829f76940e1f5ed2c63e9ee

comment:452 Changed 8 years ago by Alex Buts

refs #5336 axis tests finished

and the underlying classes modified using new definitions

Changeset: 094b6f6370f3bfe1c0d045068be0b178cc6a7e67

comment:453 Changed 8 years ago by Alex Buts

refs #5336 small comments

Changeset: 8ce213d958264dec786e1ec9ad1ef486aa2fa1b9

comment:454 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 63997a74662db0b4124503e7c8f3aa37c9e3cffa

comment:455 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 08cd552c3c3e759e16891482cc208579c874e01e

comment:456 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a37c8e2687aee179fdb481c3115b4c2de4eb0853

comment:457 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: 397dc494b3a9ef5a12e8935b7e92fe686d9e4221

comment:458 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 1fd7f9d68550c95e41e95a56a96844ed4bbf62d5

comment:459 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: fd66f874ec27cc391eb6c649fa7e5f757567ed59

comment:460 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 0ad8e5eb9ef83341f2c8b68cf442055d11ea4289

comment:461 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 853a41a90fe0c3123895907dd8adf8b5755a2490

comment:462 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: ae2396c6dbb33e7652df297add219ab350dcd29b

comment:463 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: d039d02a237ac66f34042a510e30793d3155ee66

comment:464 Changed 8 years ago by Alex Buts

refs #5336 moved MDTransfDEHelper to MDEvents

where it should be from the beginning

Changeset: ada4a2f912b816aced4e080434976b7d02da4374

comment:465 Changed 8 years ago by Alex Buts

refs #5336 MDTransfDEHelper works

Changeset: 6ae2daa9d5e2478d655bc8efca1ff09d041179a4

comment:466 Changed 8 years ago by Alex Buts

refs #5336 MDTransf works with MDWSDescr instead of ConvToMDEventsBase

not finished

Changeset: 3851f72b2f31a2ac287bc5a35916288e41b14c0e

comment:467 Changed 8 years ago by Alex Buts

refs #5336 All works but tests are needed

It seems all works with ModQ and events.

Changeset: 538f27960bdb3823c5552fc06a6766b8a7e2e665

comment:468 Changed 8 years ago by Alex Buts

refs #5336 Enabling NoQ interface.

and redefining transformations to provide info to Create MD workspace procedure.

Changeset: 450ed2b066df96a501b5a1a7f9de4a97d9a80528

comment:469 Changed 8 years ago by Alex Buts

refs #5336 intermediate NoQ modifications

Changeset: fce12d4ef0201ee2532cb15439fe0e4103314366

comment:470 Changed 8 years ago by Alex Buts

refs #5336 NoQ mode compiles

hopefully works too.

Changeset: acd91912065dc738a11de9dc9d6654eee45f27e4

comment:471 Changed 8 years ago by Alex Buts

refs #5336 Q3D compiles

All code transferred

Changeset: 1898f8694f0e3a2e0956e61139f164d358bc2c2f

comment:472 Changed 8 years ago by Alex Buts

refs #5336 MDWSDescription simplified

it keeps now pointer to the input workspace and obtains all information it needs for the transformation from this workspace on request.

Changeset: 5a6cf9a040e324330ec912a9d90c5e8e70153d53

comment:473 Changed 8 years ago by Alex Buts

refs #5336 Refactoring completed

tests still needed

Changeset: 0bd566350e1aa5fbc834af0d663ad8d65ceb9574

comment:474 Changed 8 years ago by Alex Buts

refs #5336 Minor edit (comments)

Changeset: 87c92cda2863e3b6718c802df0d4cf7a36daebec

comment:475 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: f946a12f450772393e1d3208efd115f4075320bb

comment:476 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: a30976c6468ed8c850375da6caa55c3508a50680

comment:477 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: a847cd05e717817d0f26665fa9c859f9719f3817

comment:478 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: d984390158ddeabfa69525d6df7bfdf286647210

comment:479 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 5542b1e4cd4e8c8212b226b9b8322179a7682ad3

comment:480 Changed 8 years ago by Alex Buts

refs #5336 Enabled unit conversion "on fly"

looks ugly for event workspace and uses copying for matrix ws but let's live with this for the time being.

Changeset: 5aee0804c56cf7e8ff57915bd27dc55c2529ce3c

comment:481 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: 4ff929d1c3a32af87c75dd87167e0a1626bf900a

comment:482 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 445a46e33d02ab85f2a3640f6bdf418e5614e267

comment:483 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 387f192097b967b1d57e2d8caa22bbb68c1f444a

comment:484 Changed 8 years ago by Alex Buts

refs #5336 Added Energy transfer analysis helper

which describes possible energy transfer modes, which can be supported by an Q-converter

Changeset: 585c10e2e03eb78fb2af7fe3f68a2e5d11b7a723

comment:485 Changed 8 years ago by Alex Buts

refs #5336 Started separating Q-transf

Changeset: 2aaa045366d6bd20024697c4b31af4dd2bfcac8c

comment:486 Changed 8 years ago by Alex Buts

refs #5336 TransfModQ compiles

Changeset: 0303a1488254081fe656daa369d7e7f39d26ea4f

comment:487 Changed 8 years ago by Alex Buts

refs #5336 MDTransfFactory works and can be subscribed to

Changeset: 6a59f76cc52d8c9c8d3e086b526d07699b40430b

comment:488 Changed 8 years ago by Alex Buts

refs #5336 Workspace base class and two ws kinds are refactored.

Changeset: b6355e2d4fb4c9744f1868cdfe506a7e67b472eb

comment:489 Changed 8 years ago by Alex Buts

refs #5336 Elastic and inelastic cases combined into single class

Changeset: 8e65c7e5360ffcc414630707dfcabc17e0afebc2

comment:490 Changed 8 years ago by Alex Buts

refs #5336 Moved all conversion into MDAlgorithms

To avid problems with conversionFactory location in different build unit (dll)

Changeset: b9e6fcc85d46cc026cf6ec16682b2db0f133f9bb

comment:491 Changed 8 years ago by Alex Buts

refs #5336 Moved conv code back to MDEvents

As it looks like it better fits there.

Changeset: 71abb7e48bf3d761cd42c8e2515133fd4b748673

comment:492 Changed 8 years ago by Alex Buts

refs #5336 Renamed all Conversion to MDEvent namespace

Changeset: 00c2051a1aa69d889bfe3c27f065738b80388064

comment:493 Changed 8 years ago by Alex Buts

refs #5336 mering remote (correct) vfun branch with local

Merge branch 'vfun-convToMD' of https://github.com/mantidproject/mantid into vfun-convToMD

Conflicts:

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp Code/Mantid/Framework/MDAlgorithms/test/ConvertEventsToMDEventsTest.h Code/Mantid/Framework/MDEvents/CMakeLists.txt Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsBase.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsEvents.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ConvToMDEventsHisto.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfInterface.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfModQ.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDTransfQ3D.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSDescription.h Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDWSTransform.h Code/Mantid/Framework/MDEvents/src/ConvToMDEventsHisto.cpp Code/Mantid/Framework/MDEvents/src/MDEventWSWrapper.cpp Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp Code/Mantid/Framework/MDEvents/src/MDWSTransform.cpp Code/Mantid/Framework/MDEvents/test/MDWSTransfDescrTest.h

Changeset: 4ae9113bc0d3ac4cf312abbd9e9ed429211fd9a3

comment:494 Changed 8 years ago by Alex Buts

refs #5336 Minor problem after merge fixed

Changeset: ae5afd10dca996b45024e64d68c8fd1777a5af3b

comment:495 Changed 8 years ago by Alex Buts

refs #5336 gitignore configured

Changeset: d089246eeddc4ec1693b3e6a5598159c7b90dc90

comment:496 Changed 8 years ago by Alex Buts

refs #5336 Fixing Unix error

Changeset: 3bfb029e3d39bbc2ecf975f4c3e5bc83bbfa13ec

comment:497 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warning

Changeset: 4439e480ebe3aefc73d0f128b18969fb024dd33f

comment:498 Changed 8 years ago by Alex Buts

refs #5336 Fixing unix error with transfTest

Changeset: 301a944e2a626e2c4a7ff7af51c63e7cba0fd4d0

comment:499 Changed 8 years ago by Alex Buts

refs #5336 fixing MDEventWSWrapperTest.h error

Changeset: 2dc05c0876dbeb65da495a60c21c42fa89fd8f51

comment:500 Changed 8 years ago by Alex Buts

refs #5336 Trying to get around MAC error

with defining static number of dimensions

Changeset: c22f543d1f4ad25aa48ad74b833afd1be8146155

comment:501 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix error with enum

Changeset: 06212cefe6f038b7f98793a670f645f97279403e

comment:502 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings

Changeset: 698c78809647e36f3f1e1939324aea461ba1e695

comment:503 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warnings in ConvToMDEventsEvents.h

Changeset: 711e0e70c315723fe5673a7fb6461265dc6f2692

comment:504 Changed 8 years ago by Alex Buts

refs #5336 fixing Unix warning about construction order.

Changeset: a6f8565c12839fab6fbf8fad64bb55f187203398

comment:505 Changed 8 years ago by Alex Buts

refs #5336 some comments and little niceness

Changeset: e3690422a967043d7f3f7b25e89383b13c5e903e

comment:506 Changed 8 years ago by Alex Buts

refs #5336 appropriate tests moved to MDEvents

Changeset: 4210d8ef9b6dcb63937cb25e215062be0e3d9c19

comment:507 Changed 8 years ago by Alex Buts

refs #5336 moved tests to appropriate places

Changeset: beb7c83ba731fc0c70bb964d8d012fb1cd892172

comment:508 Changed 8 years ago by Alex Buts

refs #5336 Additional comments

Changeset: 09f9ae1f3afe571278c4dd1b4d9abfe6a134e8fb

comment:509 Changed 8 years ago by Alex Buts

It works like md events factory but do its job very slowly.

The structure of the code was discussed on meeting and further description is pending according to ticket #5656

comment:510 Changed 8 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:511 Changed 8 years ago by Martyn Gigg

  • Status changed from verifying to closed

Confirmed that the code has been refactored and there are performance issues that are to be addressed.

comment:512 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 6182

Note: See TracTickets for help on using tickets.