Ticket #10681 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Implement generic ISIS reduction wrapper, which would work both through web services and directly from Mantid

Reported by: Alex Buts Owned by: Alex Buts
Priority: major Milestone: Release 3.3
Component: Direct Inelastic Keywords:
Cc: ian.bush@… Blocked By: #10532
Blocking: #10684, #10708 Tester: Ian Bush

Description

The prototype is already there, in #10532 branch, but it is not nice and tidy as number of properties have to be set manually for it to work.

It is also not unit/system tested.

This ticket to rewrite existing prototype in proper OO way and modify system tests to accept& verify the changes.

Change History

comment:1 Changed 6 years ago by Alex Buts

Re #10681 Nice ReductionWrapper and initial code to test it.

Changeset: 3d2d8d84fd9f88c13ebc1d0f925c2a34267577e0

comment:2 Changed 6 years ago by Alex Buts

  • Blocking 10684 added

comment:3 Changed 6 years ago by Alex Buts

Re #10681 Advanced properties removed from DirectReductionProperties

Changeset: 544b435698e0d92701a6ed0022fe0a26eac16b60

comment:4 Changed 6 years ago by Alex Buts

Re #10681 Test for ReductionWrapper

Changeset: 88671803308376c53c7adc3e22b2977fba65be17

comment:5 Changed 6 years ago by Alex Buts

Re #10681 Initial commit. Mari Reduction wrapped (almost)

Changeset: 4880167b79fbe5a6e626c2b07e6919e4f2dbc9cf

comment:6 Changed 6 years ago by Alex Buts

Re #10681 Fully extracted Mari Reduction

and system tests work fine.

Changeset: ba269e21af3a4bc15da76c5b5301c268c2a8b086

comment:7 Changed 6 years ago by Alex Buts

Re #10681 Modified MAPS system test

Changeset: 4f2181698384d26b08c32e6c8421ab6144b1f774

comment:8 Changed 6 years ago by Alex Buts

Re #10681 Merlin system test moved to redWrapper

Changeset: 4beaea0a40edc76412cf6d0b9ba6aa425bf6861b

comment:9 Changed 6 years ago by Alex Buts

Re #10681 Minor comments and bugs found while changing system tests

Changeset: 042119f54361c8c9db0152bb00b4a4bef6c71fb5

comment:10 Changed 6 years ago by Alex Buts

Re #10681 Minor bug when assigning range of incident energies

Changeset: 46d5d1692bc4e7b9bd93855048d04d96eaea4157

comment:11 Changed 6 years ago by Alex Buts

Re #10681 Disabled old interface test

as it does not work and should not but let's sit here for a future reference

Changeset: e4c67e4c05e69fa1aad0f6856c590254a7541c7e

comment:12 Changed 6 years ago by Alex Buts

Re #10681 Minor bugs in setting energy list.

Changeset: 57ec9f332d9212fb1d8ccd488d1aa47315c23910

comment:13 Changed 6 years ago by Alex Buts

Re #10681 Converted Let single rep

Changeset: 6cd27d721b6202cecdf886a24c9d1026ccd051c7

comment:14 Changed 6 years ago by Alex Buts

Re #10681 Converted LET reduction to reduction wrapper

Changeset: e801f90a7b3e9a18766d6b84691ee14d8fe0fa05

comment:15 Changed 6 years ago by Alex Buts

Re #10681 Minor comments

Changeset: f2d18c177ff337add04fb5bb6a9e52d329fb60ff

comment:16 Changed 6 years ago by Alex Buts

  • Status changed from new to assigned
  • Milestone changed from Backlog to Release 3.3

The changes are both in Mantid and System test folder (though system tests will work both with and without these changes)

There is small wrapper around ISIS reduction, which would work from Mantid, System Tests and Web services without any changes.

Web services implementation is a bit dodgy, as used properties from the script have to be copied manually to web service and I do not believe, it is actually necessary. But this is the question to web services.

The Inelastic system tests were rewritten using this wrapper and it works. Also it works in similar way from Mantid, so all this looks nice and tidy. Will see what instrument scientists would say.

Testing with web services is also necessary but this will be separate issue.

comment:17 Changed 6 years ago by Alex Buts

  • Cc ian.bush@… added

comment:18 Changed 6 years ago by Alex Buts

  • Blocked By 10532 removed

comment:19 Changed 6 years ago by Alex Buts

  • Status changed from assigned to verify
  • Resolution set to fixed

comment:20 Changed 6 years ago by Alex Buts

  • Blocked By 10532 added

comment:21 Changed 6 years ago by Alex Buts

Re #10681 Merged changes from branch #10532

Merge remote-tracking branch 'remotes/origin/feature/10532_separatePropertyManager' into feature/10681_RedWrapper

Conflicts:

Code/Mantid/scripts/Inelastic/DirectReductionProperties.py

Changeset: 239da8088b283bc3868cb2a8ba9938758ccb2eaf

comment:22 Changed 6 years ago by Ian Bush

  • Status changed from verify to verifying
  • Tester set to Ian Bush

comment:23 Changed 6 years ago by Alex Buts

Re #10681 Minor comments

Changeset: d191f58463d6f5cc13349289339595797bd2bd1e

comment:24 Changed 6 years ago by Alex Buts

  • Blocking 10708 added

comment:25 Changed 6 years ago by Alex Buts

Re #10681 Added python tests to CMakeLists.txt to run by make

Changeset: 6717c624616976bb7c4617b0e9082f051b9b9d14

comment:26 Changed 6 years ago by Alex Buts

Re #10681 Should fix unit test dependency on system test file

Changeset: a08fd0273d4ef797ba44f5a78252cb374ac30220

comment:27 Changed 6 years ago by Alex Buts

Re #10681 Fixed unit tests fixed locally a while ago.

Changeset: 246909fb4d6467ba6450770403d343cac2b8a212

comment:28 Changed 6 years ago by Alex Buts

Re #10681 Fixed old RHEL 6 python difference

Changeset: e083616e352140d5cf4f704700c639a63e6259f3

comment:29 Changed 6 years ago by Alex Buts

  • Status changed from verifying to closed

Merge branch 'master' into feature/10681_RedWrapper

Full changeset: 87c180fdea0cf7e428737e7b51e44fe7ece333fb

comment:30 Changed 6 years ago by Ian Bush

Merge remote-tracking branch 'origin/feature/10681_RedWrapper'

Full changeset: 0aad34d0d9deca7e9cbd618a91f163872864719b

comment:31 Changed 6 years ago by Ian Bush

Merge remote-tracking branch 'origin/feature/10681_RedWrapper'

Full changeset: ae2a77e07e40323bce176bb583827034b213c47e

comment:32 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 11523

Note: See TracTickets for help on using tickets.