Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New ISIS indirect diffraction reduction algorithm #763

Merged

Conversation

DanNixon
Copy link
Member

Fixes #10855.

To test:

  • See that system tests are passing
  • Ensure both Indirect Diffraction and Data Reduction (Energy Transfer) interfaces still work
    • Run ISIS Calibration with IRS26173
    • Run ISIS Energy Transfer with IRS26173 and calibration workspace, plot contour enabled
    • Should get a nice, straight energy transfer over all Q
    • Run Indirect Diffraction with IRS26176, diffspec
  • Review documentation changes.

Gets identical results for IRIS reductions (at least usng as much as has
been implemented so far)

Refs #10855
…_reduction

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp

Refs #10855
…_reduction

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSGDiffractionReduction.py
	Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py

Refs #10855
…_reduction

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSGDiffractionReduction.py

Refs #10855
@DanNixon DanNixon added the Indirect/Inelastic Issues and pull requests related to indirect or inelastic label May 18, 2015
@DanNixon DanNixon added this to the Release 3.5 milestone May 18, 2015
@DanNixon
Copy link
Member Author

Did not account for VESUVIO on diffraction.

…_reduction

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py

Refs #10855
@FedeMPouzols FedeMPouzols self-assigned this Jun 2, 2015
@FedeMPouzols
Copy link
Contributor

All looks fine and the documentation makes perfect sense. But pylint has a different opinion... IndirectReductionCommon.py comes with 42 warnings: http://builds.mantidproject.org/job/pull_requests-pylint/439/violations/file/IndirectReductionCommon.py/, and ISISIndirectDiffractionReduction.py introduces 15. Some of them make sense and seem esay to fix (like an unused import). Then there is also the annoying issue with mantid.simpleapi where from mantid.simpleapi import ... will produce a warning for every function name that you use (#806 (comment)). I'm running the system and doc tests locally just in case, but otherwise everything seems fine.

@DanNixon
Copy link
Member Author

DanNixon commented Jun 2, 2015

I'm assuming no-name-in-module was the right thing to disable to fix those errors, I'm slightly reluctant to have to change the use of those algorithms since there is actually nothing wrong with the way it was already done.

Considering I do this in pretty much every Python algorithm I write (as do a fair few other developers) this should just be ignored globally.

@FedeMPouzols
Copy link
Contributor

The only (spurious) issue is the failed windows doc-test. I passed them locally and it went fine. The doc-test issues are totally unrelated to this PR.

FedeMPouzols added a commit that referenced this pull request Jun 3, 2015
…rect_diffraction_reduction

New ISIS indirect diffraction reduction algorithm
@FedeMPouzols FedeMPouzols merged commit eb7b303 into master Jun 3, 2015
@FedeMPouzols FedeMPouzols deleted the feature/10855_rewrite_indirect_diffraction_reduction branch June 3, 2015 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Indirect/Inelastic Issues and pull requests related to indirect or inelastic
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants