Ticket #10803 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Move direct inelastic scripts into separate package

Reported by: Alex Buts Owned by: Alex Buts
Priority: major Milestone: Release 3.4
Component: Direct Inelastic Keywords:
Cc: Blocked By: #10676
Blocking: #10836 Tester: Ian Bush

Description

It become too big and too many classes are located in single file

Change History

comment:1 Changed 6 years ago by Alex Buts

Re #10803 Just moved all direct into separate folder

And all seems works fine.

Changeset: f26b349a361cb0a0b622ddb51092a9854056320f

comment:2 Changed 6 years ago by Alex Buts

Re #10803 Adding missing file (and test failing because of that)

Changeset: ebf48d55ce29482621aaf68905cc8c040c6f9663

comment:3 Changed 6 years ago by Alex Buts

Re #10803 Committed ReductionWrapperTest modified properly

Changeset: 58768ab39773f8fc956a983e66c4883a6eeadcf8

comment:4 Changed 6 years ago by Alex Buts

Re #10803 Modified ISIS tests to understand new package location

Changeset: bc72d9bb7775b5f46740732cdd95b8a1e86e9e0e

comment:5 Changed 6 years ago by Alex Buts

Re #10803 Tests with new package location

Changeset: 7b18ebf63e70a9b8b80e8c113c707f7d3c2721c6

comment:6 Changed 6 years ago by Alex Buts

Re #10803 Renamed DirectReductionHelpers into ReductionHelpers

as they are in Direct folder now.

Changeset: c0a5d834339689f1ab427ca3dc7068001010d4d9

comment:7 Changed 6 years ago by Alex Buts

Re #10803 Simplified naming for all classes involved

(e.g. removed Direct from almost all classes as they are in Direct folder anyway)

Changeset: 4824234497b9cfeb03f5cd81eed18b8474239f92

comment:8 Changed 6 years ago by Alex Buts

Re #10803 fixing broken links in system tests

Changeset: b6497e8b9f3cee8f9ab644853fa98e2eb342a846

comment:9 Changed 6 years ago by Alex Buts

Re #10803 Comments and removed outdated pieces of code

Changeset: c2016f5c4188814e540788f9238e3a5a44d87c89

comment:10 Changed 6 years ago by Alex Buts

Re #10803 Changes to Direct GUI due to move direct scripts to Direct

Changeset: 10d9b9daf938949ab5ba43f2865d06ab9bcf28ba

comment:11 Changed 6 years ago by Alex Buts

  • Status changed from new to assigned

Changes are both in system tests and Mantid branches.

There no changes to code and functionality -- just moved code from inelastic to inelastic/Direct folder, renamed some files and links to these files, and deleted bits of outdated and unused code.

The code is verified by numerous tests so if system tests and unit tests are passing, one can believe that all changes are made properly.

No much to test here.

comment:12 Changed 6 years ago by Alex Buts

  • Blocked By 10676 removed

comment:13 Changed 6 years ago by Alex Buts

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

comment:14 Changed 6 years ago by Alex Buts

  • Blocked By 10676 added

comment:15 Changed 6 years ago by Alex Buts

Test only after 10676 is merged to master

comment:16 Changed 6 years ago by Alex Buts

Re #10803 Fixing error which has been already fixed

(and changes to wrapper decorators, allowing nice error reporting)

Changeset: 09be7146363b9bda57a4dc71367a942240ca8ca4

comment:17 Changed 6 years ago by Alex Buts

Re #10803 Brought changes to properties from #10817

Changeset: 32daa2e8ff8b59e6b7a90bb7ec0a13760f6c412e

comment:18 Changed 6 years ago by Alex Buts

Re #10803 resolving conflicts with #10817

Merge branch 'bugfix/10817_errorHardmaskPlus' into feature/10803_DirectInelasticPack

Conflicts:

Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py

Changeset: 5e90371c4076c813d25d817f225dde71f488c9fc

comment:19 Changed 6 years ago by Alex Buts

Re #10803 Minor bug in EnergyBins

Changeset: 6052848c43df06c330f3340d3bb1a696aa7c67f2

comment:20 Changed 6 years ago by Alex Buts

Re #10803 unit test for ebin bug

Changeset: 12f85a997828b4a4ae77f80d9ddd8ffbe7b75919

comment:21 Changed 6 years ago by Alex Buts

Re #10803 Unit test that dgreduce still works

Changeset: f207f0dcb96d1c05d40858dbc7e131a6de7f5e83

comment:22 Changed 6 years ago by Alex Buts

  • Milestone changed from Release 3.4 to Release 3.3

I still think this should go to release as no much changes here, but couple of minor but annoying bugs (necessary in particular to test #10830 are fixed) and bunch of unit tests to verify them is written

comment:23 Changed 6 years ago by Alex Buts

  • Blocking 10836 added

comment:24 Changed 6 years ago by Martyn Gigg

  • Milestone changed from Release 3.3 to Release 3.4

comment:25 Changed 6 years ago by Alex Buts

Re #10803 Merging it back to develop as system tests do depend on it

Merge branch 'feature/10803_DirectInelasticPack' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py

Changeset: c2bceaae3db4c41872a6fec4901122f527e713dd

comment:26 Changed 6 years ago by Alex Buts

Re #10803 Just moved all direct into separate folder

And all seems works fine.

Changeset: 63aab0fd8f42d654f2fbe5876b21f7ae8b092187

comment:27 Changed 6 years ago by Alex Buts

Re #10803 Adding missing file (and test failing because of that)

Changeset: e5d158bf50d8ddf371a2242c64dab4fa0fc59db4

comment:28 Changed 6 years ago by Alex Buts

Re #10803 Committed ReductionWrapperTest modified properly

Changeset: 044e8338cb1b65bb72c3f199aaf17c0d08171013

comment:29 Changed 6 years ago by Alex Buts

Re #10803 Tests with new package location

Changeset: 5823ffcff8fad75967f20a31677f5ebaee8f9709

comment:30 Changed 6 years ago by Alex Buts

Re #10803 Renamed DirectReductionHelpers into ReductionHelpers

as they are in Direct folder now.

Changeset: 244ceaba7d252a874a5f166e3715695221567d40

comment:31 Changed 6 years ago by Alex Buts

Re #10803 Simplified naming for all classes involved

(e.g. removed Direct from almost all classes as they are in Direct folder anyway)

Changeset: f69e8f29d2055d3edf03042ae70ac00048d06fee

comment:32 Changed 6 years ago by Alex Buts

Re #10803 Comments and removed outdated pieces of code

Changeset: 92617bcd8a5d111b0c8ffe40272494d133a9cb5e

comment:33 Changed 6 years ago by Alex Buts

Re #10803 Changes to Direct GUI due to move direct scripts to Direct

Changeset: 14bd88b3a941cb64e7d09dc42c7df5df9a076f2f

comment:34 Changed 6 years ago by Alex Buts

Re #10803 Fixing error which has been already fixed

(and changes to wrapper decorators, allowing nice error reporting)

Changeset: 06d39c06ee73b5a4adfe3c93b825cbf6b6dd1a8a

comment:35 Changed 6 years ago by Alex Buts

Re #10803 Brought changes to properties from #10817

Changeset: 8836c578ab3155b719b2dfe7012ab48760d6907e

comment:36 Changed 6 years ago by Alex Buts

Re #10803 Minor bug in EnergyBins

Changeset: 844131601bd27de562728d4e73bfcf6afac761f4

comment:37 Changed 6 years ago by Alex Buts

Re #10803 unit test for ebin bug

Changeset: 5aa026744ec8eed5838e9ffed12911f7b33a4c6a

comment:38 Changed 6 years ago by Alex Buts

Re #10803 Unit test that dgreduce still works

Changeset: 943d22a8f2786700c1f0d7a4c839b0807eee0320

comment:39 Changed 6 years ago by Alex Buts

Re #10803 fixing merge errors

Changeset: 7bd361a5f59ab11228584c2c82d5381e22e7cb92

comment:40 Changed 6 years ago by Alex Buts

No changes to the ticket from the moment when it was fixed. Just because of complex merge conflicts with current master, data rebased to master to simplify history and conflicts resolution. This is the reason for duplicated commit messages.

comment:41 Changed 6 years ago by Alex Buts

  • Blocking 10836 removed

comment:42 Changed 6 years ago by Alex Buts

  • Blocking 10836 added

comment:43 Changed 6 years ago by Ian Bush

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

comment:45 in reply to: ↑ 44 Changed 6 years ago by Alex Buts

Replying to Martyn Gigg:

Something has broken the system tests - http://builds.mantidproject.org/job/develop_systemtests_rhel6/lastCompletedBuild/testReport/SystemTests/ISISDirectInelastic/LETReduction

I do not see it picking up correspondent changes to develop. As soon as develop was build it should be fine. The only question is why only one test was broken. Let's wait for develop to complete.

Last edited 6 years ago by Alex Buts (previous) (diff)

comment:46 Changed 6 years ago by Martyn Gigg

It's still failing and also from the clean builds so I think it is a genuine problem - http://builds.mantidproject.org/view/Develop%20Builds/job/develop_systemtests_all/lastCompletedBuild/testReport/

comment:47 Changed 6 years ago by Ian Bush

All unit and system pass fine, and this is mostly just reorganisation. On Martyn's advice I'll wait until the system tests pass cleanly again before accepting.

comment:48 Changed 6 years ago by Ian Bush

System tests seem to be failing for SystemTests.ISISDirectInelastic.LETReductionEvent2014Multirep on Windows 7 and Ubuntu 14.04, although not locally when I tested on Ubuntu 14.04 (this is likely because it does not run locally, as the memory required is 20 GB).

Last edited 6 years ago by Ian Bush (previous) (diff)

comment:49 Changed 6 years ago by Ian Bush

  • Status changed from verifying to reopened
  • Resolution fixed deleted

comment:50 Changed 6 years ago by Alex Buts

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

It successfully passes on my machine

it was also passing on RHEL:

http://builds.mantidproject.org/job/develop_systemtests_rhel6/1001/testReport/SystemTests/ shows that it had run and succeeded.

http://builds.mantidproject.org/view/Develop%20Builds/job/develop_systemtests_all/296/#showFailuresLink

fails due to the unrelated problem with LoadEventNexus Frederico have fixed earlier.

The failure is due to my current ticket which I am working on.

comment:51 Changed 6 years ago by Ian Bush

  • Status changed from verify to verifying

comment:52 Changed 6 years ago by Ian Bush

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/10803_DirectInelasticPack'

Full changeset: 63e7d676a757657f0de7878099744a9e9d250480

comment:53 Changed 6 years ago by Alex Buts

Merge branch 'master' into feature/10803_DirectInelasticPack

Full changeset: ab520079ff2accd5e136736b0c9bf519ce6086ff

comment:54 Changed 6 years ago by Ian Bush

Merge remote-tracking branch 'origin/feature/10803_DirectInelasticPack'

Full changeset: bd78a4b68f3e0fb0fd43247c425e72373b1946f5

comment:55 Changed 5 years ago by Nick Draper

  • Component changed from Framework to Direct Inelastic

comment:56 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 11645

Note: See TracTickets for help on using tickets.