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.

Sign up for GitHub

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

Jump to bottom

Write PeakShape #179

Closed
wants to merge 13 commits into from
Closed

Write PeakShape #179

wants to merge 13 commits into from

Conversation

OwenArnold
Copy link
Contributor

#10904 Write the PeakShape from integration algorithms

@OwenArnold
refs #10904. IntegratePeaksMD algorithms done.
4427109 
IntegratePeaksMD v1 and v2 write out integrated peak info in the form of PeakShape

PeakShapeSpherical adapted to write out background outer radius and background inner radius as well as the peak radius. Factories also updated for this, unit tests added to and updated for this.

I got a little worried that someone may change the integer values agaist the enum entries of SpecialCoordinateSystem. So I put in place a unit test to sanity check those.
@OwenArnold
refs #10904. Ellipsoid shape.
2387ce5
@OwenArnold
refs #10904. Factory for elliptical peak shapes
78da658
@OwenArnold
refs #10904. Hook new factory into loader.
8d327c5
@OwenArnold
refs #10904. Write from IntegrateEllipsoids.
3d558b3
@OwenArnold
refs #10904. Mv PeakShape an fix warnings.
0dd26e0
@OwenArnold
refs #10904. Fix remaining warning.
43d4e25
@OwenArnold
refs #10904. Expose PeakShape to python.
bf27026
@OwenArnold
refs #10904 SpecialCoords API->Kernel
5612143 
Since we have put PeakShape in Geometry, SpecialCoordinateSystem must be moved to the Kernel package out of API.
@OwenArnold
refs #10904. Python tests for PeakShape.
8996ec6 
Also fix GCC and Windows warnings
@OwenArnold
refs #10904. Resolve conflict with master.
f910af2
@martyngigg martyngigg self-assigned this Feb 9, 2015
@martyngigg martyngigg added this to the Release 3.4 milestone Feb 9, 2015
@OwenArnold
Copy link
Contributor Author

Jenkins retest this please

1 similar comment
@OwenArnold
Copy link
Contributor Author

Jenkins retest this please

@martyngigg
Copy link
Member

Jenkins, retest this please

@martyngigg
Copy link
Member

The builds have got themselves into some odd state with this pull request. I suggest closing it without merging and opening a fresh one.

@OwenArnold OwenArnold closed this Feb 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@martyngigg martyngigg

Labels
None yet
Projects
None yet
Milestone
Release 3.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@OwenArnold @martyngigg