Mercurial > repos > muon-spectroscopy-computational-project > larch_plot
changeset 3:5b993aff09e3 draft
planemo upload for repository https://github.com/MaterialsGalaxy/larch-tools/tree/main/larch_plot commit d4c7e090dc5c94395d7e1574845ac2c76f2e4f5f
| author | muon-spectroscopy-computational-project |
|---|---|
| date | Fri, 22 Mar 2024 14:23:33 +0000 |
| parents | 59d0d15a40ef |
| children | 35d24102cefd |
| files | common.py larch_plot.py larch_plot.xml |
| diffstat | 3 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/common.py Mon Mar 04 11:43:46 2024 +0000 +++ b/common.py Fri Mar 22 14:23:33 2024 +0000 @@ -73,7 +73,11 @@ ) for key, parameters_key, default in keys: extract_attribute( - merged_settings, key, bkg_parameters, parameters_key, default + merged_settings=merged_settings, + key=key, + parameters_group=bkg_parameters, + parameters_key=parameters_key, + default=default, ) if settings: @@ -116,7 +120,11 @@ ) for key, parameters_key, default in keys: extract_attribute( - merged_settings, key, fft_parameters, parameters_key, default + merged_settings=merged_settings, + key=key, + parameters_group=fft_parameters, + parameters_key=parameters_key, + default=default, ) if settings:
--- a/larch_plot.py Mon Mar 04 11:43:46 2024 +0000 +++ b/larch_plot.py Fri Mar 22 14:23:33 2024 +0000 @@ -10,7 +10,7 @@ AXIS_LABELS = { - "norm": r"x$\mu$(E), normalised", + "flat": r"x$\mu$(E), flattened", "dmude": r"d(x$\mu$(E))/dE, normalised", "chir_mag": r"|$\chi$(r)|", "energy": "Energy (eV)",
--- a/larch_plot.xml Mon Mar 04 11:43:46 2024 +0000 +++ b/larch_plot.xml Fri Mar 22 14:23:33 2024 +0000 @@ -4,7 +4,7 @@ <!-- version of underlying tool (PEP 440) --> <token name="@TOOL_VERSION@">0.9.74</token> <!-- version of this tool wrapper (integer) --> - <token name="@WRAPPER_VERSION@">0</token> + <token name="@WRAPPER_VERSION@">1</token> <!-- citation should be updated with every underlying tool version --> <!-- typical fields to update are version, month, year, and doi --> <token name="@TOOL_CITATION@">10.1088/1742-6596/430/1/012007</token> @@ -33,11 +33,11 @@ <repeat name="plots" title="Plots" min="1" default="1" help="Each additional entry will create another output plot"> <conditional name="variable"> <param name="variable" type="select" display="radio" label="Variable" help="Variable to plot on the y axis"> - <option value="norm" selected="true">Normalised xμ</option> + <option value="flat" selected="true">Flattened xμ</option> <option value="dmude">Derivative of xμ</option> <option value="chir_mag">Magnitude of χ(r)</option> </param> - <when value="norm"> + <when value="flat"> <expand macro="plot_limits_energy"/> <param name="y_limit_min" type="float" label="Minimum xμ(E)" optional="true" help="If set, plot will be limited to this value on the y axis."/> <param name="y_limit_max" type="float" label="Maximum xμ(E)" optional="true" help="If set, plot will be limited to this value on the y axis."/> @@ -65,7 +65,7 @@ <!-- 1: plot types --> <test expect_num_outputs="1"> <param name="dat_files" value="test.prj"/> - <param name="variable" value="norm"/> + <param name="variable" value="flat"/> <param name="variable" value="dmude"/> <param name="variable" value="chir_mag"/> <output_collection name="plot_collection" type="list" count="3"/> @@ -73,7 +73,7 @@ <!-- 2: plot limits --> <test expect_num_outputs="1"> <param name="dat_files" value="test.prj,merged.prj"/> - <param name="variable" value="norm"/> + <param name="variable" value="flat"/> <param name="x_limit_min" value="7000"/> <param name="x_limit_max" value="7200"/> <param name="y_limit_min" value="0"/>