Ticket #9061 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Bring new LET_Definition.xml and LET_Parameters.xml to Mantid

Reported by: Alex Buts Owned by: Alex Buts
Priority: major Milestone: Release 3.1.1
Component: Framework Keywords: PatchCandidate
Cc: Blocked By: #8614
Blocking: Tester: Nick Draper

Description

LET hardware have changed, so instrument scientists modified files above to reflect these changes.

The files should be put into Mantid as update to 3.1 would break LET reduction otherwise.

Ticket is trivial but conflicts with #8614 which also contains some modifications to LET_Parameters.xml has to be resolved.

Change History

comment:1 Changed 7 years ago by Stuart Campbell

  • Status changed from new to infoneeded

There needs to be more information on what the conflict is as both tickets are marked as PatchCandidates for this release.

comment:2 Changed 7 years ago by Alex Buts

both #8614 and #9016 modify the same LET_Parameters.xml file in different places. Do not know if the change can be resolved automatically.

This is why this ticket is marked as blocked by #8614

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

comment:3 Changed 7 years ago by Alex Buts

refs #9061 This brings new LET configuration files to Mantid

and fixes the issue but the ticket can be merged to master/developer only after #8614

Changeset: 8bc77f26c17c3801d769993e310be38e7f533609

comment:4 Changed 7 years ago by Nick Draper

  • Status changed from infoneeded to new

comment:5 Changed 7 years ago by Nick Draper

  • Status changed from new to assigned

comment:6 Changed 7 years ago by Alex Buts

  • Status changed from assigned to inprogress

refs #9061 Should fix system test

and the issue with monitors taken from incorrect instrument parameters file

Changeset: c8c6135d8088ec9c88df770e519d61988c002603

comment:7 Changed 7 years ago by Nick Draper

  • Summary changed from Bring new LET_Description.xml and LET_Parameters.xml to Mantid to Bring new LET_Definition.xml and LET_Parameters.xml to Mantid

comment:8 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 3.2 to Release 3.1.1

Moved to patch release 3.1.1

comment:9 Changed 7 years ago by Alex Buts

refs #9061 should fix issue with LET configuration

though problems with loadEventNexus and CopyInstrumentParameters are apparent.

Changeset: bd229d4f2f6c4396b4aa617c0255626e11adae15

comment:10 Changed 7 years ago by Alex Buts

refs #9061 Changed LET reduction to avoid current bug

in CopyInstrumentParameters

Changeset: 3f3f8cb33d6f3bec04e20d42fd145db8dcc903a8

comment:11 Changed 7 years ago by Alex Buts

refs #9061 Minor comments & formatting

Changeset: d50c3c41547b5d754f6584e835c687442ca633bb

comment:12 Changed 7 years ago by Alex Buts

refs #9061 Fixing system test

Changeset: f492ab3541731db0d3a3ccbd5c339535e8a8033e

comment:13 Changed 7 years ago by Alex Buts

It is fixed as soon as 8614 is fixed.

Number of bugs have been identified when reduction works with date-dependent configuration files (tickets written) -- the changes are to get around these bugs for the time being.

comment:14 Changed 7 years ago by Alex Buts

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

comment:15 Changed 7 years ago by Nick Draper

  • Status changed from verify to verifying
  • Tester set to Nick Draper

comment:16 Changed 7 years ago by Nick Draper

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/9061_newLetConfig'

Full changeset: ​3150b9895486da7fc6c054f373cc45fe42969841

comment:17 Changed 7 years ago by Nick Draper

Merge remote-tracking branch 'origin/feature/9061_newLetConfig'

Full changeset: ​ecec41bc5c71cec8a57578dbfbb23694cc76d9c8

comment:18 Changed 7 years ago by Russell Taylor

Re #8614 & Re #9061. Bring all changes over from these tickets.

Since none of the affected files have been changed by any other tickets since the release, it is OK to bring over their current state (in master) in one shot. This avoids merge conflicts, which otherwise arise from bringing over individual commits.

Changeset: f0e117217c85895c58ce1a90343049d81be3aee0

comment:19 Changed 7 years ago by Russell Taylor

Re #8614 & Re #9061. Bring all changes over from these tickets.

Since none of the affected files have been changed by any other tickets since the release, it is OK to bring over their current state (in master) in one shot.

Changeset: e0bfd9fbcc74226836b4189a2426eecd33e907ea

comment:20 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​9904

Note: See TracTickets for help on using tickets.