From 2498bab93327517a4fd4592c3e08fc2188eb8829 Mon Sep 17 00:00:00 2001 From: Daniel Caballero Date: Thu, 4 Dec 2025 15:46:16 -0500 Subject: [PATCH 1/2] Added McStas to nsd-app-wrap --- rpm/nsd-app-wrap.spec | 6 ++++++ src/desktop/mcstas.desktop | 11 +++++++++++ src/desktop/mcstas.png | Bin 0 -> 8528 bytes src/mcstas | 15 +++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 src/desktop/mcstas.desktop create mode 100644 src/desktop/mcstas.png create mode 100644 src/mcstas diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index a7d42ca..a3f6e17 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -40,6 +40,7 @@ install -m 755 mantidworkbenchqa %{buildroot}%{_bindir}/ install -m 755 mantidpython %{buildroot}%{_bindir}/ install -m 755 mantidworkbench %{buildroot}%{_bindir}/ install -m 755 mantidtotalscattering %{buildroot}%{_bindir}/ +install -m 755 mcstas %{buildroot}%{_bindir}/ install -m 755 neutron-imaging %{buildroot}%{_bindir}/ install -m 755 nr_launcher %{buildroot}%{_bindir}/ install -m 755 nsd-app-wrap.sh %{buildroot}%{_bindir}/ @@ -66,6 +67,7 @@ install -m 644 desktop/jupyter.svg %{buildroot}/%{_datadir}/p install -m 644 desktop/mantid_workbench.png %{buildroot}/%{_datadir}/pixmaps/ install -m 644 desktop/mantid_workbenchnightly.png %{buildroot}/%{_datadir}/pixmaps/ install -m 644 desktop/mantid_workbenchqa.png %{buildroot}/%{_datadir}/pixmaps/ +install -m 644 desktop/mcstas.png %{buildroot}/%{_datadir}/pixmaps/ install -m 644 desktop/paraview.png %{buildroot}/%{_datadir}/pixmaps/ install -m 644 desktop/pyrs.png %{buildroot}/%{_datadir}/pixmaps/ install -m 644 desktop/pysen.png %{buildroot}/%{_datadir}/pixmaps/ @@ -82,6 +84,7 @@ install -m 644 desktop/jupyter.local.desktop %{buildroot}%{_datadir}/a install -m 644 desktop/mantidworkbench.desktop %{buildroot}%{_datadir}/applications/ install -m 644 desktop/mantidworkbenchnightly.desktop %{buildroot}%{_datadir}/applications/ install -m 644 desktop/mantidworkbenchqa.desktop %{buildroot}%{_datadir}/applications/ +install -m 644 desktop/mcstas.desktop %{buildroot}%{_datadir}/applications/ install -m 644 desktop/paraview.desktop %{buildroot}%{_datadir}/applications/ install -m 644 desktop/pyrs.desktop %{buildroot}%{_datadir}/applications/ install -m 644 desktop/quicknxs.desktop %{buildroot}%{_datadir}/applications/ @@ -101,6 +104,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a %{_prefix}/share/applications/* %changelog +* Thu Dec 04 2025 Daniel Caballero +- Added McStas + * Mon Oct 27 2025 Glass Elsarboukh - Refl1d prod no longer an alias for qa diff --git a/src/desktop/mcstas.desktop b/src/desktop/mcstas.desktop new file mode 100644 index 0000000..1eb7b77 --- /dev/null +++ b/src/desktop/mcstas.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=McStas +Comment=A neutron ray-trace simulation package +GenericName=McStas +Exec=/usr/bin/mcstas +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=Science;Other +Icon=mcstas +StartupNotify=false \ No newline at end of file diff --git a/src/desktop/mcstas.png b/src/desktop/mcstas.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef319102b15a7634d34a239645d2fa501495095 GIT binary patch literal 8528 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 Q3tCs;>FVdQ&MBb@09mXt3;+NC literal 0 HcmV?d00001 diff --git a/src/mcstas b/src/mcstas new file mode 100644 index 0000000..08387a6 --- /dev/null +++ b/src/mcstas @@ -0,0 +1,15 @@ +#!/bin/bash + +# select the environment to use +# current default is system version +PIXI_ENVIRON=mctsas + +# import library to do the real work +# shellcheck disable=SC1091 +. "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \ + || . /bin/nsd-app-wrap.sh + +# put together arguments - conda_env, application, argv +args=("${PIXI_ENVIRON}" "start_gui" "$@") +# launch the tool +pixi_launch "${args[@]}" -- GitLab From 24e31b4b997c6e6a77eef037512f277d98a0f4ce Mon Sep 17 00:00:00 2001 From: Daniel Caballero Date: Fri, 5 Dec 2025 10:58:31 -0500 Subject: [PATCH 2/2] Bumped up version number --- rpm/nsd-app-wrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index a3f6e17..3cf8a52 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ Name: nsd-app-wrap -Version: 2.10 +Version: 2.11 Release: 1%{?dist} Summary: Wrapper scripts to launch python applications installed via anaconda Vendor: Peter F. Peterson -- GitLab