Ticket #4843 (closed: fixed)

Opened 9 years ago

Last modified 5 years ago

[C2E] - Energy Transfer Tab Additional Feature - (Sample Environment Log)

Reported by: Peter Parker Owned by: Dereck Kachere
Priority: major Milestone: Release 2.5
Component: Mantid Keywords: C2E
Cc: spencer.howells@… Blocked By:
Blocking: Tester: Karl Palmen

Description

Convert to Energy interface:

In the Energy Transfer tab, give users the option to read from the sample environment log(s) of the run(s) being reduced.

Attachments

inelastic_indirect_reduction_steps.py​ (39.5 KB) - added by Karl Palmen 8 years ago.
Merge Conflict 5 Apr 2013

Change History

comment:1 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.1 to Release 2.2

Moved at end of release 2.1

comment:2 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.2 to Release 2.3

Moved at the end of release 2.2

comment:3 Changed 8 years ago by Peter Parker

  • Keywords C2E added

comment:4 Changed 8 years ago by Dereck Kachere

  • Owner changed from Peter Parker to Dereck Kachere
  • Status changed from new to assigned

comment:5 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.3 to Release 2.4

Moved to milestone 2.4

comment:6 Changed 8 years ago by Dereck Kachere

  • Status changed from assigned to accepted

comment:7 Changed 8 years ago by Dereck Kachere

  • Status changed from accepted to assigned

comment:8 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.4 to Release 2.5

Moved at the code freeze for release 2.4

comment:9 Changed 8 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:10 Changed 8 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:11 Changed 8 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:12 Changed 8 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:13 Changed 8 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 0324017580a6dc19290d057527f365d80bb1de4d

comment:14 Changed 8 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:15 Changed 8 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:16 Changed 8 years ago by Dereck Kachere

  • Status changed from assigned to accepted

comment:17 Changed 8 years ago by Dereck Kachere

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

Tester:

  • Ensure that your default instrument is set an indirect one - IRIS, OSIRIS or TOSCA. This can be done via Help->First Time Setup
  • Open up the C2E GUI.
  • In the default tab, Energy Transfer, select a run file to load, ensuring that the file originates from the selected instrument.
  • Run Energy Transfer
  • In the 'Workspaces' area, right-click on the workspace that was generated and select Sample Logs...
  • Make a note of the logs shown.
  • Now Run Energy Transfer after selecting the Load Logs option.
  • Compare the two sets of logs shown. There should be a difference.

comment:18 Changed 8 years ago by Dereck Kachere

branch used: feature/4843_load_logs

comment:19 Changed 8 years ago by Karl Palmen

  • Status changed from verify to verifying
  • Tester set to Karl Palmen

comment:20 Changed 8 years ago by Karl Palmen

  • Status changed from verifying to reopened
  • Resolution fixed deleted

When attempt the git test start. I encountered a non-trivial merge conflict in the inelastic_inderect_reduction_steps.py script as quoted next 

    def _load_data(self, filename, output_ws):
        if self._parameter_file is not None and "VESUVIO" in self._parameter_file:
            loaded_ws = LoadVesuvio(Filename=filename, OutputWorkspace=output_ws, SpectrumList="1-198", **self._extra_load_opts)
            loader_name = "LoadVesuvio"
        else:
<<<<<<< HEAD
            loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
=======
            if self._load_logs == True:
                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=True, **self._extra_load_opts)
                logger.notice("Loaded logs")
            else:
                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
>>>>>>> origin/feature/4843_load_logs
            loader_handle = loaded_ws.getHistory().lastAlgorithm()
            loader_name = loader_handle.getPropertyValue("LoaderName")
        return loader_name

and so fail the test.

comment:21 Changed 8 years ago by Dereck Kachere

  • Status changed from reopened to accepted

Tester:

If you encounter merge conflict as above, simply remove git's additions to give: 

    def _load_data(self, filename, output_ws):
        if self._parameter_file is not None and "VESUVIO" in self._parameter_file:
            loaded_ws = LoadVesuvio(Filename=filename, OutputWorkspace=output_ws, SpectrumList="1-198", **self._extra_load_opts)
            loader_name = "LoadVesuvio"
        else:
            loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
            if self._load_logs == True:
                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=True, **self._extra_load_opts)
                logger.notice("Loaded logs")
            else:
                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
            loader_handle = loaded_ws.getHistory().lastAlgorithm()
            loader_name = loader_handle.getPropertyValue("LoaderName")
        return loader_name

Stage the file to commit, using either git gui or git add, then commit, remembering to ref the file in the commit message.

comment:22 Changed 8 years ago by Dereck Kachere

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

comment:23 Changed 8 years ago by Stuart Campbell

Is this intended as an ISIS only feature ?

comment:24 Changed 8 years ago by Dereck Kachere

@Stuart Yes, working on TOSCA, IRIS and OSIRIS.

comment:25 Changed 8 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:26 Changed 8 years ago by Karl Palmen

  • Status changed from verify to verifying

comment:27 Changed 8 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:28 Changed 8 years ago by Karl Palmen

This time I got a different merge conflict spread over a longer piece of code - inelastic_inderect_reduction_steps.py . I attach a copy of the file.

Changed 8 years ago by Karl Palmen

Merge Conflict 5 Apr 2013

comment:29 Changed 8 years ago by Karl Palmen

  • Status changed from verifying to reopened
  • Resolution fixed deleted

comment:30 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:31 Changed 7 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:32 Changed 7 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:33 Changed 7 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:34 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:35 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:36 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:37 Changed 7 years ago by Dereck Kachere

  • Status changed from reopened to accepted

Solved the merge conflict.

comment:38 Changed 7 years ago by Dereck Kachere

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

comment:39 Changed 7 years ago by Karl Palmen

  • Status changed from verify to verifying

comment:40 Changed 7 years ago by Karl Palmen

Sucessfully merged as advised earlier in ticket.

comment:41 Changed 7 years ago by Karl Palmen

  • Status changed from verifying to closed

The two logs differ in the third item.

comment:42 Changed 7 years ago by Karl Palmen

Git pass test failed. It required a repeat of the merger and I could not commit it in this context.

comment:43 Changed 7 years ago by Karl Palmen

  • Status changed from closed to reopened
  • Resolution fixed deleted

Reopened for merger with master.

comment:44 Changed 7 years ago by Dereck Kachere

  • Cc spencer.howells@… added

comment:45 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:46 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:47 Changed 7 years ago by Dereck Kachere

  • Status changed from reopened to assigned

comment:48 Changed 7 years ago by Dereck Kachere

  • Status changed from assigned to accepted

comment:49 Changed 7 years ago by Dereck Kachere

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

Merged a more recent master into the branch. git pass test should now work.

comment:50 Changed 7 years ago by Karl Palmen

  • Status changed from verify to verifying

comment:51 Changed 7 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:52 Changed 7 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:53 Changed 7 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:54 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:55 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:56 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:57 Changed 7 years ago by Karl Palmen

  • Status changed from verifying to closed

git test pass worked.

comment:58 Changed 7 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:59 Changed 7 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:60 Changed 7 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:61 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:62 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:63 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:64 Changed 7 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:65 Changed 7 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:66 Changed 7 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:67 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:68 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:69 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:70 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:71 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:72 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:73 Changed 7 years ago by Dereck Kachere

refs #4843 Added option to read log file

There is now a tickbox in the C2E GUI which allows users to select whether or not to simultaneously load the log file associated with the raw file they wish to load.

Changeset: 7196e69f78ee3a4b5045ddf2cdf6993cc1a03978

comment:74 Changed 7 years ago by Dereck Kachere

refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.

Changeset: e026b0045feba65da77361f02f011cd99410093f

comment:75 Changed 7 years ago by Dereck Kachere

refs #4843 Changes to labelling

Changeset: dc0d92992450eec80f78210572ba82ad2944d1ca

comment:76 Changed 7 years ago by Dereck Kachere

refs #4843 Solves merge conflict

Changeset: 16db337a4805b1b515f27a6d5869bd46739875db

comment:77 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:78 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:79 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:80 Changed 7 years ago by Dereck Kachere

refs #4843 Merge branch 'feature/4843_load_logs' into develop

Conflicts:

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Changeset: 74a5719e6697a617cd8efceb8b95e41512db3f66

comment:81 Changed 7 years ago by Dereck Kachere

refs #4843 Removed unnecessary comment.

Changeset: 8fa5c44e78402b4c7b5320125917bd16f42ea692

comment:82 Changed 7 years ago by Dereck Kachere

refs #4843 Solved potential merge conflict

Changeset: 4d8aa00db890a88894d22ae26f4bd12998eada1f

comment:83 Changed 7 years ago by Wenduo Zhou

Merge branch 'feature/6845_export_log' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:84 Changed 7 years ago by Wenduo Zhou

Merge branch 'feature/6845_export_log' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:85 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​5690

Note: See TracTickets for help on using tickets.