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 algorithm to load SPICE XML data #365

Merged
merged 15 commits into from Mar 14, 2015
Merged

Conversation

wdzhou
Copy link
Collaborator

@wdzhou wdzhou commented Mar 6, 2015

SPICE records 2D anger camera's data in XML format. The new algorithm is designed to read this type of XML file and create a MatrixWorkspace for it.

On branch feature/11098_hb3a_2ddata
- modified:   ../../../Framework/DataHandling/CMakeLists.txt
- new file:   ../../../Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
- new file:   ../../../Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
- new file:   ../../../Framework/DataHandling/test/LoadSpiceXML2DDetTest.h
- new file:   HB3A_exp355_scan0001_0522.xml.md5
@wdzhou wdzhou added In Progress Diffraction Issues and pull requests related to diffraction labels Mar 6, 2015
@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 7, 2015

retest please.

@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 7, 2015

Please

@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 7, 2015

test this please

@peterfpeterson peterfpeterson added this to the Release 3.4 milestone Mar 9, 2015
@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 11, 2015

For tester:

A new algorithm LoadSpiceXML2DDet is implemented in this algorithm.
This is originally ticket #11098.

In order to test, you can download any XML files of HFIR's HB3A from http://neutron.ornl.gov/user_data/hb3a/exp355/Datafiles/. You may run the algorithm to load data and check the output MatrixWorkspace including the spectra and sample logs.

@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 11, 2015

retest please.

@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 11, 2015

retest this please

@wdzhou
Copy link
Collaborator Author

wdzhou commented Mar 11, 2015

Jekins, test this please.

@FedeMPouzols
Copy link
Contributor

Jenkins, retest this please

@FedeMPouzols FedeMPouzols self-assigned this Mar 12, 2015
/** Parse SPICE XML file for one Pt./measurement
* @brief LoadSpiceXML2DDet::parseSpiceXML
* @param xmlfilename
* @param logstringmap
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think logstringmap should be vecspicenode?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right on this. I forgot to update the parameter's name after I changed the input from map to vector. It has been corrected.

@FedeMPouzols
Copy link
Contributor

Code looks very good and it comes with a unit test and doc tests. I think it's ready to be merged in.

I only spotted a very minor issue with a doxygen tag (see inline comment above). Please have a look at it, and I'll merge this PR. I'd also suggest adding a short description of the parameters if there's any point that needs to be clarified (like expected format, typical usage, etc.).

WZ: I added some descriptions to function parameters.

@FedeMPouzols
Copy link
Contributor

Just another comment. I tested the algorithm with a few example XML files from the link that you posted above. Everything seems to work well. Maybe in the future a default value for the 'DetectorGeometry' could be guessed from the file? For interactive use it would be convenient, although I'm not sure if this algorithm will be used directly, or just as part of the HFIR HB3A load/reduce workflow.

WZ: This algorithm is not likely to be used in interactive mode, because for one typical HB3A experiment, there will be tens or hundreds of this file. There will be a workflow algorithm to read and reduce the data to Q-space in the end. So far, only HB3A is the only one that uses 2D detector among all HFIR's diffraction and inelastic instruments.

@FedeMPouzols
Copy link
Contributor

Oh and another comment, could you add the ticket number for this?

WZ: the original ticket number is #11098.

Thanks for testing my ticket.

@FedeMPouzols
Copy link
Contributor

We got a glitch on the win7 build, so I stopped the builds that were still running. Let's try again...

@FedeMPouzols
Copy link
Contributor

Jenkins, retest this please

1 similar comment
@FedeMPouzols
Copy link
Contributor

Jenkins, retest this please

FedeMPouzols added a commit that referenced this pull request Mar 14, 2015
@FedeMPouzols FedeMPouzols merged commit 5e03002 into master Mar 14, 2015
@FedeMPouzols FedeMPouzols deleted the feature/11098_hb3a_2ddata branch March 14, 2015 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Diffraction Issues and pull requests related to diffraction
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants