Update Merlin IDF and IPF

[abuts]

Description of work.

Merlin monitors have been modified and the ticket reflects these changes.
Have no idea what to test here --- there are no code changes here and the changes to IDF-s are trivial.

Code Review

• Is the code of an acceptable quality?
• Does the code conform to the coding standards?
• Are the unit tests small and test the class in isolation?
• If there are changes in the release notes then do they describe the changes appropriately?

Functional Tests

• Do changes function as described? Add comments below that describe the tests performed?
• Do the changes handle unexpected situations, e.g. bad input?
• Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

[DanNixon]

Is the valid-from date correct here? It does not match the year indicated by the filename.

[abuts]

Fair point. I have not modified it as, AFAIK, parameters file date is not used anywhere, but it may be used in a future. I have modified it making equal to Defenition date.

[DanNixon]

Looks good to me.

Can you improve the commit message of 46b1a6b to describe what you have actually done (and that the "issue" is/was) and update the PR title.

[abuts]

@DanNixon I do not know how to edit the commit message unless reverting and rebasing, but this is a bit excessive to do full rebase for this kind of message. How can I edit commit message only?

The issue is mentioned in the ticket -- the Merlin physical and logical monitors have changed so appropriate software changes are necessary.

[DanNixon]

Rebaseing would be the correct method here. It is not excessive to correct a commit message that gives no information whatsoever about the changes within the commit.

[abuts]

@DanNixon Could you, please, provide me with the step-by step algorithm of the rebasing. I have not done it for a while and have different tasks to do and you seems have enough time to do everything right.

[DanNixon]

https://help.github.com/articles/changing-a-commit-message/ pretty much describes it under the section "Amending the message of older or multiple commit messages". Note that you should use --force-with-lease instead of --force.

The code quality is not affected or improvement is not worth efforts which is confirmed by the fact that the reviewer is not ready to provide me with the instructions on making the necessary improvements

[abuts]

Well, it was not difficult to do such change though not sure any improvement was achieved.

[soininen]

Looks good but I think the changes should be mentioned in the release notes, no?

[abuts]

@soininen -- its so minor that not worth mentioned in release notes. The instrument scientists know that the changes have been applied (They have requested it and I've informed them about the implementation) and nobody else should be bothered.
Current Mantid workflow will update these files on local machines as soon as they merged to master so its not an release issue.

[soininen]

@abuts I see, I guess it is OK then. This could have been mentioned in the PR's description.