Kevin Pounot (33916e29) at 14 Mar 14:22
Merge branch 'master' of https://gitlab.esrf.fr/levantin/txs
... and 1 more commit
Kevin Pounot (b05d1730) at 16 Feb 17:34
Update plot.py
Kevin Pounot (305ae964) at 16 Feb 17:33
Update plot.py
Kevin Pounot (d7153300) at 16 Feb 17:30
Update plot.py
Kevin Pounot (b1f9391e) at 16 Feb 17:27
Update plot.py
Kevin Pounot (1ac76995) at 22 Jan 11:24
Adding a 'heating_qlim' option to analysis/plot functions for bette...
... and 1 more commit
Kevin Pounot (019d4fcb) at 04 Jan 08:19
Merge branch 'update-gui' into 'master'
... and 8 more commits
This Merge Request builds on (and includes) MR !12 and adds a plot widget to display the diffs that supports updates and user interaction.
It also makes some changes to txsgui.py/.ui
to make it work with current txs
version.
Some screeshots:
The parameters I used with ./txs/tests/sample_data/bliss/dye1/dye1_0002/scan0012
data for testing it:
txsgui_pars.ini
And the patch for mocking a "live" update of the data:
+++ b/txs/live.py
@@ -41,7 +41,7 @@ def ana(folder, ref_delay, ai=None, extension='h5', qnorm=None, qlim_azav=None,
norm=None, qlim_datared=None, shots=None, use_ratio=False,
red_chi2_max=None, pts_perc_max=None, log='id09', do_azav=True,
do_datared=True, sleep_azav=0.5, sleep_datared=0.1, sleep_save=1,
- sleep_loop=10, plot=False, track_abs=False, track_diff=False,
+ sleep_loop=1, plot=False, track_abs=False, track_diff=False,
track_diff_t='last', qmon=None, result_callback=None,
track_abs_qmon=None, track_diff_qmon=None,
progress_callback=None, debug=False, verbose=True):
@@ -223,6 +223,13 @@ def ana(folder, ref_delay, ai=None, extension='h5', qnorm=None, qlim_azav=None,
return_fnames=True,
verbose=True)
+ # patch to load file one by one:
+ if len(fnames) > 1:
+ imgs, fnames = load_images(folder, extension=extension,
+ exclude=([] if exclude is None else list(exclude)) + list(fnames[1:]),
+ return_fnames=True,
+ verbose=True)
+
if len(imgs) == 0:
if first_attempt:
This merge request adds the version of txsgui you sent me by email in June to txs
under txs.app
and updates setup.py
to:
txsgui
as a txs
commandpip install .[gui]
I made minimal changes to make the GUI start (see tvincent/txs@9c0b36c1), but starting a processing fails (some API changed). I'm looking into this.
How do you want to work? With small merge request that are easier to review? --in this case this is ready-- or with a bigger one that is fully working?
Kevin Pounot (40d4ed4c) at 04 Jan 08:18
Merge branch 'bootstrap-gui' into 'master'
... and 4 more commits
Add an ImageIterator class to handle large dataset that do not fit into memory.
Add pre-commit.
Select the right log file based on the content of the file.
Kevin Pounot (cd9f8c21) at 04 Jan 08:17
Adding versioneer to manage version number through git tags
Kevin Pounot (2317cd2b) at 04 Jan 08:17
Merge branch 'versioneer' into 'master'
... and 1 more commit
Kevin Pounot (cd9f8c21) at 04 Jan 08:16
Merge branch 'master' into 'versioneer'
... and 11 more commits
Kevin Pounot (5bd3b563) at 06 Dec 12:18
Merge branch 'init-xraydb' into 'master'
... and 4 more commits
I had an issue with the current way to add extra materials from setup.py
: On macOS, the path is not .config/xraydb
(see https://github.com/xraypy/XrayDB/blob/c5097e88a6a42551186cf8773870eab8888297a2/python/xraydb/materials.py#L13-L27).
This PR proposes to fix this issue by moving the extra materials initialisation from setup.py
to txs.corr
where xraydb
is imported and to use xraydb.add_material
.
This would also fix the issue of missing materials when sharing a Python environment with a user that didn't performed the installation.
It also removes code execution during installation, which allows to provide Python wheels and eventually convert setup.py
to a config file (setup.cfg
or pyproject.toml
).
Kevin Pounot (499c7e2e) at 28 Nov 17:52