Ticket #8372 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Quick to Lam

Reported by: Owen Arnold Owned by: Owen Arnold
Priority: critical Milestone: Release 3.1
Component: Reflectometry Keywords:
Cc: Blocked By:
Blocking: #8371 Tester:

Description (last modified by Owen Arnold) (diff)

quick.py has a toLam function. We need to convert the entire of quick to an algorithm (#8371). This is best done bottom-up, which means converting toLam to an algorithm first or refactoring it out to a separate module

This should be quite safe to do, as I've already provided test coverage for the quick scripts.

toLam is a horrible function, and should definitely be refactored in the process of moving it anywhere.

Attachments

ReflectometryQuick.py (1.1 KB) - added by Owen Arnold 7 years ago.

Change History

comment:1 Changed 7 years ago by Owen Arnold

  • Status changed from new to inprogress

refs #8372. Module with tests

Changeset: 6e0996b7b56f1b22d5dd3c7142ade19d9971802c

comment:2 Changed 7 years ago by Owen Arnold

refs #8372. Use crop_range in convert method.

Changeset: 3124ae4c69588b5e204123094f8f514d00eb1f9e

comment:3 Changed 7 years ago by Owen Arnold

refs #8372. Fix actual error in existing code

Changeset: 5e04189146b53cc829a748dd50fa663f6031671c

comment:4 Changed 7 years ago by Owen Arnold

refs #8372. Fix reference results due to exising bug

Changeset: 7c8a11edef3495531af90a892e077abfa06c4168

comment:5 Changed 7 years ago by Owen Arnold

refs #8372. Replace first instance of tolam as trial.

Changeset: ee6fadd96dc61afe278ff923664d04e8b1ba5572

comment:6 Changed 7 years ago by Owen Arnold

refs #8372. Refactor out many mtd dictionary usages.

Changeset: 04c9957b24f2820e58df2ad1cc38741344aa05e4

comment:7 Changed 7 years ago by Owen Arnold

refs #8372. Remove more key string parameters.

The script is littered with these. Will take more work to get rid of them all.

Changeset: ed15769a7e82a8d2d683f82573e141b8b509cd64

comment:8 Changed 7 years ago by Owen Arnold

refs #8372. Factor out coAdd

I'm leaving coAdd in the script for now, although the new convert_to_wavelength code will actually do the job of this code. coAdd actually does a lot of different and bizarre things in a single method, including StartLiveData, which is not yet converted by convert_to_wavelength as the current implementation of coAdd requires 'magic' decision making depending upon the type and format of the 'run' argument as well as the current state of the ADS etc.

Changeset: dbbdd4c8ba2bcc5f0e752c91b356448c12a0e4b1

comment:9 Changed 7 years ago by Owen Arnold

refs #8372. Partition off IDF default fetching

Minor modifications also required to convert_to_wavelength.

Changeset: 102fd48e221cbb2cec65412d22bc3667a7d9f634

comment:10 Changed 7 years ago by Owen Arnold

refs #8372. Replace transcorr logic.

Start replacing transmission correction logic with more distilled version.

Changeset: 0619dfc701d65a207ad9c79adc7ab6558122aabe

comment:11 Changed 7 years ago by Owen Arnold

refs #8372. Refactor transmission correction code.

Simplify and remove ADS usages.

Changeset: 9e5a01d6d5c567d6414f36631a4c6d87668d9f15

comment:12 Changed 7 years ago by Owen Arnold

refs #8372. Remove to lam function as no longer required.

Some other refactoring work here around the multi detector quick routes.

Changeset: 6170572b6a9972680729768d09e9ab35123edfb6

comment:13 Changed 7 years ago by Owen Arnold

refs #8372. Fix trans correction for one run.

Changeset: 92de82c3e575fa36478620ac31e77b6c3e9815aa

comment:14 Changed 7 years ago by Owen Arnold

refs #8372. Enable clean-up

This is only necessary while quick and auxiliary modules are scripts. This will change in the near future.

Changeset: afa684775417b670b46d0a2ecaea20585bd7c7d0

comment:15 Changed 7 years ago by Owen Arnold

refs #8372. Assert method not supported

Use assertTrue instead.

Changeset: 98a47521ee990230ab491536c37287f4aaf3fee9

comment:16 Changed 7 years ago by Owen Arnold

refs #8372. Replace other assert method

This assert method is not supported cross platform.

Changeset: d196161f0a723ace8dc54971c4be327d51a072df

comment:17 Changed 7 years ago by Owen Arnold

refs #8372. Old tests no longer work.

Old tests checked things like coAdd. These are no longer required.

Changeset: c993577949b492c965a3ff7d7f2611b5803c04c7

comment:18 Changed 7 years ago by Owen Arnold

  • Priority changed from blocker to critical
  • Blocking 8371 added
  • Description modified (diff)
  • Blocked By 8371 removed
  • Summary changed from Direct development of new Reflectometry GUI to Quick to Lam

comment:19 Changed 7 years ago by Owen Arnold

refs #8372. Remove unused test file.

Changeset: 812f9dbe2f86fb06eb52f5931e83a2e27707dcf8

comment:20 Changed 7 years ago by Owen Arnold

Tester, there are a lot of code changes here, so it's probably going to be tricky to look through them all. Here's what I suggest for testing.

  • Ensure that all new unit tests are passing
  • Ensure system tests are passing
  • Run the attached script which should produce a curve of I vs Q for two stiched workspaces using quick.py. This in turn calls the tolam type functionality.

Changed 7 years ago by Owen Arnold

comment:21 Changed 7 years ago by Owen Arnold

Note that for the attached script above. the standard result is in the reference results directory of the analysistests directory of the system tests.

comment:22 Changed 7 years ago by Owen Arnold

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

comment:23 Changed 7 years ago by Gesner Passos

  • Status changed from verify to closed

Merge remote-tracking branch 'origin/feature/8372_to_lam'

Full changeset: c631f0f5baf50092ef34f784ca4fddf6e5c1bb3c

comment:24 Changed 7 years ago by Gesner Passos

Merge remote-tracking branch 'origin/feature/8372_to_lam'

Full changeset: d88248b8e198f68842909227f02e9180f31bae88

comment:25 Changed 7 years ago by Owen Arnold

  • Milestone changed from Backlog to Release 3.1

comment:26 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 9217

Note: See TracTickets for help on using tickets.