Support import of ROOT (CERN) TH1 histograms
ClosedPublic
Actions

Authored by croick on Jun 24 2018, 9:45 PM.

Details

Reviewers

sgerlach
asemke
fkristof

Commits

R262:62e9b7c253d1: Support import of ROOT (CERN) TH1 histograms

Summary

The data analysis framework ROOT (https://root.cern.ch/)
provides its own file type containing different types of
histograms.
To prevent the use of the native library, a light ROOTHist
class gives access to the required data of the histograms.

depends on LZIP and LZ4 compression
no export module foreseen so far
test data will be provided in a separate commit

Test Plan

Open a new project and import histograms into a workbook.
The underflow bin can be skipped by increasing the start row.

Diff Detail

Repository

R262 LabPlot

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

croick created this revision.Jun 24 2018, 9:45 PM

Restricted Application added a project: KDE Edu. · View Herald TranscriptJun 24 2018, 9:45 PM

Restricted Application added a subscriber: kde-edu. · View Herald Transcript

croick requested review of this revision.Jun 24 2018, 9:45 PM

Harbormaster completed remote builds in B287: Diff 36621.Jun 24 2018, 9:45 PM

Your patch is excellent and of extreme high quality. Thank you.
Can you check if "ROOT" can be put after "FITS"?

src/backend/datasources/LiveDataSource.h
52	Can "ROOT" be also put after "FITS"? This can avoid problems with older project files using FITS.
src/kdefrontend/datasources/ImportFileDialog.cpp
231–232	... and ROOT

This revision now requires changes to proceed.Jun 24 2018, 11:13 PM

fkristof added inline comments.Jun 25 2018, 11:17 AM

src/backend/datasources/filters/ROOTFilter.cpp
169	columnOffSet can be const if you don't intend to change it.
182	I suggest you to group these conditions with parenthesis so it's easier to understand them.
192	const QString & fileName Extra space, remove it
202	This should be const auto&
src/backend/datasources/filters/ROOTFilterPrivate.h
71	The code should follow our conventions. We use camelCase in the naming.
src/kdefrontend/datasources/ROOTOptionsWidget.cpp
73	const auto&

Put ROOT after FITS
Fix style

Harbormaster completed remote builds in B338: Diff 36705.Jun 26 2018, 5:49 PM

Enable easier selection of columns and bin ranges

Harbormaster completed remote builds in B339: Diff 36706.Jun 26 2018, 5:51 PM

Thank you for your quick feedback.

Maybe the initial patch was submitted a little precoiously, the latest diff includes quite a few changes (sorry for that) which should improve the usability:

Don't make use of the data portion widget, but use checkboxes for the selection of columns.
Also the bin ranges are now selected on the same options page and are adjusted according to the selected histogram.
- This might require later changes; if somebody wants to import multiple histograms with different numbers of bins.

src/kdefrontend/datasources/ROOTOptionsWidget.cpp
73	Actually they are pointers, so I used `auto*` to make that clear.

sgerlach accepted this revision.Jun 26 2018, 6:39 PM

This revision is now accepted and ready to land.Jun 26 2018, 6:39 PM

fkristof accepted this revision.Jun 26 2018, 6:48 PM

fkristof added inline comments.

src/kdefrontend/datasources/ROOTOptionsWidget.cpp
73	Right, then they can be const items const pointers, aka const auto* const item

Closed by commit R262:62e9b7c253d1: Support import of ROOT (CERN) TH1 histograms (authored by croick). · Explain WhyJun 26 2018, 6:59 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (27 lines)
M		src/CMakeLists.txt (6 lines)
M		src/backend/datasources/LiveDataSource.h (2 lines)
M		src/backend/datasources/LiveDataSource.cpp (2 lines)
A	M	src/backend/datasources/filters/ROOTFilter.h (112 lines)
A	M	src/backend/datasources/filters/ROOTFilter.cpp (650 lines)
A	M	src/backend/datasources/filters/ROOTFilterPrivate.h (188 lines)
M		src/kdefrontend/datasources/ImportFileDialog.cpp (51 lines)
M		src/kdefrontend/datasources/ImportFileWidget.h (4 lines)
M		src/kdefrontend/datasources/ImportFileWidget.cpp (72 lines)
A	M	src/kdefrontend/datasources/ROOTOptionsWidget.h (63 lines)
A	M	src/kdefrontend/datasources/ROOTOptionsWidget.cpp (98 lines)
A	M	src/kdefrontend/ui/datasources/rootoptionswidget.ui (198 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	36621	fcee0bf		Jun 24 2018, 9:45 PM	★	★
Diff 2	36705	05f979e	- Put ROOT after FITS	Jun 26 2018, 5:49 PM	★	★
Diff 3	36706	05f979e	- Enable easier selection of columns and bin ranges	Jun 26 2018, 5:51 PM	★	★
Diff 4	36711	05f979e	R262:62e9b7c253d1d4927ce210609236741f4ea1aa47	Jun 26 2018, 6:59 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
889fa622ccf2	0b1f753b4b53	2b29a62df58c	Christoph Roick	Enable easier selection of columns and bin ranges	Jun 26 2018, 5:50 PM
2b29a62df58c	e5c26f588e32	2a8d32df85df	Christoph Roick	Put ROOT after FITS Fix style	Jun 25 2018, 10:08 PM
2a8d32df85df	0fee91211ecb	05f979ea2585	Christoph Roick	Support import of ROOT (CERN) TH1 histograms (Show More…)	Jun 23 2018, 11:41 PM