Ticket #6577 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Update scripts to api v2: Reduction GUI

Reported by: Nick Draper Owned by: Jean Bilheux
Priority: blocker Milestone: Release 2.6
Component: Python Keywords: Maintenance
Cc: Blocked By:
Blocking: #7240, #7242 Tester: Russell Taylor

Description (last modified by Nick Draper) (diff)

There are still a reference in a file or two, ask Martyn if you have trouble fining them.

Owen and Martyn are the others doing this work.

Change History

comment:1 Changed 8 years ago by Mathieu Doucet

Re #6577 Remove APIv1 from reduction UI

Changeset: 36ac8f80ba97c542015e1705d3712b25a8e3b972

comment:2 Changed 8 years ago by Mathieu Doucet

  • Status changed from new to accepted

This is completed. To verify, search for API v1 Mantid imports for code under the "scripts/Interface" directory.

Note that to make the transition to API v2 as smooth as possible, the old SANS reduction scripts are still being generated by the UI. The UI itself doesn't use API v1 anymore. The API v1 reduction scripts will be phased out over the next few months.

comment:3 Changed 8 years ago by Mathieu Doucet

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

comment:4 Changed 8 years ago by Gesner Passos

  • Status changed from verify to verifying
  • Tester set to Gesner Passos

comment:5 Changed 8 years ago by Gesner Passos

  • Status changed from verifying to reopened
  • Resolution fixed deleted

I found that these scripts are still import mantidsimple

reduction/inelastic/dgs_utils.py
widgets/reflectometer/refm_reduction.py
widgets/reflectometer/refl_reduction.py
widgets/reflectometer/base_ref_reduction.py
widgets/reflectometer/refl_sf_calculator.py
widgets/reflectometer/stitcher.py
widgets/reflectometer/launch_peak_back_selection_1d.py
widgets/reflectometer/refl_data_simple.py
widgets/sans/eqsans_output.py

And I found expressions like: mtd.deleteWorkspace - that belongs to the old api

These things should still be around?

comment:6 Changed 8 years ago by Mathieu Doucet

Re #6577 removing unused file

Changeset: f965241ad2fe184aa6aad50b2eebd6ce71d616ac

comment:7 Changed 8 years ago by Mathieu Doucet

  • Status changed from reopened to assigned
  • Owner changed from Mathieu Doucet to Jean Bilheux

I removed widget/sans/eqsans_output.py which was no longer used. I'm giving the ticket to Jean so he can take over the refactoring of the reflectometry UI.

Note that UIs may generate scripts using the old API. That is still allowed while we refactor the old reduction scripts to use the new API.

comment:8 Changed 8 years ago by Mathieu Doucet

Re #6577 Move dgs_utils.py to API v2

Changeset: 08cd5a97d56beb0ab4aaa9f86225c8e4eff7d697

comment:9 Changed 8 years ago by Jean Bilheux

Started to move REFL reduction GUI to new API. This refs #6577

Changeset: 5bbae4a50708dd97c878139030b054e1d01b88e5

comment:10 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.5 to Release 2.6

Moved to r2.5

comment:11 Changed 7 years ago by Nick Draper

  • Keywords Maintenance added

comment:12 Changed 7 years ago by Mathieu Doucet

  • Blocking 7240 added

comment:13 Changed 7 years ago by Mathieu Doucet

  • Blocking 7242 added

comment:14 Changed 7 years ago by Jean Bilheux

Worked mainly on sfCalculator. This refs #6577

Changeset: bf341994ea58cded8623c9cc79c7d9951f50d44e

comment:15 Changed 7 years ago by Jean Bilheux

Implemented RefLview which is now using the new API. This refs #6577

Changeset: feff2a6c8f47d995b586be59faebcdb0e5ee0c5a

comment:16 Changed 7 years ago by Jean Bilheux

Fixed issue in the sfCalculator algorithm. This refs #6577

Changeset: 077daaddd3d3dd4fa58ee4dc4892a09bfb236f94

comment:17 Changed 7 years ago by Jean Bilheux

Added new sfCalculator. this refs #6577

Changeset: 8d81b74e7969599e67d8982a4b811a8fd87d7266

comment:18 Changed 7 years ago by Jean Bilheux

Moved by error my code to the wrong place. This refs #6577

Changeset: 542c52488b30f25325eb1d8f3e6b0ef10d641bce

comment:19 Changed 7 years ago by Jean Bilheux

Addd new location of old file but using new API. Work still in progrss. This refs #6577

Changeset: 3e6cb63ba25f4844dab2a2a91f4eb87c530a5691

comment:20 Changed 7 years ago by Jean Bilheux

Modified script called. This refs #6577

Changeset: 1ca82a381196012c3096837be20495b0eb289bb7

comment:21 Changed 7 years ago by Jean Bilheux

Added code to debug issue with develop version not working as expected. This refs #6577

Changeset: 8be21e05b27e564eae6065119b7e120e2ec63816

comment:22 Changed 7 years ago by Jean Bilheux

Changed output file path for debugging. This refs #6577

Changeset: 865affd3b9975c7b99a133649948fba488165fcb

comment:23 Changed 7 years ago by Jean Bilheux

Modified test files. This refs #6577

Changeset: 0144cfa626ed47a1e3f2e64990c12a59bf8b79d6

comment:24 Changed 7 years ago by Jean Bilheux

Reverse changes. This refs #6577

Changeset: 72d43af57fec884bc2d0b1ac33a2e12e07494374

comment:25 Changed 7 years ago by Jean Bilheux

Reverse changes. This refs #6577

Changeset: 40481d98661d66ff12935c2962669190d0e401bc

comment:26 Changed 7 years ago by Jean Bilheux

Fixed issue with algorithm. I need to test now the algorithm on the development version. This refs #6577

Changeset: 1e89637e12a8ec145b35b016aee22491d9ba7d88

comment:27 Changed 7 years ago by Jean Bilheux

Forgot to change the name of the debug output file. This refs #6577

Changeset: b9c5e08df99dba5baccadf0ba0f70673e9ba20af

comment:28 Changed 7 years ago by Jean Bilheux

Replaced Mantid code by pure python. This refs #6577

Changeset: f313cb532191a05c8dbf84836bc831f5ea57d112

comment:29 Changed 7 years ago by Jean Bilheux

Changed the way some of the calculation of the final product object were done. This refs #6577

Changeset: 6a8c1a77a20f2133bcb599825d54ea1724b7e7da

comment:30 Changed 7 years ago by Jean Bilheux

Make sure there are no divisions by 0. This refs #6577

Changeset: d0bdaa705b476506c2758e3a6727b3ee1a38496c

comment:31 Changed 7 years ago by Jean Bilheux

Finally fixed issue with output different on different machines. Will need deployed testing though. This refs #6577

Changeset: c7ce6f8333de4c73b8161327021f2a462ff60be5

comment:32 Changed 7 years ago by Jean Bilheux

  • Status changed from assigned to accepted

comment:33 Changed 7 years ago by Jean Bilheux

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

comment:34 Changed 7 years ago by Mathieu Doucet

Move to new API of reflectometry UI will be completed in #7404

comment:35 Changed 7 years ago by Gesner Passos

  • Status changed from verify to verifying

comment:36 Changed 7 years ago by Gesner Passos

  • Status changed from verifying to verify
  • Tester Gesner Passos deleted

I'm affraid I'm not able to test this ticket. The changes are by far more extend than the translation from the old api to the new api. So, more than checking that it correctly avoid the usage of the old api, it is necessary to test that everything is working as fine as it used to do. And for this kind of test, I do not know how to do. I think it would be better tested by someone that knows better the interface and its usage.

comment:37 Changed 7 years ago by Nick Draper

  • Component changed from Mantid to Framework

comment:38 Changed 7 years ago by Nick Draper

  • Component changed from Framework to Python API
  • Description modified (diff)

comment:39 Changed 7 years ago by Russell Taylor

Revert "Re #6577 Move dgs_utils.py to API v2"

I'm reverting this commit because (a) it really has nothing to do with the rest of this ticket & (b) the changes don't work. This file will instead be migrated under dedicated ticket #7547. This reverts commit 08cd5a97d56beb0ab4aaa9f86225c8e4eff7d697.

Changeset: e1b5fe84179251494f9aeef6a91ae430c68af61c

comment:40 Changed 7 years ago by Russell Taylor

  • Status changed from verify to verifying
  • Tester set to Russell Taylor

comment:41 Changed 7 years ago by Russell Taylor

Re #6577. Revert changes to sfCalculator.py under this ticket.

This is the sfCalculator found in scripts/LargeScaleStructures/ScalingFactorCalculation/. It was already migrated to the v2 API under a different ticket (#6576).

This partially reverts commit bf341994ea58cded8623c9cc79c7d9951f50d44e.

Changeset: b1965465321460bd67a0bd702342806c41dd8f21

comment:42 Changed 7 years ago by Russell Taylor

Re #6577. Python algorithm location has moved since branch started.

Changeset: 9f7ad92713a19708118d2a4702ba73d4fca4ba41

comment:43 Changed 7 years ago by Russell Taylor

Re #6577. Update algorithm subscription call.

Changeset: 9a192e039edccdaa5e76bddd1fcd56b384b9081b

comment:44 Changed 7 years ago by Russell Taylor

Re #6577. Remove commented out imports.

Will avoid clutter when we're searching for the final remaining imports of the old API in the codebase.

Changeset: e3a483cdd6d870aa6c2f074b45c16ec5b8f336ab

comment:45 Changed 7 years ago by Russell Taylor

Re #6577. Remove first attempted port to v2 API.

This algorithm was partially ported to v2 but the old version was left in place and is picked up first. This one still needs more done to make it work with v2 so the work will be started over under #7404.

Changeset: f97d592efab65f23fd182a6f931563c2de397398

comment:46 Changed 7 years ago by Russell Taylor

Re #6577. Trying to fix develop.

This file has gone missing on develop for some reason, though only some build servers appear to care.

Changeset: c1549bf2c3a45561064fec744eb508383aeb3013

comment:47 Changed 7 years ago by Russell Taylor

Re #6577. The algorithm doesn't even use the sfCalculator module

...that certain windows buildservers are complaining about.

Changeset: e8c34347f91538bf9272a384c3800eb4788587ab

comment:48 Changed 7 years ago by Jean Bilheux

  • Status changed from verifying to closed

Merge branch 'feature/6577_reduction_gui' of https://github.com/mantidproject/mantid into feature/6577_reduction_gui

comment:49 Changed 7 years ago by Russell Taylor

There's still plenty to be done here (mostly under #7404), but what was here at least seems to be working.

I created a ticket #7576 concerning the fact that multi-run processing was removed from RefLview, but the documentation still speaks of it. The fact that the version that was previously in master appeared not to work meant that this is still a step forward.

comment:50 Changed 7 years ago by Russell Taylor

Re #6577. The algorithm doesn't even use the sfCalculator module

...that certain windows buildservers are complaining about.

Changeset: 6f6567a97efd428f06775f82d4b518b28b36763e

comment:51 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 7423

Note: See TracTickets for help on using tickets.