Merge branch 'root6' of gitea.psi.ch:LMU/musrfit into root6
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
This commit is contained in:
commit
584bba1d46
29 files changed
+4003
-183
No files matched your search
+1
-1
@@ -36,7 +36,7 @@ if (UNIX AND NOT APPLE)
|
||||
else ()
|
||||
set(xdg_datadir_default "/usr/local/share")
|
||||
endif ()
|
||||
set(MUSRFIT_XDG_DATADIR "${xdg_datadir_default}" CACHE PATH
|
||||
set(MUSRFIT_XDG_DATA_DIR "${xdg_datadir_default}" CACHE PATH
|
||||
"where the .desktop files and icons are installed (must be in the XDG search path)")
|
||||
endif (UNIX AND NOT APPLE)
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ Changes since V1.12.1 (not yet released)
|
||||
New features / improvements:
|
||||
musrview, musrFT, musrt0: show their own window/dock icon instead of the generic
|
||||
ROOT one (on macOS set via Cocoa). The .desktop files and icons (incl. musredit)
|
||||
are now installed to MUSRFIT_XDG_DATADIR, which defaults to the prefix share for
|
||||
are now installed to MUSRFIT_XDG_DATA_DIR, which defaults to the prefix share for
|
||||
/usr and /usr/local, ~/.local/share for prefixes under $HOME, and /usr/local/share
|
||||
otherwise.
|
||||
msr2data: the number of threads to be used can be passed on to musrfit from the
|
||||
@@ -49,8 +49,8 @@ Tests:
|
||||
Add an LSCO ZF asymmetry example (ROOT-NPP, LEM) to the ctests.
|
||||
|
||||
musrFT, musrt0 and mupp_plot show their own window/dock icon instead of the
|
||||
generic ROOT one. On Linux, matching .desktop files and icons are installed to
|
||||
MUSRFIT_XDG_DATA_DIR.
|
||||
generic ROOT one (on macOS set via Cocoa). On Linux, matching .desktop files and
|
||||
icons are installed to MUSRFIT_XDG_DATA_DIR.
|
||||
|
||||
Release of V1.12.1, 2026/08/25
|
||||
==============================
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=mupp
|
||||
Comment=muSR parameter plotter
|
||||
GenericName=musrfit parameter plotter
|
||||
Exec=@CMAKE_INSTALL_FULL_BINDIR@/mupp
|
||||
Icon=mupp
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupWMClass=mupp
|
||||
Categories=Science;Physics;DataVisualization;
|
||||
Keywords=muSR;fitting;musrfit;physics;muon;
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=musrStep
|
||||
Comment=set the initial step sizes of an msr-file
|
||||
GenericName=musrfit step size tool
|
||||
Exec=@CMAKE_INSTALL_FULL_BINDIR@/musrStep %f
|
||||
Icon=musrStep
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupWMClass=musrStep
|
||||
Categories=Science;Physics;
|
||||
Keywords=muSR;fitting;musrfit;physics;muon;
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=musrWiz
|
||||
Comment=wizard to create msr-files for musrfit
|
||||
GenericName=musrfit msr-file wizard
|
||||
Exec=@CMAKE_INSTALL_FULL_BINDIR@/musrWiz
|
||||
Icon=musrWiz
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupWMClass=musrWiz
|
||||
Categories=Science;Physics;
|
||||
Keywords=muSR;fitting;musrfit;physics;muon;
|
||||
@@ -102,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/48x48/apps/musrt0.png
|
||||
%{_datadir}/applications/mupp_plot.desktop
|
||||
%{_datadir}/icons/hicolor/48x48/apps/mupp_plot.png
|
||||
%{_datadir}/icons/hicolor/512x512/apps/mupp_plot.png
|
||||
%_prefix/share/musrfit
|
||||
|
||||
|
||||
|
||||
+5
-5
@@ -189,19 +189,19 @@ if (UNIX AND NOT APPLE)
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrFT.desktop
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrt0.desktop
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/applications
|
||||
${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrview.svg
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/icons/hicolor/scalable/apps
|
||||
${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrview-512.png
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/icons/hicolor/512x512/apps
|
||||
${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps
|
||||
RENAME
|
||||
musrview.png
|
||||
)
|
||||
@@ -210,11 +210,11 @@ if (UNIX AND NOT APPLE)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrFT.png
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/classes/icons/musrt0.png
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps
|
||||
${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
|
||||
)
|
||||
#--- a stale icon cache would hide the new icons, hence refresh an existing one
|
||||
install(CODE "
|
||||
set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATADIR}/icons/hicolor\")
|
||||
set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\")
|
||||
find_program(GTK_UPDATE_ICON_CACHE gtk-update-icon-cache)
|
||||
if (GTK_UPDATE_ICON_CACHE AND EXISTS \"\${icon_dir}/icon-theme.cache\")
|
||||
execute_process(COMMAND \${GTK_UPDATE_ICON_CACHE} -q -t -f \"\${icon_dir}\")
|
||||
|
||||
@@ -126,3 +126,22 @@ if (APPLE)
|
||||
else (APPLE)
|
||||
install(TARGETS mupp DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif (APPLE)
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for mupp. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/mupp.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME mupp.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -63,7 +63,12 @@ set(DICT
|
||||
)
|
||||
|
||||
#--- define executable --------------------------------------------------------
|
||||
add_executable(mupp_plot ${SOURCE} ${DICT})
|
||||
#--- on macOS the Dock icon cannot be set through ROOT, hence the Cocoa helper
|
||||
#--- shared with musrview/musrFT/musrt0 is compiled in as well ----------------
|
||||
add_executable(mupp_plot
|
||||
${SOURCE} ${DICT}
|
||||
$<$<PLATFORM_ID:Darwin>:${CMAKE_SOURCE_DIR}/src/classes/PMacDockIcon.mm>
|
||||
)
|
||||
|
||||
#--- add all needed include directories ---------------------------------------
|
||||
target_include_directories(mupp_plot
|
||||
@@ -73,10 +78,14 @@ target_include_directories(mupp_plot
|
||||
${CMAKE_CURRENT_BINARY_DIR}/..
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
$<$<PLATFORM_ID:Darwin>:${CMAKE_SOURCE_DIR}/src/include>
|
||||
)
|
||||
|
||||
#--- define all to be linked libs ---------------------------------------------
|
||||
target_link_libraries(mupp_plot ${ROOT_LIBRARIES})
|
||||
if (APPLE)
|
||||
target_link_libraries(mupp_plot "-framework Cocoa")
|
||||
endif (APPLE)
|
||||
|
||||
#--- install ------------------------------------------------------------------
|
||||
if (APPLE)
|
||||
@@ -102,6 +111,11 @@ if (UNIX AND NOT APPLE)
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot.png
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot-512.png
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps
|
||||
RENAME mupp_plot.png
|
||||
)
|
||||
#--- a stale icon cache would hide the new icon, hence refresh an existing one
|
||||
install(CODE "
|
||||
set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\")
|
||||
|
||||
@@ -45,6 +45,10 @@
|
||||
#include "PMuppCanvas.h"
|
||||
|
||||
#include "icons/mupp_plot_icon.xpm"
|
||||
#ifdef __APPLE__
|
||||
#include "PMacDockIcon.h"
|
||||
#include "icons/mupp_plot_icon_png.h"
|
||||
#endif
|
||||
|
||||
static const char *gFiletypes[] = { "Data files", "*.dat",
|
||||
"All files", "*",
|
||||
@@ -247,6 +251,11 @@ void PMuppCanvas::InitMuppCanvas(const Char_t *title, Int_t wtopx, Int_t wtopy,
|
||||
// replace the generic ROOT window icon; the class hint lets the desktop match mupp_plot.desktop
|
||||
fImp->SetIconPixmap(const_cast<char**>(mupp_plot_icon_xpm));
|
||||
fImp->SetClassHints("mupp_plot", "mupp_plot");
|
||||
#ifdef __APPLE__
|
||||
// on macOS, TGCocoa::SetIconPixmap()/SetClassHints() above are no-ops: the Dock icon
|
||||
// is process-wide and must be set via NSApplication instead
|
||||
SetMacDockIcon(mupp_plot_icon_png, mupp_plot_icon_png_len);
|
||||
#endif
|
||||
fImp->Connect("CloseWindow()", "PMuppCanvas", this, "WindowClosed()");
|
||||
fBar = fImp->GetMenuBar();
|
||||
fPopupMain = fBar->AddPopup("&Mupp");
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -1,89 +1,115 @@
|
||||
/* XPM */
|
||||
static const char *mupp_plot_icon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"64 64 19 1 ",
|
||||
" c black",
|
||||
". c #D94352",
|
||||
"X c #D94353",
|
||||
"o c #DA4352",
|
||||
"O c #DB4352",
|
||||
"+ c #DA4353",
|
||||
"@ c #D94453",
|
||||
"# c #D94553",
|
||||
"$ c #DA4452",
|
||||
"% c #DB4452",
|
||||
"& c #DA4552",
|
||||
"* c #DB4552",
|
||||
"= c #DA4453",
|
||||
"- c #DB4453",
|
||||
"; c #DA4553",
|
||||
": c #DB4354",
|
||||
"> c #DA4454",
|
||||
", c #DA4554",
|
||||
"< c None",
|
||||
"64 64 45 1 ",
|
||||
" c #010101",
|
||||
". c #161616",
|
||||
"X c #222222",
|
||||
"o c #383838",
|
||||
"O c #575757",
|
||||
"+ c #464646",
|
||||
"@ c #6A6A6A",
|
||||
"# c #787878",
|
||||
"$ c #9A9A9A",
|
||||
"% c #9A9A9A",
|
||||
"& c #9A9A9A",
|
||||
"* c #DA4554",
|
||||
"= c #DC515F",
|
||||
"- c #DE5A67",
|
||||
"; c #DF616E",
|
||||
": c #E16874",
|
||||
"> c #E2727D",
|
||||
", c #E05F6C",
|
||||
"< c #E47883",
|
||||
"1 c #828282",
|
||||
"2 c #9A9A9A",
|
||||
"3 c #9A9A9A",
|
||||
"4 c #A5A5A5",
|
||||
"5 c #BABABA",
|
||||
"6 c #9A9A9A",
|
||||
"7 c #E68792",
|
||||
"8 c #E88B94",
|
||||
"9 c #EB9DA5",
|
||||
"0 c #EDA6AD",
|
||||
"q c #EEADB4",
|
||||
"w c #F0B6BB",
|
||||
"e c #F2BCC1",
|
||||
"r c #CDCDCD",
|
||||
"t c #DADADA",
|
||||
"y c #F3C5C9",
|
||||
"u c #F7D5D9",
|
||||
"i c #F5CDD1",
|
||||
"p c #E8E8E8",
|
||||
"a c #FAE7E9",
|
||||
"s c #FFFFFF",
|
||||
"d c #F8DFE1",
|
||||
"f c #9A9A9A",
|
||||
"g c #9A9A9A",
|
||||
"h c None",
|
||||
"j c #9A9A9A",
|
||||
/* pixels */
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<",
|
||||
"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<XX<<<<<<<======<<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<,==X<<<<<========<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<======<<<<<======<<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<========<<<<<====<<<",
|
||||
"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<,=====<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<,,<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X===X<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<=======<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<=======<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====X<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<,,<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<,==<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<,==<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<====X<<<<<<<===<<<<<<<<<<<<<<<< <<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<=======<<<<<<===<<<<<<<<<<<<<<<<< <<<<<<<<<",
|
||||
"<<<<<<<<X==X<<<<<========<<<<<===<<<<<<<<<<<<<<<<<< <<<<<<<<",
|
||||
"<<<<<<<======<<<X========<<<<======<<<<<<<<<<<<<<<<<< <<<<<<<",
|
||||
"<<<<<<========<<<========<<<=======<<<<<<<<<<<<<<<<<<< <<<<<",
|
||||
"<<<<<<========<<<=======,<<X========<<<<<<<<<<<<<<<<<<< <<<<",
|
||||
"<<<<<<========<<<=======<<<=========<<<<<<<<<<<<<<<<<<<< <<<",
|
||||
"<<<<<<========<<<<<,===<<<<=========<<<<<<<<<<<<<<<<<<< <<<<",
|
||||
"<<<<<<========<<<<<,==<<<<<<=======<<<<<<<<<<<<<<<<<<< <<<<<<",
|
||||
"<<<<<<<======<<<<<<,==<<<<<<<======<<<<<<<<<<<<<<<<< <<<<<<<",
|
||||
"<<<<<<<<====<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<<<<<< <<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<<<<< <<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<::<<<<<<<<===<<<<<<<<<<<<<<< <<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
|
||||
"hhhhhf%63222222222222222222222222222222222222222222222236%fhhhhh",
|
||||
"hhhg$222222222222222222222222222222222222222222222222222222$ghhh",
|
||||
"hhf324rpsssssssssssssssssssssssssssssssssssssssssssssssspr423ghh",
|
||||
"hg325ssssssssssssssssssssssssssssssssssssssssssssssssssssss523gh",
|
||||
"h$25ssssssssssssssssssssssssssssssssssssssssssssssssssssssss52$h",
|
||||
"f24ssssssssssssssssssssssssssssssssssssssssssssssssssssssssss42f",
|
||||
"%2rssssssssssssssssssssssssssssssssssssssssssssssssssssssssssr2%",
|
||||
"62pssssssssssssssssssssssssssssssssssssssssssssssssssssssssssp26",
|
||||
"32ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss23",
|
||||
"22sssssss@OOOOOOO@#4tssssssssssssssssssssssssssssssa<<asssssss22",
|
||||
"22sssssssX +tssssssssssssssssssssssssssssa**asssssss22",
|
||||
"22sssssssX 5sssssssssssssssssssssssssssa**asssssss22",
|
||||
"22sssssssX @ttttt4+ .pssssssssssssssssssssssssssa**usssssss22",
|
||||
"22sssssssX 1sssssss# @ssssssssssssssssssy0yssssu-**-ussssss22",
|
||||
"22sssssssX 1ssssssssX Xssssssssssssssssss7*7ssss-****-asssss22",
|
||||
"22sssssssX 1ssssssss# psssssssssssssssss7*7sssi******ysssss22",
|
||||
"22sssssssX 1ssssssss2 tsssssssssssssssss7*7sssy******esssss22",
|
||||
"22sssssssX 1ssssssss2 psssssssssssssssse=*=yssa=*****asssss22",
|
||||
"22sssssssX 1ssssssssO ssssssssssssssssy*****yssy=***wssssss22",
|
||||
"22sssssssX 1ssssssst ossssssssssssssss>*****<sssu**isssssss22",
|
||||
"22sssssssX 1ssssssrX 4ssssssssssssssss-*****-sssa**asssssss22",
|
||||
"22sssssssX o####@o +sssssssssssssssss7*****7sssa**asssssss22",
|
||||
"22sssssssX +psssssssssssssssssa=***=asssa--asssssss22",
|
||||
"22sssssssX .O5ssssssssssssssssssssa;*;asssssssssssssss22",
|
||||
"22sssssssX @rrrrtpssssssssssssssssssssssss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss::usss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss**usss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss**usssadassssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssssa**yssssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssu-***esssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssss-*****assssssssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssu******wssssssssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssu******wssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssss-*****assssssssssssssssssss22",
|
||||
"22sssssssrrrpssssssssssssssssssssssu-***esssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssssssssssssssssssa**yssssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss**ussssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss**ussssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss::ussssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssss,-ysssssssssssssssssssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssss=*ysssssssssssssssssss#pssssssssssssssss22",
|
||||
"22ssssssssssse>8ssssss=*ysssssy>7ssssssssss3 .5sssssssssssssss22",
|
||||
"22sssssssssss0*:sssssa**0sssssq*-sssssssssstX @ssssssssssssss22",
|
||||
"22sssssssssss0*:ssssu-***0ssssq*-ssssssssssspO +pssssssssssss22",
|
||||
"22sssssssssss9*-ssss,*****usss0*-sssssssssssss4 .5sssssssssss22",
|
||||
"22ssssssssss0***>asa******9ss0***>asssssssssssstX @ssssssssss22",
|
||||
"22sssssssssy*****7sa******0si*****<ssssssssssssspO opssssssss22",
|
||||
"22sssssssss8*****=ss>*****ds8******sssssssssssssss2 .5sssssss22",
|
||||
"22sssssssss7******ssa:***ess8******sssssssssssssss@ otsssssss22",
|
||||
"22ssssssssse*****<ssss=*wsssy*****<ssssssssssssspo Osssssssss22",
|
||||
"22ssssssssss8***:assss=*yssss9***;assssssssssss4. .4ssssssssss22",
|
||||
"22sssssssssss8*-ssssss=*ysssss9*-sssssssssssss@ otsssssssssss22",
|
||||
"22sssssssssss0*:ssssss<>usssssq*-ssssssssssspo Osssssssssssss22",
|
||||
"22sssssssssss0*:ssssssssssssssq*-ssssssssss4. .4ssssssssssssss22",
|
||||
"22sssssssssssw-<ssssssssssssssw-<ssssssssss5 otsssssssssssssss22",
|
||||
"32ssssssssssssssssssssssssssssssssssssssssss4sssssssssssssssss23",
|
||||
"62pssssssssssssssssssssssssssssssssssssssssssssssssssssssssssp26",
|
||||
"%2rssssssssssssssssssssssssssssssssssssssssssssssssssssssssssr2%",
|
||||
"f24ssssssssssssssssssssssssssssssssssssssssssssssssssssssssss42f",
|
||||
"h$25ssssssssssssssssssssssssssssssssssssssssssssssssssssssss52%h",
|
||||
"hg325ssssssssssssssssssssssssssssssssssssssssssssssssssssss523gh",
|
||||
"hhg324rpsssssssssssssssssssssssssssssssssssssssssssssssspr423ghh",
|
||||
"hhhg$222222222222222222222222222222222222222222222222222222%ghhh",
|
||||
"hhhhhf%63222222222222222222222222222222222222222222222236%fhhhhh"
|
||||
};
|
||||
File diff suppressed because it is too large.
Load diff
@@ -81,3 +81,22 @@ else (APPLE)
|
||||
)
|
||||
endif (APPLE)
|
||||
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for musrStep. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrStep.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/musrStep.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/musrStep.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-32x32.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME musrStep.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -84,3 +84,22 @@ else (APPLE)
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
endif (APPLE)
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for musrWiz. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrWiz.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/musrWiz.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/musrWiz.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-32x32.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME musrWiz.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -163,4 +163,116 @@
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="0.5"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ F L A M E +++++++++++++++++++++++++++++++++++++++++++ -->
|
||||
<!-- histogram numbers (see musrfit-docu, tutorial 4): 1=F, 2=B, 3=R, 4=L, -->
|
||||
<!-- 5=R_F, 6=R_B, 7=L_F, 8=L_B. Main field (up to 3.5T) along the beam (z), -->
|
||||
<!-- vector field Bx (vertical, +-200G) used for wTF. Phases are starting values only. -->
|
||||
<instrument name="FLAME">
|
||||
<run_name_template>dYYYY/tdc/root/deltat_tdc_flame_YYYY_NNNN</run_name_template>
|
||||
<beamline>PIM3</beamline>
|
||||
<data_file_format>MUSR-ROOT</data_file_format>
|
||||
<tf name="Bx">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="1 5 7"/>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="2 6 8"/>
|
||||
<logic_detector name="R" rel_phase="270.0" forward="3"/>
|
||||
<logic_detector name="L" rel_phase="90.0" forward="4"/>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
<logic_asym_detector name="LR" rel_phase="90.0" forward="4" backward="3" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ V M S (upgraded Dolly) +++++++++++++++++++++++++++++++ -->
|
||||
<!-- grouping from https://www.psi.ch/en/smus/vms: 1=B, 2=F, 3+4+5=L, 6+7+8=R. -->
|
||||
<!-- WEU (0-0.8T) / WEUL (0-50mT) along the beam, WEV (0-15mT) perpendicular. -->
|
||||
<!-- TODO: run name template, fgb_offset, lgb and asym_bkg_range still to be verified -->
|
||||
<!-- (currently FLAME-like MusrRoot values). Phases are starting values only. -->
|
||||
<instrument name="VMS">
|
||||
<run_name_template>dYYYY/tdc/root/deltat_tdc_vms_YYYY_NNNN</run_name_template>
|
||||
<beamline>PIE1</beamline>
|
||||
<data_file_format>MUSR-ROOT</data_file_format>
|
||||
<tf name="WEU">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="L" rel_phase="0.0" forward="3 4 5"/>
|
||||
<logic_detector name="R" rel_phase="180.0" forward="6 7 8"/>
|
||||
<logic_asym_detector name="LR" rel_phase="0.0" forward="3 4 5" backward="6 7 8" alpha="1.0"/>
|
||||
</tf>
|
||||
<tf name="WEV">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="2"/>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="1"/>
|
||||
<logic_detector name="R" rel_phase="270.0" forward="6 7 8"/>
|
||||
<logic_detector name="L" rel_phase="90.0" forward="3 4 5"/>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="1" backward="2" alpha="1.0"/>
|
||||
<logic_asym_detector name="LR" rel_phase="90.0" forward="3 4 5" backward="6 7 8" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf name="WEU">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ G P D +++++++++++++++++++++++++++++++++++++++++++++++++ -->
|
||||
<!-- 1=B, 2=F (from doc/examples/test-asy-PSI-BIN.msr). Main field 0-0.66T, coils -->
|
||||
<!-- rotatable, i.e. parallel (LF) or perpendicular (TF) to the muon spin. -->
|
||||
<!-- TODO: up/down histogram numbers unknown, hence not yet defined. -->
|
||||
<instrument name="GPD">
|
||||
<run_name_template>dYYYY/tdc/deltat_tdc_gpd_NNNN</run_name_template>
|
||||
<beamline>MUE1</beamline>
|
||||
<data_file_format>PSI-BIN</data_file_format>
|
||||
<tf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="1"/>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="2"/>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
</instrument_def_psi>
|
||||
@@ -141,13 +141,13 @@ if (UNIX AND NOT APPLE)
|
||||
FILES
|
||||
${CMAKE_SOURCE_DIR}/cmake/musredit.desktop
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/applications
|
||||
${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps
|
||||
${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
|
||||
)
|
||||
endif (UNIX AND NOT APPLE)
|
||||
|
||||
|
||||
@@ -138,3 +138,22 @@ if (APPLE)
|
||||
else (APPLE)
|
||||
install(TARGETS mupp DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif (APPLE)
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for mupp. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/mupp.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/mupp.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp-plain.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME mupp.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -63,7 +63,12 @@ set(DICT
|
||||
)
|
||||
|
||||
#--- define executable --------------------------------------------------------
|
||||
add_executable(mupp_plot ${SOURCE} ${DICT})
|
||||
#--- on macOS the Dock icon cannot be set through ROOT, hence the Cocoa helper
|
||||
#--- shared with musrview/musrFT/musrt0 is compiled in as well ----------------
|
||||
add_executable(mupp_plot
|
||||
${SOURCE} ${DICT}
|
||||
$<$<PLATFORM_ID:Darwin>:${CMAKE_SOURCE_DIR}/src/classes/PMacDockIcon.mm>
|
||||
)
|
||||
|
||||
#--- add all needed include directories ---------------------------------------
|
||||
target_include_directories(mupp_plot
|
||||
@@ -73,10 +78,14 @@ target_include_directories(mupp_plot
|
||||
${CMAKE_CURRENT_BINARY_DIR}/..
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
$<$<PLATFORM_ID:Darwin>:${CMAKE_SOURCE_DIR}/src/include>
|
||||
)
|
||||
|
||||
#--- define all to be linked libs ---------------------------------------------
|
||||
target_link_libraries(mupp_plot ${ROOT_LIBRARIES})
|
||||
if (APPLE)
|
||||
target_link_libraries(mupp_plot "-framework Cocoa")
|
||||
endif (APPLE)
|
||||
|
||||
#--- install ------------------------------------------------------------------
|
||||
if (APPLE)
|
||||
@@ -102,6 +111,11 @@ if (UNIX AND NOT APPLE)
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot.png
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/mupp_plot-512.png
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/512x512/apps
|
||||
RENAME mupp_plot.png
|
||||
)
|
||||
#--- a stale icon cache would hide the new icon, hence refresh an existing one
|
||||
install(CODE "
|
||||
set(icon_dir \"\$ENV{DESTDIR}${MUSRFIT_XDG_DATA_DIR}/icons/hicolor\")
|
||||
|
||||
@@ -68,6 +68,10 @@
|
||||
#include "PMuppCanvas.h"
|
||||
|
||||
#include "icons/mupp_plot_icon.xpm"
|
||||
#ifdef __APPLE__
|
||||
#include "PMacDockIcon.h"
|
||||
#include "icons/mupp_plot_icon_png.h"
|
||||
#endif
|
||||
|
||||
static const char *gFiletypes[] = { "Data files", "*.dat",
|
||||
"All files", "*",
|
||||
@@ -278,6 +282,11 @@ void PMuppCanvas::InitMuppCanvas(const Char_t *title, Int_t wtopx, Int_t wtopy,
|
||||
// replace the generic ROOT window icon; the class hint lets the desktop match mupp_plot.desktop
|
||||
fImp->SetIconPixmap(const_cast<char**>(mupp_plot_icon_xpm));
|
||||
fImp->SetClassHints("mupp_plot", "mupp_plot");
|
||||
#ifdef __APPLE__
|
||||
// on macOS, TGCocoa::SetIconPixmap()/SetClassHints() above are no-ops: the Dock icon
|
||||
// is process-wide and must be set via NSApplication instead
|
||||
SetMacDockIcon(mupp_plot_icon_png, mupp_plot_icon_png_len);
|
||||
#endif
|
||||
fImp->Connect("CloseWindow()", "PMuppCanvas", this, "WindowClosed()");
|
||||
fBar = fImp->GetMenuBar();
|
||||
fPopupMain = fBar->AddPopup("&Mupp");
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.5 KiB |
@@ -1,89 +1,115 @@
|
||||
/* XPM */
|
||||
static const char *mupp_plot_icon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"64 64 19 1 ",
|
||||
" c black",
|
||||
". c #D94352",
|
||||
"X c #D94353",
|
||||
"o c #DA4352",
|
||||
"O c #DB4352",
|
||||
"+ c #DA4353",
|
||||
"@ c #D94453",
|
||||
"# c #D94553",
|
||||
"$ c #DA4452",
|
||||
"% c #DB4452",
|
||||
"& c #DA4552",
|
||||
"* c #DB4552",
|
||||
"= c #DA4453",
|
||||
"- c #DB4453",
|
||||
"; c #DA4553",
|
||||
": c #DB4354",
|
||||
"> c #DA4454",
|
||||
", c #DA4554",
|
||||
"< c None",
|
||||
"64 64 45 1 ",
|
||||
" c #010101",
|
||||
". c #161616",
|
||||
"X c #222222",
|
||||
"o c #383838",
|
||||
"O c #575757",
|
||||
"+ c #464646",
|
||||
"@ c #6A6A6A",
|
||||
"# c #787878",
|
||||
"$ c #9A9A9A",
|
||||
"% c #9A9A9A",
|
||||
"& c #9A9A9A",
|
||||
"* c #DA4554",
|
||||
"= c #DC515F",
|
||||
"- c #DE5A67",
|
||||
"; c #DF616E",
|
||||
": c #E16874",
|
||||
"> c #E2727D",
|
||||
", c #E05F6C",
|
||||
"< c #E47883",
|
||||
"1 c #828282",
|
||||
"2 c #9A9A9A",
|
||||
"3 c #9A9A9A",
|
||||
"4 c #A5A5A5",
|
||||
"5 c #BABABA",
|
||||
"6 c #9A9A9A",
|
||||
"7 c #E68792",
|
||||
"8 c #E88B94",
|
||||
"9 c #EB9DA5",
|
||||
"0 c #EDA6AD",
|
||||
"q c #EEADB4",
|
||||
"w c #F0B6BB",
|
||||
"e c #F2BCC1",
|
||||
"r c #CDCDCD",
|
||||
"t c #DADADA",
|
||||
"y c #F3C5C9",
|
||||
"u c #F7D5D9",
|
||||
"i c #F5CDD1",
|
||||
"p c #E8E8E8",
|
||||
"a c #FAE7E9",
|
||||
"s c #FFFFFF",
|
||||
"d c #F8DFE1",
|
||||
"f c #9A9A9A",
|
||||
"g c #9A9A9A",
|
||||
"h c None",
|
||||
"j c #9A9A9A",
|
||||
/* pixels */
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<",
|
||||
"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<",
|
||||
"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<XX<<<<<<<======<<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<========<",
|
||||
"<<< <<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<,==X<<<<<========<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<======<<<<<======<<",
|
||||
"<<< <<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<========<<<<<====<<<",
|
||||
"<<< <<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<========<<<<<===<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<,=====<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<====<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<,,<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<==<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X===X<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<=======<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<========<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<=======<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<====X<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<X==<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<,,<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<,==<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<,==<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<====X<<<<<<<===<<<<<<<<<<<<<<<< <<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<=======<<<<<<===<<<<<<<<<<<<<<<<< <<<<<<<<<",
|
||||
"<<<<<<<<X==X<<<<<========<<<<<===<<<<<<<<<<<<<<<<<< <<<<<<<<",
|
||||
"<<<<<<<======<<<X========<<<<======<<<<<<<<<<<<<<<<<< <<<<<<<",
|
||||
"<<<<<<========<<<========<<<=======<<<<<<<<<<<<<<<<<<< <<<<<",
|
||||
"<<<<<<========<<<=======,<<X========<<<<<<<<<<<<<<<<<<< <<<<",
|
||||
"<<<<<<========<<<=======<<<=========<<<<<<<<<<<<<<<<<<<< <<<",
|
||||
"<<<<<<========<<<<<,===<<<<=========<<<<<<<<<<<<<<<<<<< <<<<",
|
||||
"<<<<<<========<<<<<,==<<<<<<=======<<<<<<<<<<<<<<<<<<< <<<<<<",
|
||||
"<<<<<<<======<<<<<<,==<<<<<<<======<<<<<<<<<<<<<<<<< <<<<<<<",
|
||||
"<<<<<<<<====<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<<<<<< <<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<,==<<<<<<<<===<<<<<<<<<<<<<<<<< <<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<::<<<<<<<<===<<<<<<<<<<<<<<< <<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<",
|
||||
"<<<<<<<<X==<<<<<<<<<<<<<<<<<<<===<<<<<<<<<<<<<< <<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
|
||||
"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
|
||||
"hhhhhf%63222222222222222222222222222222222222222222222236%fhhhhh",
|
||||
"hhhg$222222222222222222222222222222222222222222222222222222$ghhh",
|
||||
"hhf324rpsssssssssssssssssssssssssssssssssssssssssssssssspr423ghh",
|
||||
"hg325ssssssssssssssssssssssssssssssssssssssssssssssssssssss523gh",
|
||||
"h$25ssssssssssssssssssssssssssssssssssssssssssssssssssssssss52$h",
|
||||
"f24ssssssssssssssssssssssssssssssssssssssssssssssssssssssssss42f",
|
||||
"%2rssssssssssssssssssssssssssssssssssssssssssssssssssssssssssr2%",
|
||||
"62pssssssssssssssssssssssssssssssssssssssssssssssssssssssssssp26",
|
||||
"32ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss23",
|
||||
"22sssssss@OOOOOOO@#4tssssssssssssssssssssssssssssssa<<asssssss22",
|
||||
"22sssssssX +tssssssssssssssssssssssssssssa**asssssss22",
|
||||
"22sssssssX 5sssssssssssssssssssssssssssa**asssssss22",
|
||||
"22sssssssX @ttttt4+ .pssssssssssssssssssssssssssa**usssssss22",
|
||||
"22sssssssX 1sssssss# @ssssssssssssssssssy0yssssu-**-ussssss22",
|
||||
"22sssssssX 1ssssssssX Xssssssssssssssssss7*7ssss-****-asssss22",
|
||||
"22sssssssX 1ssssssss# psssssssssssssssss7*7sssi******ysssss22",
|
||||
"22sssssssX 1ssssssss2 tsssssssssssssssss7*7sssy******esssss22",
|
||||
"22sssssssX 1ssssssss2 psssssssssssssssse=*=yssa=*****asssss22",
|
||||
"22sssssssX 1ssssssssO ssssssssssssssssy*****yssy=***wssssss22",
|
||||
"22sssssssX 1ssssssst ossssssssssssssss>*****<sssu**isssssss22",
|
||||
"22sssssssX 1ssssssrX 4ssssssssssssssss-*****-sssa**asssssss22",
|
||||
"22sssssssX o####@o +sssssssssssssssss7*****7sssa**asssssss22",
|
||||
"22sssssssX +psssssssssssssssssa=***=asssa--asssssss22",
|
||||
"22sssssssX .O5ssssssssssssssssssssa;*;asssssssssssssss22",
|
||||
"22sssssssX @rrrrtpssssssssssssssssssssssss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss::usss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss**usss7*7ssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssss**usssadassssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssssa**yssssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssssu-***esssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssss-*****assssssssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssu******wssssssssssssssssssss22",
|
||||
"22sssssssX 1sssssssssssssssssssssu******wssssssssssssssssssss22",
|
||||
"22sssssssX 1ssssssssssssssssssssss-*****assssssssssssssssssss22",
|
||||
"22sssssssrrrpssssssssssssssssssssssu-***esssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssssssssssssssssssa**yssssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss**ussssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss**ussssssssssssssssssssss22",
|
||||
"22sssssssssssssssssssssssssssssssssss::ussssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssss,-ysssssssssssssssssssssssssssssssssssss22",
|
||||
"22ssssssssssssssssssss=*ysssssssssssssssssss#pssssssssssssssss22",
|
||||
"22ssssssssssse>8ssssss=*ysssssy>7ssssssssss3 .5sssssssssssssss22",
|
||||
"22sssssssssss0*:sssssa**0sssssq*-sssssssssstX @ssssssssssssss22",
|
||||
"22sssssssssss0*:ssssu-***0ssssq*-ssssssssssspO +pssssssssssss22",
|
||||
"22sssssssssss9*-ssss,*****usss0*-sssssssssssss4 .5sssssssssss22",
|
||||
"22ssssssssss0***>asa******9ss0***>asssssssssssstX @ssssssssss22",
|
||||
"22sssssssssy*****7sa******0si*****<ssssssssssssspO opssssssss22",
|
||||
"22sssssssss8*****=ss>*****ds8******sssssssssssssss2 .5sssssss22",
|
||||
"22sssssssss7******ssa:***ess8******sssssssssssssss@ otsssssss22",
|
||||
"22ssssssssse*****<ssss=*wsssy*****<ssssssssssssspo Osssssssss22",
|
||||
"22ssssssssss8***:assss=*yssss9***;assssssssssss4. .4ssssssssss22",
|
||||
"22sssssssssss8*-ssssss=*ysssss9*-sssssssssssss@ otsssssssssss22",
|
||||
"22sssssssssss0*:ssssss<>usssssq*-ssssssssssspo Osssssssssssss22",
|
||||
"22sssssssssss0*:ssssssssssssssq*-ssssssssss4. .4ssssssssssssss22",
|
||||
"22sssssssssssw-<ssssssssssssssw-<ssssssssss5 otsssssssssssssss22",
|
||||
"32ssssssssssssssssssssssssssssssssssssssssss4sssssssssssssssss23",
|
||||
"62pssssssssssssssssssssssssssssssssssssssssssssssssssssssssssp26",
|
||||
"%2rssssssssssssssssssssssssssssssssssssssssssssssssssssssssssr2%",
|
||||
"f24ssssssssssssssssssssssssssssssssssssssssssssssssssssssssss42f",
|
||||
"h$25ssssssssssssssssssssssssssssssssssssssssssssssssssssssss52%h",
|
||||
"hg325ssssssssssssssssssssssssssssssssssssssssssssssssssssss523gh",
|
||||
"hhg324rpsssssssssssssssssssssssssssssssssssssssssssssssspr423ghh",
|
||||
"hhhg$222222222222222222222222222222222222222222222222222222%ghhh",
|
||||
"hhhhhf%63222222222222222222222222222222222222222222222236%fhhhhh"
|
||||
};
|
||||
File diff suppressed because it is too large.
Load diff
@@ -81,3 +81,22 @@ else (APPLE)
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
endif (APPLE)
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for musrStep. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrStep.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/musrStep.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/musrStep.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrStep-32x32.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME musrStep.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -85,3 +85,22 @@ else (APPLE)
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
endif (APPLE)
|
||||
|
||||
#--- Linux: the .desktop file (named after the executable, i.e. the Wayland
|
||||
#--- app-id) and the icon let the desktop show the musrfit icon for musrWiz. ---
|
||||
if (UNIX AND NOT APPLE)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/cmake/musrWiz.desktop.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/musrWiz.desktop
|
||||
@ONLY
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/musrWiz.desktop
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/musrWiz-32x32.svg
|
||||
DESTINATION ${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/scalable/apps
|
||||
RENAME musrWiz.svg
|
||||
)
|
||||
endif ()
|
||||
@@ -163,4 +163,116 @@
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="0.5"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ F L A M E +++++++++++++++++++++++++++++++++++++++++++ -->
|
||||
<!-- histogram numbers (see musrfit-docu, tutorial 4): 1=F, 2=B, 3=R, 4=L, -->
|
||||
<!-- 5=R_F, 6=R_B, 7=L_F, 8=L_B. Main field (up to 3.5T) along the beam (z), -->
|
||||
<!-- vector field Bx (vertical, +-200G) used for wTF. Phases are starting values only. -->
|
||||
<instrument name="FLAME">
|
||||
<run_name_template>dYYYY/tdc/root/deltat_tdc_flame_YYYY_NNNN</run_name_template>
|
||||
<beamline>PIM3</beamline>
|
||||
<data_file_format>MUSR-ROOT</data_file_format>
|
||||
<tf name="Bx">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="1 5 7"/>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="2 6 8"/>
|
||||
<logic_detector name="R" rel_phase="270.0" forward="3"/>
|
||||
<logic_detector name="L" rel_phase="90.0" forward="4"/>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
<logic_asym_detector name="LR" rel_phase="90.0" forward="4" backward="3" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="2 6 8" backward="1 5 7" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ V M S (upgraded Dolly) +++++++++++++++++++++++++++++++ -->
|
||||
<!-- grouping from https://www.psi.ch/en/smus/vms: 1=B, 2=F, 3+4+5=L, 6+7+8=R. -->
|
||||
<!-- WEU (0-0.8T) / WEUL (0-50mT) along the beam, WEV (0-15mT) perpendicular. -->
|
||||
<!-- TODO: run name template, fgb_offset, lgb and asym_bkg_range still to be verified -->
|
||||
<!-- (currently FLAME-like MusrRoot values). Phases are starting values only. -->
|
||||
<instrument name="VMS">
|
||||
<run_name_template>dYYYY/tdc/root/deltat_tdc_vms_YYYY_NNNN</run_name_template>
|
||||
<beamline>PIE1</beamline>
|
||||
<data_file_format>MUSR-ROOT</data_file_format>
|
||||
<tf name="WEU">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="L" rel_phase="0.0" forward="3 4 5"/>
|
||||
<logic_detector name="R" rel_phase="180.0" forward="6 7 8"/>
|
||||
<logic_asym_detector name="LR" rel_phase="0.0" forward="3 4 5" backward="6 7 8" alpha="1.0"/>
|
||||
</tf>
|
||||
<tf name="WEV">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="2"/>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="1"/>
|
||||
<logic_detector name="R" rel_phase="270.0" forward="6 7 8"/>
|
||||
<logic_detector name="L" rel_phase="90.0" forward="3 4 5"/>
|
||||
<logic_asym_detector name="BF" rel_phase="0.0" forward="1" backward="2" alpha="1.0"/>
|
||||
<logic_asym_detector name="LR" rel_phase="90.0" forward="3 4 5" backward="6 7 8" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf name="WEU">
|
||||
<no_of_detectors>8</no_of_detectors>
|
||||
<fgb_offset>30</fgb_offset>
|
||||
<lgb>100000</lgb>
|
||||
<asym_bkg_range>100 1300</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
<!-- +++++++++++++++++++++++++++ G P D +++++++++++++++++++++++++++++++++++++++++++++++++ -->
|
||||
<!-- 1=B, 2=F (from doc/examples/test-asy-PSI-BIN.msr). Main field 0-0.66T, coils -->
|
||||
<!-- rotatable, i.e. parallel (LF) or perpendicular (TF) to the muon spin. -->
|
||||
<!-- TODO: up/down histogram numbers unknown, hence not yet defined. -->
|
||||
<instrument name="GPD">
|
||||
<run_name_template>dYYYY/tdc/deltat_tdc_gpd_NNNN</run_name_template>
|
||||
<beamline>MUE1</beamline>
|
||||
<data_file_format>PSI-BIN</data_file_format>
|
||||
<tf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_detector name="B" rel_phase="0.0" forward="1"/>
|
||||
<logic_detector name="F" rel_phase="180.0" forward="2"/>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</tf>
|
||||
<zf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</zf>
|
||||
<lf>
|
||||
<no_of_detectors>2</no_of_detectors>
|
||||
<fgb_offset>5</fgb_offset>
|
||||
<lgb>7990</lgb>
|
||||
<asym_bkg_range>60 150</asym_bkg_range>
|
||||
<logic_asym_detector name="FB" rel_phase="0.0" forward="2" backward="1" alpha="1.0"/>
|
||||
</lf>
|
||||
</instrument>
|
||||
</instrument_def_psi>
|
||||
@@ -142,13 +142,13 @@ if (UNIX AND NOT APPLE)
|
||||
FILES
|
||||
${CMAKE_SOURCE_DIR}/cmake/musredit.desktop
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/applications
|
||||
${MUSRFIT_XDG_DATA_DIR}/applications
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/icons/musredit.png
|
||||
DESTINATION
|
||||
${MUSRFIT_XDG_DATADIR}/icons/hicolor/48x48/apps
|
||||
${MUSRFIT_XDG_DATA_DIR}/icons/hicolor/48x48/apps
|
||||
)
|
||||
endif (UNIX AND NOT APPLE)
|
||||
|
||||
|
||||
Reference in new issue
Block a user