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

Re #10805 Modify solid angle correction for tubes #109

Merged
merged 1 commit into from
Dec 17, 2014

Conversation

mdoucet
Copy link
Member

@mdoucet mdoucet commented Dec 17, 2014

The instrument scientists asked to modify the solid angle correction for tubes.
The code they sent was the following:

if (is_tube)
{
    tanAlpha = tan( getYTubeAngle(det, inputWS) );
    tanTheta = tan( inputWS->detectorTwoTheta(det) );       
    const double term1 = sqrt(tanAlpha*tanAlpha + 1.0);
    const double term2 = sqrt(tanTheta*tanTheta + 1.0);
    const double corr = term1*term2*term2;
} else {
    tanTheta = tan( inputWS->detectorTwoTheta(det) );
    const double term3 = sqrt(tanTheta*tanTheta + 1.0);
    const double corr = term3*term3*term3;
}

Please double check the implementation. The system tests should all pass and there should be no change in functionality.

The ticket is here: http://trac.mantidproject.org/mantid/ticket/10805

@mantid-builder
Copy link
Collaborator

Can one of the admins verify this patch?

@peterfpeterson peterfpeterson added this to the Release 3.3 milestone Dec 17, 2014
@peterfpeterson
Copy link
Member

test this please

@peterfpeterson peterfpeterson self-assigned this Dec 17, 2014
peterfpeterson added a commit that referenced this pull request Dec 17, 2014
Re #10805 Modify solid angle correction for tubes
@peterfpeterson peterfpeterson merged commit 72b55b2 into master Dec 17, 2014
@peterfpeterson peterfpeterson deleted the sans_solid_angle_update branch December 17, 2014 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants