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

ConjoinWorkspaces: validateInputs is not called for event workspaces #5564

Closed
mantid-builder opened this issue Feb 1, 2012 · 2 comments · Fixed by #20006
Closed

ConjoinWorkspaces: validateInputs is not called for event workspaces #5564

mantid-builder opened this issue Feb 1, 2012 · 2 comments · Fixed by #20006
Assignees
Labels
Framework Issues and pull requests related to components in the Framework Induction Straightforward, low risk issues suitable for new starters Low Priority Things that you don't ever want to be done.
Milestone

Comments

@mantid-builder
Copy link
Collaborator

This issue was originally TRAC 4717

Original Reporter: Russell Taylor

Meaning that the check that both workspaces come from the same instrument, and have the same units is done for Workspace2Ds but not for EventWorkspaces.

@mantid-builder
Copy link
Collaborator Author

@NickDraper (2012-04-30T14:15:46):
Moved at end of release 2.1


@NickDraper (2012-08-10T12:45:12):
http://www.mantidproject.org/Release_Notes_2_2_Full_List


@NickDraper (2012-10-28T11:42:52):
Moved to release 2.4


@NickDraper (2013-01-28T09:23:33):
Moved at the code freeze for release 2.4


@NickDraper (2013-04-29T09:50:06):
Moved to r2.6 at the end of r2.5


@NickDraper (2013-07-26T13:59:10):
Moved to the Backlog after the code freeze for R2.6


@NickDraper (2014-02-14T11:07:57):
bulk move to assigned at the into of the triage step

@mantid-builder mantid-builder added Low Priority Things that you don't ever want to be done. Framework Issues and pull requests related to components in the Framework labels Jun 3, 2015
@NickDraper
Copy link
Contributor

This is the code you want to look for

if (event_ws1 && event_ws2) {
    // We do not need to check that binning is compatible, just that there is no
    // overlap
    // make sure we should bother checking
    if (this->getProperty("CheckOverlapping")) {
      this->checkForOverlap(*event_ws1, *event_ws2, false);
      m_overlapChecked = true;
    }

    // Both are event workspaces. Use the special method
    MatrixWorkspace_sptr output = this->execEvent();
    // Copy the history from the original workspace
    output->history().addHistory(ws1->getHistory());
    // Delete the second input workspace from the ADS
    AnalysisDataService::Instance().remove(getPropertyValue("InputWorkspace2"));
    // Set the result workspace to the first input
    setProperty("InputWorkspace1", output);
    return;
  }

  // Check that the input workspaces meet the requirements for this algorithm
  this->validateInputs(*ws1, *ws2);
  1. Create a failing unit test
  2. Fix
  3. Happy passing unit test

@josephframsay josephframsay self-assigned this Jul 14, 2017
@josephframsay josephframsay added this to the Release 3.11 milestone Jul 14, 2017
josephframsay added a commit that referenced this issue Jul 18, 2017
josephframsay added a commit that referenced this issue Jul 19, 2017
josephframsay added a commit that referenced this issue Jul 19, 2017
josephframsay added a commit that referenced this issue Jul 19, 2017
@DanielMurphy22 DanielMurphy22 added Induction Straightforward, low risk issues suitable for new starters and removed Induction 1 labels Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Framework Issues and pull requests related to components in the Framework Induction Straightforward, low risk issues suitable for new starters Low Priority Things that you don't ever want to be done.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants