Compare commits

..

1110 Commits

Author SHA1 Message Date
suter_a b05ed4de05 mupp: fix crash in PmuppGui::getValues plotting a variable.
getValues()/getErrors() return a std::vector by value, but the QVector was
built from begin() of one call and end() of a second call -> iterators into
two distinct temporaries -> UB and a segfault in getValues(). Bind the result
to a single local before taking begin()/end(). Same in getPosErr/getNegErr.

This surfaced reliably when plotting a <python>-generated variable added via
the GUI (the script path was unaffected as it reads getValues() only once).

Also fix check() to validate the actually selected collections
(GetCollection(idx[i]) instead of GetCollection(i)).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-27 15:52:02 +02:00
suter_a a575d7398e mupp: simplify the python example to a single <python> block.
Use the new coll[]/collErr[] interface so sigmaSC-vs-temp-py.txt computes both
SigmaSC_10 and SigmaSC_150 in one block instead of one block per collection.
Collection 0 is addressed by index (coll[0]) and collection 1 by name
(coll['...Tscan.db']) to show both addressing modes. Output is unchanged.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-27 14:04:03 +02:00
suter_a 3abdace782 mupp: expose all collections inside a <python> block (coll[]/collErr[]).
A <python> variable block previously saw only the parameters of the single
collection the variable is linked to via 'col', injected as bare names plus
par[]/parErr[]. To compute variables for several collections one therefore
needed a separate block per collection.

Now every loaded collection is additionally injected as coll[]/collErr[]
dictionaries, addressable both by integer index (matching 'col <idx>' /
'select <idx>') and by collection name; index and name keys reference the same
per-parameter dict. A single block placed after all 'var = python' declarations
can thus compute - and combine - variables for any collection, e.g.
coll[0]['Sigma'] or coll['NAME.db']['Sigma'].

The bound-collection bare names / par[] / parErr[] are unchanged, so existing
scripts and GUI variables keep working. The collection list is threaded through
PmuppScript::var_cmd and the GUI add()/check() paths into PVarHandler.

Verified: a one-block script using both an index key and a name key reproduces
the numeric output of the equivalent two-block script bit-for-bit.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-27 13:55:38 +02:00
suter_a f58b65a338 add a python mupp script file. 2026-05-27 13:04:29 +02:00
suter_a 9c09d0bd1a mupp: pair each python variable with its own <python> block.
getPythonBlock() always returned the first <python> ... </python>
entry of the script, so when several 'var X = python' declarations
each had their own block, every declaration after the first one
re-ran the first block and the read-back of the requested variable
failed. Thread the script index through var_cmd into getPythonBlock,
which now scans from that position onwards. Each declaration is
paired with the next block in script order.
2026-05-27 13:03:17 +02:00
suter_a 6a6de42308 mupp: add x-axis error bar support to all plot outputs.
Previously only y-errors were rendered. The IPC data file format now
includes x-errors per point (x, xPosErr, xNegErr, y, yPosErr, yNegErr,
...). Both the live canvas (PMuppCanvas) and the ROOT macro exports
(GUI and script path) propagate x-errors to TGraphAsymmErrors;
x-errors default to 0.0 when the parameter carries none.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-26 20:43:05 +02:00
suter_a 9d859950d2 mupp: optional Python3 interface for variables via ROOT TPython.
Variables can now be computed by an embedded Python3 interpreter in addition
to the Boost.Spirit X3 expression engine. A <python> ... </python> block
receives all collection parameters as per-run lists (bare names, plus
par[]/parErr[] dictionaries as a fallback for names that are not valid Python
identifiers such as 'lambda') and must assign <name> and <name>Err; errors are
user supplied. Works both in the GUI variable dialog and in scripts.

The feature is optional and only enabled when ROOT is built with TPython
(CMake target ROOT::ROOTTPython); otherwise it compiles out. See MUPP_PY.README
for ROOT configure requirements and usage.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-26 19:06:07 +02:00
suter_a 64f4e1d2dd mupp: RUN is now treated as a variable.
Build and Deploy Documentation / build-and-deploy (push) Successful in 31s
2026-05-20 12:45:13 +02:00
suter_a bedbe2584b proper handling in dump_header of TDirectory in combination with the summary option.
Build and Deploy Documentation / build-and-deploy (push) Successful in 31s
2026-04-30 11:07:20 +02:00
suter_a a8cd816123 Merge pull request 'adds files for the new tutorial to doc/tutorials .' (#14) from tutorial into root6
Build and Deploy Documentation / build-and-deploy (push) Successful in 30s
Reviewed-on: #14
2026-04-29 13:18:41 +02:00
krieger_j b1ac4d33b2 fixed relative paths to new data location. 2026-04-22 14:57:56 +02:00
krieger_j a5181c4429 data and template files for the tutorials. State: as used in the 2026 Muon Spectroscopy School. 2026-04-22 14:54:09 +02:00
suter_a 92143b1c2e fix wrong install path for macOS Qt-based applications.
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-04-17 14:20:43 +02:00
suter_a 3a71dea163 cmake: make sure that lib's are lib and not lib64 for musrfit. 2026-04-17 13:54:38 +02:00
suter_a a735f92195 more improvements on the cmake build system. 2026-04-17 09:15:07 +02:00
suter_a 53ec95db6e work on cleaner cmake. 2026-04-15 20:29:55 +02:00
suter_a dbbaf554b2 MusrRoot: XML-schema evaluation files are moved to https://doi.org/10.5281/zenodo.19593555. to have a DOI and not be depend on a shaky URL
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-04-15 14:34:32 +02:00
suter_a bc20dd33be Merge pull request 'adds installation of musredit as a unix app' (#13) from dev-rpm-app into root6
Build and Deploy Documentation / build-and-deploy (push) Successful in 28s
Reviewed-on: #13
Reviewed-by: suter_a <andreas.suter@psi.ch>
2026-03-15 09:59:12 +01:00
krieger_j 5304f276d8 adds installation of musredit as a unix app 2026-03-13 15:20:31 +01:00
suter_a 9083561e20 added PyScripts/nexus_muon_validator.py to nexus.
Build and Deploy Documentation / build-and-deploy (push) Successful in 21s
2026-03-07 14:50:57 +01:00
suter_a 14d2648fc4 remove obsolate test/nexus
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-03-07 13:38:53 +01:00
suter_a f91bc12709 suppress warning missing deadtime correction if not relevant.
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-03-03 08:52:19 +01:00
suter_a 3174b320b2 fix linker errors: add HDF5 C++ lib and FFTW3 include paths
Build and Deploy Documentation / build-and-deploy (push) Successful in 22s
- Add ${HDF5_LIBRARIES} to PMusr link dependencies so HDF5 C++ symbols
  (H5::DataType, H5::PredType, etc.) used in PRunDataHandler.cpp resolve.
- Add ${FFTW3_INCLUDE} to musrRootValidation and write_musrRoot_runHeader
  include paths; both pull in PMusr.h which transitively includes fftw3.h.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-01 11:21:01 +01:00
suter_a c062e0f4e9 add musrfitConfig.cmake, etc. for musrfit.
Build and Deploy Documentation / build-and-deploy (push) Successful in 30s
2026-03-01 09:35:34 +01:00
suter_a ed2451d657 adopted after deadtime correction offset fix.
Build and Deploy Documentation / build-and-deploy (push) Successful in 21s
2026-02-23 13:17:00 +01:00
suter_a a005e5750f fixed an index by one offset issue.
Build and Deploy Documentation / build-and-deploy (push) Successful in 21s
2026-02-23 13:02:46 +01:00
suter_a b29c7247e7 make sure that the requested pointer is not a nullptr.
Build and Deploy Documentation / build-and-deploy (push) Successful in 21s
2026-02-23 12:52:26 +01:00
suter_a 92008a4e49 fix Boost_INCLUDE_DIR -> Boost_INCLUDE_DIRS
Build and Deploy Documentation / build-and-deploy (push) Successful in 21s
2026-02-21 17:38:11 +01:00
suter_a 49e355f58a updated the local user-docu.
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-02-21 16:04:48 +01:00
suter_a 901fda9298 adopted ChangeLog. Fixed a minor issue in PTextEdit. Adopted ctests for the new NeXus handling.
Build and Deploy Documentation / build-and-deploy (push) Successful in 29s
2026-02-21 15:32:03 +01:00
suter_a 7115c0027c Merge branch 'nxs' into root6 2026-02-21 12:37:21 +01:00
suter_a 7d5aaf6429 increased the version number of musrfit and libPMusr. 2026-02-21 07:45:25 +01:00
suter_a 79b05cced7 adopted the PNeXus lib such that the class naming scheme is self-consistent. 2026-02-21 07:44:20 +01:00
suter_a 08350a2fde warning that deadtime correction estimate is not yet implemented. I am not even sure this would be a good feature. 2026-02-21 07:19:42 +01:00
suter_a 22b1ad7f2f full implementation of the deadtime correction from file for PRunAsymmetryRRF. 2026-02-21 07:15:44 +01:00
suter_a bb8bdafddd full implementation of the deadtime correction from file. 2026-02-21 07:10:48 +01:00
suter_a d5e305411f added a warning if deadtime correction cannot be carried out (missing parameters, etc.) 2026-02-21 07:09:36 +01:00
suter_a 50187b0c65 add DeadTimeCorrection to PRunAsymmetry - no ADDRUN handling yet. 2026-02-20 19:47:21 +01:00
suter_a d7908573b8 PRunSingleHistoRRF: add DeadTimeCorrection, and improve ADDRUN readability 2026-02-20 19:01:33 +01:00
suter_a 9aae350c13 move DeadTimeCorrection to PRunBase. Make ADDRUN part in PrepareData more readable. 2026-02-20 18:17:05 +01:00
suter_a 390b9770ca add an ADDRUN example. 2026-02-20 16:14:13 +01:00
suter_a ba939574a4 added musrview png ref test via ctest
Build and Deploy Documentation / build-and-deploy (push) Successful in 27s
2026-02-18 17:07:20 +01:00
suter_a c50e4a3a06 add ctest integration tests for musrfit maxLH/chisq validation
Build and Deploy Documentation / build-and-deploy (push) Successful in 28s
Add a Python-based test script that runs musrfit -c on each example
msr-file, extracts the maxLH or chisq value, and checks it against
a reference value with a relative tolerance of 1e-4. Covers all 13
example msr-files (single histogram and asymmetry fits).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-17 18:05:24 +01:00
suter_a f00f188f0b filter out '\r' and '\n' from command string (macOS issue). 2026-02-13 12:56:50 +01:00
suter_a 5a2f45c083 filter out '\r' and '\n' from command string (macOS issue).
Build and Deploy Documentation / build-and-deploy (push) Successful in 27s
2026-02-13 12:46:16 +01:00
suter_a 4136806847 better hdf4/5 include handling. 2026-02-11 16:05:02 +01:00
suter_a 6a41458310 start working on the deadtime correction. 2026-02-08 15:34:22 +01:00
suter_a d70fd34345 improved NeXus docu. 2026-02-08 09:11:36 +01:00
suter_a 3858cc723a improved docu for HDF4/5. 2026-02-07 21:43:34 +01:00
suter_a a6f5b956bf adopt HDF4 support for proper hierarchical writing of the data. 2026-02-07 21:26:35 +01:00
suter_a 86ecfc84af fixed a copy/paste error. 2026-02-07 21:24:14 +01:00
suter_a 8cb4fc7221 clean up HDF4 in PNeXus. First implementation for HDF4 IDF1/2 write. Compiles, but still some issues. 2026-02-07 20:54:09 +01:00
suter_a 95d087164d first full mandatory HDF5 IDF V2 writer. 2026-02-07 20:17:23 +01:00
suter_a 8f3ad0c61d PNeXus now handles std::vector<> attributes new correctly. HDF4/5 now is using int. 2026-02-07 20:00:27 +01:00
suter_a 49d42c93ba more work on HDF5 IDF V2. 2026-02-07 19:34:26 +01:00
suter_a df379b834e first full version for HDF5 IDF V1 write. 2026-02-07 17:25:52 +01:00
suter_a 3bb004ea2d more work on the NeXus write routines. 2026-02-07 11:31:11 +01:00
suter_a fc478d27c7 make sure that the config.h is accessible for the PMusr lib. 2026-02-07 11:29:48 +01:00
suter_a c690965025 add a function in the NeXus lib which gives the time in ISO8601. 2026-02-07 11:28:38 +01:00
suter_a 300c9200df start implementing the NeXus write routines, needed by any2many. 2026-02-07 08:05:42 +01:00
suter_a 4dcef1a835 add HDF4/HDF5 library version information, needed for writing. 2026-02-07 08:05:09 +01:00
suter_a 4519a0b76e add more complete dump info for NeXus. 2026-02-06 18:08:37 +01:00
suter_a 3aecdbf0a8 added the missing sample information when reading NeXus IDF V2. 2026-02-06 15:15:10 +01:00
suter_a dfa8852cfe removed debug tag. 2026-02-06 15:14:25 +01:00
suter_a 29fbb4a62b replace the NeXus IDF 2 example. 2026-02-06 14:03:55 +01:00
suter_a de8b02b94d more complete doxygen docu. 2026-02-06 12:43:55 +01:00
suter_a dd2f743b3a added docu by Claude for PNeXus. 2026-02-06 08:45:58 +01:00
suter_a d5dbc12175 NeXus HDF4/HDF5 IDF V1: read 'frames_good' 2026-02-05 13:29:27 +01:00
suter_a 643be9738f fixed wrong path in NeXus IDF V2. 2026-02-05 12:59:10 +01:00
suter_a 88b5e492dd NeXus IDF V2 detector_1 -> instrument/detector_1 where possible. 2026-02-05 12:08:40 +01:00
suter_a 810306cb2a first full IDF V2 implementation. 2026-02-05 10:59:15 +01:00
suter_a 43cb8b2460 start with the implementation of NeXus IDF V2. 2026-02-04 19:48:38 +01:00
suter_a ceb9673330 read deadtime parameters for IDF V1. 2026-02-04 17:57:48 +01:00
suter_a da0b356e3b more work on the deadtime correction on the msr-file side. 2026-02-04 13:29:07 +01:00
suter_a b262ee33c5 start implementing with the deadtime correction, if present 2026-02-04 13:20:10 +01:00
suter_a 12888be4c9 add deadtime correction related params. 2026-02-04 11:06:56 +01:00
suter_a 867ac4895b switched to HDF4/HDF5 template loading in order to simplify the code. 2026-02-04 09:26:49 +01:00
suter_a a6c9120d06 check for IDF 1/2. 2026-02-03 17:38:56 +01:00
suter_a 417901e271 HDF4 handling completed. 2026-02-03 16:17:06 +01:00
suter_a 8d1dcef2de add more HDF4 header info: counts. 2026-02-03 08:03:13 +01:00
suter_a 30fbd8eb67 fixed typo, and added file pointer checks. 2026-02-02 19:14:14 +01:00
suter_a 76dbd757e3 dump_header can now handle HDF4/HDF5 NeXus files, without the NeXus library. 2026-02-02 19:08:12 +01:00
suter_a c894c21bf3 add more HDF4 header info. 2026-02-02 08:02:41 +01:00
suter_a 008ca7210a add more HDF4 header info. 2026-02-01 19:49:55 +01:00
suter_a 60f11dfc0e add more HDF4 header info. 2026-02-01 18:55:49 +01:00
suter_a 3aaca28c87 start populating HDF4 header info. 2026-02-01 17:54:02 +01:00
suter_a d4f0855b19 fix git-revision.h generation: output to build tree and add missing dependencies
Generate git-revision.h into CMAKE_BINARY_DIR/src/ (which is in the
include path) instead of the source tree. Remove the header from
add_executable() source lists, and add missing add_dependencies on
git_revision for all Qt5/Qt6 targets.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-29 19:59:47 +01:00
suter_a 9d173203ff fix git-revision.h generation: output to build tree and add missing dependencies
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
Generate git-revision.h into CMAKE_BINARY_DIR/src/ (which is in the
include path) instead of the source tree. Remove the header from
add_executable() source lists, and add missing add_dependencies on
git_revision for all Qt5/Qt6 targets.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-29 19:52:16 +01:00
suter_a 00c980af68 generate git-revision.h at build time instead of configure time
Replace execute_process with add_custom_target so the git revision
check runs on every build, not just on cmake configure.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-29 19:40:33 +01:00
suter_a fb9d6e917c proper TDirectory handling for the histos. 2026-01-29 19:40:20 +01:00
suter_a 2eb0cf28d5 fixed missing TDirectory handling of RunSummary in dump_header.cpp 2026-01-29 19:40:10 +01:00
suter_a 8b054b77b9 generate git-revision.h at build time instead of configure time
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
Replace execute_process with add_custom_target so the git revision
check runs on every build, not just on cmake configure.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-29 19:35:20 +01:00
suter_a 4e29ad6898 proper TDirectory handling for the histos.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2026-01-26 20:32:34 +01:00
suter_a 4ac7a7d01c fixed missing TDirectory handling of RunSummary in dump_header.cpp
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2026-01-26 19:52:41 +01:00
suter_a 65efb389c3 first test to read hdf4/hdf5 directly. 2026-01-25 16:20:10 +01:00
suter_a 83c8f6630c 2nd spot for cmake version check for policy setting. 2026-01-25 14:50:23 +01:00
suter_a 227bfb7419 2nd spot for cmake version check for policy setting.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2026-01-25 14:49:38 +01:00
suter_a 70eb0397df cmake version check for policy setting. 2026-01-25 14:45:46 +01:00
suter_a 3c02c6073a cmake version check for policy setting. 2026-01-25 14:43:49 +01:00
suter_a b3e4d247f0 add HDF4/HDF5 example programs. 2026-01-25 14:07:36 +01:00
suter_a 6aaed94adf add doxygen file comment. 2026-01-25 12:05:04 +01:00
suter_a c3e9c03920 added HDF5 ISIS NeXus class handling. 2026-01-25 11:15:49 +01:00
suter_a 909fa6519d added HDF4 ISIS NeXus class handling. 2026-01-25 10:51:23 +01:00
suter_a 3eea73f07a stub for new NeXus file handling. Not much is working yet. 2026-01-25 08:26:43 +01:00
suter_a f66c832d56 updated the copyright info. 2026-01-25 07:45:44 +01:00
suter_a 4de660788d updated the copyright info.
Build and Deploy Documentation / build-and-deploy (push) Successful in 26s
2026-01-25 07:42:29 +01:00
suter_a 990e280c8f set cmake Boost find policy. Removed NeXus library find from cmake, since it will not be used anymore. 2026-01-25 07:28:47 +01:00
suter_a af3c8832fe set cmake Boost find policy.
Build and Deploy Documentation / build-and-deploy (push) Successful in 28s
2026-01-25 07:26:25 +01:00
suter_a 7615e791d3 version update of the doxygen config file. 2026-01-24 18:30:18 +01:00
suter_a 394ea01d37 further playing with the Prefs dialog. 2026-01-24 18:30:06 +01:00
suter_a d19d7b59c8 further playing with the Prefs dialog. 2026-01-24 18:29:46 +01:00
suter_a 7dc0a237dc further playing with the Prefs dialog. 2026-01-24 18:29:37 +01:00
suter_a 1b4b9cc238 increased size of prefs dialog, since it seems too small for the newest qt6 version, especially on macOS. 2026-01-24 18:29:28 +01:00
suter_a 123acec405 version update of the doxygen config file.
Build and Deploy Documentation / build-and-deploy (push) Successful in 30s
2026-01-22 15:15:42 +01:00
suter_a eaa2ba8faf further playing with the Prefs dialog.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2026-01-21 12:19:34 +01:00
suter_a 8b9ac6e5b1 further playing with the Prefs dialog.
Build and Deploy Documentation / build-and-deploy (push) Successful in 26s
2026-01-21 12:16:27 +01:00
suter_a 2601e80c8a further playing with the Prefs dialog.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2026-01-21 11:20:08 +01:00
suter_a 1b91d8b281 increased size of prefs dialog, since it seems too small for the newest qt6 version, especially on macOS.
Build and Deploy Documentation / build-and-deploy (push) Successful in 27s
2026-01-21 11:11:17 +01:00
suter_a db54db3394 more detailed NeXus support message.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2026-01-16 18:00:39 +01:00
suter_a 84bb6e3a72 spirit classic/qi -> x3. Increase musrfit and library version to 1.9.10/1.7.0.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2026-01-16 09:24:09 +01:00
suter_a ce1bc1583b for tests/spirit: replace 'nil' by 'leer' since 'nil' leads to conflict with macOS. 2026-01-01 09:53:12 +01:00
suter_a 4adf66cb26 replace 'nil' by 'leer' since 'nil' leads to conflict with macOS. 2025-12-30 14:34:26 +01:00
suter_a 8a86351674 add missing header files for install for cmake. 2025-12-30 13:59:00 +01:00
suter_a 418ca6b0a1 add missing header file PFunctionsAst.h 2025-12-30 13:56:50 +01:00
suter_a 73aff4ec69 modernize musrfit function handling using spirit x3 instead of spirit classic now. 2025-12-30 13:31:18 +01:00
suter_a 7ce0926fd9 migrated spirit qi grammar to x3 of mupp variable handling. 2025-12-30 11:02:46 +01:00
suter_a e4ff8ca7d5 added doxygen docu to spirit X3 under tests.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-12-27 13:57:14 +01:00
suter_a 5d3981d8b2 test spirit parser moved from classic to X3.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-12-27 12:32:01 +01:00
suter_a 3442ca7b62 adopted from AFS to NFS.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-12-24 14:03:44 +01:00
suter_a a023a4b090 perform Fourier phase checks only if a Fourier block is present and not set to power spectra.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-12-22 16:09:32 +01:00
suter_a 642f878833 improve comment in comment.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-12-21 16:09:01 +01:00
suter_a 8852cf21cf add missing #include<cmath> to make some compilers happy (qt5 part).
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-11-27 16:16:04 +01:00
suter_a 89f695d6ce adopt PFitter to ROOT v6-38-00 and make sure it is backwards compatible.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-11-27 15:32:16 +01:00
suter_a 975f48f3fa add missing #include<cmath> to make some compilers happy. 2025-11-27 15:30:45 +01:00
suter_a 93f6bccaef improve the doxygen docu of the BMWtools.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-11-25 18:51:57 +01:00
suter_a 1a922125bb improve the doxygen documentation of the plotter-part of mupp. 2025-11-25 18:33:31 +01:00
suter_a 322aa58fbc improve the doxygen documentation of the var-part of mupp. 2025-11-25 17:56:04 +01:00
suter_a 4cbf625b84 improve the doxygen docu of PVarDialog.* (musredit_qt6). 2025-11-25 17:36:13 +01:00
suter_a 1b0cddc0ee improve the doxygen docu of PmuppScript.* (musredit_qt6).
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-11-25 12:30:59 +01:00
suter_a 4f52ff7b9b improve the doxygen docu of PmuppGui.* (musredit_qt6). 2025-11-25 12:23:33 +01:00
suter_a 0cb9b20738 improve the doxygen docu of PmuppAdmin.* (musredit_qt6).
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-11-25 12:18:18 +01:00
suter_a 20d5955977 improve the doxygen docu of mupp.* Pmupp.* (musredit_qt6). 2025-11-25 09:27:59 +01:00
suter_a ab14747460 improve the doxygen docu of PTextEdit.* (musredit_qt6). 2025-11-25 09:16:43 +01:00
suter_a 6c87889f5c improve the doxygen docu of PSubTextEdit.* (musredit_qt6). 2025-11-25 08:52:43 +01:00
suter_a c434993763 improve the doxygen docu of PReplaceDialog.* (musredit_qt6). 2025-11-25 08:44:41 +01:00
suter_a 9fa970a53e improve the doxygen docu of PReplaceConfirmationDialog.* (musredit_qt6). 2025-11-25 08:39:44 +01:00
suter_a 87fcf91593 improve the doxygen docu of PPrefsDialog.* (musredit_qt6). 2025-11-25 08:36:54 +01:00
suter_a 02ddc3889d improve the doxygen docu of PMusrEditAbout.* (musredit_qt6). 2025-11-25 08:32:59 +01:00
suter_a 2fd0248e37 deal with Boost 1.89 not having system as component anymore. 2025-11-25 08:29:45 +01:00
suter_a b658b8b9de improve the doxygen docu of PMsr2DataDialog.* (musredit_qt6). 2025-11-25 07:58:47 +01:00
suter_a 948ac57be6 improve the doxygen docu of PGetTitleBlockDialog.* (musredit_qt6). 2025-11-25 07:52:10 +01:00
suter_a 4802a7a016 improve the doxygen docu of PGetTheoryBlockDialog.* (musredit_qt6). 2025-11-25 07:49:24 +01:00
suter_a 244baa4dd4 add PSI/VMS to dump_header.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-11-24 19:25:45 +01:00
suter_a e1f2941d7f add PSI/VMS to the musrfit_startup.xml.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-11-24 19:12:12 +01:00
suter_a 98ee6a3983 add musrStep and musrWiz to the workflow.
Build and Deploy Documentation / build-and-deploy (push) Successful in 20s
2025-11-24 18:23:45 +01:00
suter_a 3f50462ce4 make the technical docu more complete by adding musrStep and musrWiz.
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-11-24 18:18:58 +01:00
suter_a 4c5a009305 Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
switch Qt docu from Qt5 to Qt6
2025-11-24 17:32:00 +01:00
suter_a 7e415e636c improve the doxygen docu of PGetSingleHistoRunBlockDialog.* (musredit_qt6).
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-11-24 13:51:35 +01:00
suter_a b3bffd6a51 improve the doxygen docu of PGetPlotBlockDialog.* (musredit_qt6). 2025-11-24 13:44:21 +01:00
suter_a cbd6bb984e improve the doxygen docu of PGetParameterBlockDialog.* (musredit_qt6). 2025-11-24 13:40:15 +01:00
suter_a 1aec75d5ad improve the doxygen docu of PGetNonMusrRunBlockDialog.* (musredit_qt6). 2025-11-24 13:35:54 +01:00
suter_a 8b631e026c improve the doxygen docu of PGetMusrFTOptionsDialog.* (musredit_qt6). 2025-11-24 13:30:27 +01:00
suter_a 456bc2adb4 improve the doxygen docu of PGetFunctionBlockDialog.* (musredit_qt6). 2025-11-24 13:24:35 +01:00
suter_a 8b42254cbb improve the doxygen docu of PGetFourierBlockDialog.* (musredit_qt6). 2025-11-24 12:25:29 +01:00
suter_a 06ccceb810 improve the doxygen docu of PGetAsymmetryRunBlockDialog.* (musredit_qt6). 2025-11-24 11:15:21 +01:00
suter_a 6ca0461f9b improve the doxygen docu of PFitOutputHandler.* (musredit_qt6). 2025-11-24 11:08:03 +01:00
suter_a 9cbcec63be improve the doxygen docu of PFindDialog.* (musredit_qt6). 2025-11-24 10:53:43 +01:00
suter_a b714c8d170 improve the doxygen docu of PDumpOutputHandler.* (musredit_qt6). 2025-11-24 10:48:14 +01:00
suter_a eb807ade7b improve the doxygen docu of PChangeDefaultPathDialog.* (musredit_qt6). 2025-11-24 10:42:16 +01:00
suter_a 1f7ce9f88a improve the doxygen docu of PAdmin.* (musredit_qt6). 2025-11-24 10:34:58 +01:00
suter_a be24a3aa73 improve the doxygen docu of main.cpp and musredit.h (musredit_qt6). 2025-11-24 10:24:36 +01:00
suter_a aaa609b3e2 improve the doxygen docu of musrWiz.
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-11-23 18:41:03 +01:00
suter_a a0e6a3a83d improve the doxygen docu of musrStep. 2025-11-23 18:25:48 +01:00
suter_a 0db498284f improve the doxygen docu of PUserFcn.* and PUserFcnBase.*
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-11-23 17:58:07 +01:00
suter_a d8ae606a55 improve the doxygen docu of PTheory.* 2025-11-23 17:47:46 +01:00
suter_a e940ad09b4 improve the doxygen docu of PStartupHandler.* 2025-11-23 17:35:31 +01:00
suter_a 633f63b104 improve the doxygen docu of PRunSingleHistoRRF.* 2025-11-23 17:25:45 +01:00
suter_a db4b6395ef fixed a AI glich in the docu. 2025-11-23 17:08:43 +01:00
suter_a fa1d496cf5 improve the doxygen docu of PRunSingleHisto.*
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-11-15 21:31:09 +01:00
suter_a 310713da0e improve the doxygen docu of PRunNonMusr.* 2025-11-15 08:42:21 +01:00
suter_a 3e545f1d50 improve the doxygen docu of PRunMuMinus.* 2025-11-15 08:35:24 +01:00
suter_a 278fd47e52 improve the doxygen docu of PRunListCollection.* 2025-11-15 08:27:51 +01:00
suter_a 26b87e0659 improve the doxygen docu of PRunDataHandler.h 2025-11-15 08:16:15 +01:00
suter_a 38decd8b58 improve the doxygen docu of PRunBase.* 2025-11-15 08:02:11 +01:00
suter_a a05b4fe867 improve the doxygen docu of PRunAsymmetryRRF.* 2025-11-15 07:54:12 +01:00
suter_a 7b82b2c2c8 improve the doxygen docu of PRunAsymmetry.*. 2025-11-15 07:43:49 +01:00
suter_a 4d5ad0a00c improve doxygen documentation of PRunAsymmetryBNMR.*
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-11-14 10:21:07 +01:00
suter_a c5d5038b4d improve doxygen documentation of PRgeHandler.* 2025-11-14 10:05:36 +01:00
suter_a be8161bac1 improve doxygen documentation of PPrepFourier.* 2025-11-14 09:57:18 +01:00
suter_a cdd248d116 improve doxygen documentation of PMusrT0.* 2025-11-14 09:48:35 +01:00
suter_a 26d55bc048 improve doxygen documentation of PMusrCanvas.* 2025-11-14 09:36:18 +01:00
suter_a 218e2125e3 improve doxygen documentation of PMsrHandler.* 2025-11-14 09:22:24 +01:00
suter_a 5f1b4fa5f5 improve doxygen documentation of PMsr2Data.* 2025-11-14 09:11:28 +01:00
suter_a a40c431396 improve doxygen documentation of PMsgBox.* 2025-11-14 07:57:06 +01:00
suter_a 40a797c0da improve doxygen documentation of PFunction.* and PFunctionGrammar.h
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-11-14 07:50:50 +01:00
suter_a f8a2d646dc improve the doxygen docu.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-11-13 08:36:42 +01:00
suter_a 224f7a15d0 improve the doxygen docu. 2025-11-13 07:59:10 +01:00
suter_a 25024aae6b improve the doxygen docu with the help of Claude AI.
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-11-12 20:32:20 +01:00
suter_a 4ab01f4faf added some more sanity checks for dump_header.
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-11-12 17:56:33 +01:00
suter_a 5ae66a0614 added some more sanity checks for any2many. 2025-11-12 13:13:40 +01:00
suter_a d38fb078f9 added some more sanity checks for addRun. 2025-11-12 12:21:08 +01:00
suter_a f1587af451 added some more sanity checks for musrview. 2025-11-12 11:05:56 +01:00
suter_a ddf434f595 added some more sanity checks for musrt0. 2025-11-12 10:48:36 +01:00
suter_a 22112e47b2 added paranoia pointer checks.
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-11-12 08:09:03 +01:00
suter_a 9363bafec4 make sure that the comment content is not confused with end of comment. 2025-11-12 08:06:38 +01:00
suter_a 3d07894b2d use Claude ai to generate doxygen documentation.
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-11-10 15:14:08 +01:00
suter_a 262b5a36aa Update README.md - updated the docu web-page link.
Build and Deploy Documentation / build-and-deploy (push) Successful in 16s
2025-11-06 14:25:13 +01:00
suter_a 7745fe6e65 Update README.md
Build and Deploy Documentation / build-and-deploy (push) Successful in 16s
updated the docu web-page link
2025-11-06 14:13:08 +01:00
suter_a 189f95cb04 Update ChangeLog
Build and Deploy Documentation / build-and-deploy (push) Successful in 18s
2025-10-15 08:00:50 +02:00
suter_a f3250ededc Update INSTALL
Build and Deploy Documentation / build-and-deploy (push) Successful in 19s
2025-10-15 07:58:50 +02:00
bruhn_b 9820c5dba7 Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Successful in 17s
2025-10-13 16:10:07 +02:00
ebner 7b9a473296 Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Successful in 13s
2025-10-13 15:40:41 +02:00
ebner 23e68c1c4f Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Failing after 17s
test
2025-10-13 15:36:51 +02:00
bruhn_b c9414f7f08 Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Successful in 11s
2025-10-13 15:31:08 +02:00
ebner bac6202a73 Update .gitea/workflows/deploy-pages.yml
Build and Deploy Documentation / build-and-deploy (push) Failing after 17s
change action trigger to default branch name
2025-10-13 15:16:12 +02:00
ebner b5447aef32 Update .gitea/workflows/deploy-pages.yml
changed build image
2025-10-13 15:13:06 +02:00
suter_a 1e9b82f1c2 add TDirectory option to any2many. 2025-10-03 15:42:44 +02:00
suter_a fbfce99790 better handling of values=n/a when dumping the header info. 2025-10-01 12:36:01 +02:00
suter_a 32b49e7ac8 fixed char* comparison bug. 2025-10-01 09:38:17 +02:00
suter_a df7b8433e1 adopted PRunDataHandler::ReadRootFile such that it can handle TDirectory in addition to the deprecated TFolder. 2025-09-30 14:32:47 +02:00
suter_a 10117abeff dump_header can now handle TMusrRoot with TFolder as well as TDirectory. 2025-09-30 12:30:45 +02:00
suter_a 675ed39739 update of the in-source MusrRoot docu. 2025-09-29 16:41:17 +02:00
suter_a 7f911cd3ab make musrRootValidation TDirectory compatible. 2025-09-29 14:28:53 +02:00
suter_a 288c4c644b updated the docu and removed unused DrawHeader. 2025-09-29 12:45:24 +02:00
suter_a ea646e012b increase the MusrRoot version to 2.0. 2025-09-29 12:43:21 +02:00
suter_a d8d1eb1838 added necessary FOURIER block. 2025-09-29 11:43:30 +02:00
suter_a 4917e5c7ae added the reader part for MusrRoot if written with TDirectory rather than TFolder. 2025-09-29 10:47:58 +02:00
suter_a 7e28402e25 start implementing TDirectory infrastructure. 2025-09-28 16:45:49 +02:00
suter_a db71346ebb Update .gitea/workflows/deploy-pages.yml
added graphiz for the collaboration diagrams
2025-09-17 14:03:50 +02:00
suter_a 4fbd678a88 split argv parsing between root (un)related parts. 2025-09-15 13:25:21 +02:00
suter_a 376b4f59ba add the errno information onto the IPC, in case of a failure. 2025-09-07 18:15:12 +02:00
suter_a a61a09bddd added musredit.dox in the doc directory. 2025-09-02 09:14:41 +02:00
suter_a 475bb6a9f7 changed copy path for pages. 2025-09-02 09:10:35 +02:00
suter_a a6153a0eb7 add first technical docu pages pipeline. 2025-09-02 09:07:00 +02:00
suter_a 7405a95c6e removed qmake leftovers. Only cmake is used for the future. Reorganized the technical docu, for better gitea-pages integration. 2025-09-02 08:55:00 +02:00
suter_a ed6e392a53 prevent crash if no tab is present. 2025-08-19 18:09:29 +02:00
suter_a ef4c6d75e5 make sure that index states in proper range for PRunAsymmetryRRF. 2025-08-05 10:30:41 +02:00
suter_a 392a0b089d added more histo length versus fgb, lgb checks. 2025-07-11 13:05:49 +02:00
suter_a 06a509a420 improved reload of msr-files in musredit after a msr2data command. 2025-07-07 10:02:14 +02:00
suter_a 2e951d92f1 error feed fStep rather than fPosError for expected chisq. Tweaked the param rounding for expected chisq. 2025-07-04 16:29:33 +02:00
suter_a d9016d82a8 better exp estimate for precision. 2025-07-04 08:31:52 +02:00
suter_a 25bcdd25e5 add err==0.0 handling for rounding. 2025-07-03 10:22:11 +02:00
suter_a 781a2e7dbd also apply the parameter rounding onto the per run block estimate. 2025-07-03 09:50:48 +02:00
suter_a 1aa7e6941f improved rounding handling to get a more consistent expected chisq after fitting compared to pure chisq estimate of musrfit. Essentially get rid of rounding issues. 2025-07-03 09:38:34 +02:00
suter_a 7491a2c331 now all error messages from musrview can be sent to PMsgBox. 2025-06-29 09:12:11 +02:00
suter_a 832a74e0b5 added a feature which brings up a error message box, if there was any issue with the msr-file when starting musrview from musredit. 2025-06-29 09:04:45 +02:00
suter_a 0b1c9e53c6 (i) make most internal checking functions in the msr handler private. (ii) improved checking of real Fourier for consistency. 2025-06-23 16:02:07 +02:00
suter_a 18bf65a231 changed theory functionc abbriviation 'if' to 'ifld'. 2025-06-10 13:23:03 +02:00
suter_a 0cde84d756 updated of the offline docu. 2025-06-09 09:10:49 +02:00
suter_a 0943f1f061 increase libPMusr version to 1.5.0. 2025-06-08 10:58:40 +02:00
suter_a 769a828a76 new version 1.9.9. Adopted ChangeLog and CMakeLists.txt. 2025-06-08 10:48:12 +02:00
suter_a ecec59c8a3 1st full Gauss/Lorentz LF. Still room for optimization, and further testing. 2025-06-06 10:21:09 +02:00
suter_a 66af890157 add new functions to musredit select. 2025-06-05 11:19:48 +02:00
suter_a eb98c9727c add simple F-mu-F to the standard theory functions. 2025-06-05 10:41:12 +02:00
suter_a 079baa3edf start adding more standard theory functions. Not all ready yet. 2025-06-04 17:39:02 +02:00
suter_a 7df47a05f3 create src dir if not present. Needed for git-revision.h 2025-06-03 12:58:00 +02:00
suter_a 15c5b02c8b more docu. 2025-05-28 13:48:57 +02:00
suter_a 37f099542a stripped CMakeLists.txt to the bare minimum. 2025-05-28 13:48:05 +02:00
suter_a c2fb166d3b add necessary docu for the Gaussian Lorentzian approach. 2025-05-28 12:47:20 +02:00
suter_a e8806c3e72 changed the integral approximation approach for Gaussian/Lorentzian. 2025-05-28 12:46:37 +02:00
suter_a 91a45cad90 added ZF, LF geometry, dynamic approximation width/hopp << 1. 2025-05-27 15:59:58 +02:00
suter_a d1f025a8c2 improved GL integration. 2025-05-27 15:59:08 +02:00
suter_a e525abe614 simplify git-revision.h generation. 2025-05-19 13:29:54 +02:00
suter_a 005b33c379 added missing MACOSX_BUNDLE_GUI_IDENTIFIER for mupp. 2025-05-14 18:10:51 +02:00
suter_a 3bcc382679 allow to define Tmax from the cmd line. 2025-05-13 16:08:23 +02:00
suter_a 249d6ff97c add missing header. 2025-05-12 20:25:40 +02:00
suter_a 69ab03d5ae first LGKT_LF. Might need to slightly improve Simpson. 2025-05-12 16:36:37 +02:00
suter_a 819d209863 proper class for GKT LF. 2025-05-12 10:58:53 +02:00
suter_a bcc1597e30 add LF Gaussian/Lorentzian testing code. 2025-05-09 16:02:04 +02:00
suter_a 9fa90c24fb start populating nfs4 path rather than afs in the musrfit_startup.xml. 2025-05-06 15:33:13 +02:00
suter_a 236a702d36 needed to add an additional header (stdbool.h, libCuba) to make clang happy. 2025-05-03 15:13:26 +02:00
suter_a 09f9782a31 comment outdated typedef in libCuba. 2025-05-02 19:18:43 +02:00
suter_a f99f71a8db slight improvement on mud.h needed that it doesn't crash on macos15.4 m3pro. 2025-04-09 17:11:14 +02:00
suter_a 6e60013037 updated mud.h (thanks to Donald Arseneau). Makes modern compiler happy again. 2025-04-08 17:00:04 +02:00
suter_a e38fa47961 add skeleton for MusrRoot which will handle TDirectoryFile rather than TFolder. 2025-04-04 18:37:42 +02:00
suter_a 764cdf4e51 start implementing TDirectoryFile instead of TFolder, since TFolder is depricated. First I added the necessary parts on the validator. The read/write are still missing. 2025-04-04 16:58:57 +02:00
suter_a e5ff0fa743 switched from raw to QScopedPointer pointer in mupp.cpp. 2025-04-01 14:10:59 +02:00
suter_a e26fa4eea2 removed my quick and dirty fix. It doesn't work for all compilers. Reported bug to triumf and wait for a fix. 2025-03-31 07:54:25 +02:00
suter_a 5648757389 back ported some qt6 recent file handling. 2025-03-30 18:14:04 +02:00
Andreas Suter c3b4c7c3b1 improved recent file handling for macos. 2025-03-30 17:09:04 +02:00
suter_a e233c860d1 slight improvement in handling of the recent msr-files. 2025-03-30 15:30:46 +02:00
suter_a c230bfb1bc updated the icon switching by adding the missing View2Dat. 2025-03-29 22:36:48 +01:00
suter_a 5119b1cd13 fixed typo and added necessary update for the theme flags. 2025-03-29 21:48:23 +01:00
suter_a d937324885 improved dark theme handling on mupp for qt5. 2025-03-29 20:54:03 +01:00
suter_a f7e5c53879 improved dark theme handling on mupp for qt6. 2025-03-29 20:17:28 +01:00
suter_a 3796925e93 needed to adopt mud.h to make it gcc15.0.1 ready. 2025-03-26 17:05:16 +01:00
suter_a d5343a0073 activate the status bar. 2025-03-25 15:35:10 +01:00
suter_a bb99482461 add a user interface option to export data from a msr-file view (single- or multiple files) - qt6. 2025-03-24 20:28:57 +01:00
suter_a f0869935d1 add a user interface option to export data from a msr-file view (single- or multiple files). 2025-03-24 20:10:01 +01:00
suter_a 0f95551200 add necessary increment for unique cropped name for PSI-BIN. 2025-03-19 16:24:56 +01:00
suter_a b8ce741534 make sure that for PSI-BIN export the 4 char detector names are unique. 2025-03-19 09:45:16 +01:00
suter_a 4b6654ca2a add title to PRawRunDataSet. 2025-03-19 09:44:13 +01:00
suter_a 38d4ec1806 read 'Sample Orientation' from ROOT file, since it might be needed by any2many. 2025-03-18 12:51:40 +01:00
suter_a 4231d26604 make sure that the 'selected' object is present. 2025-02-24 20:22:20 +01:00
suter_a a28650f017 this is a workaround which should prevent that the key event is executed if a text/latex is written into the canvas. 2025-02-17 17:53:39 +01:00
suter_a 9a23c4f241 fix of a copy/paste error. 2025-02-15 10:41:02 +01:00
suter_a 5f7f79e46d header of exported data adopted for easier read in with pandas. 2025-02-14 09:06:55 +01:00
suter_a 4a20d805dd updated the copyright info. 2025-01-30 11:15:42 +01:00
suter_a 10cfe3f863 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2025-01-29 08:05:29 +01:00
suter_a 0828d1b8d4 proper handling of comments and descriptions in the RUN block. 2025-01-29 08:04:48 +01:00
suter_a 75785d2c0e add switch to enable/disable HDF4 support for NeXus. 2025-01-28 21:40:58 +01:00
suter_a e4b84b12df make sure that 'ASCII', 'DAT', and 'DB' is rejected from musrFT. 2025-01-27 18:00:32 +01:00
suter_a 124a31386c add a new tag PMUSR_UNSUPPORTED_FEATURE 2025-01-27 17:58:42 +01:00
suter_a ebdb0feb7f path-run-name in RUN block of the msr-file can now handle spaces. 2025-01-18 13:35:08 +01:00
ext-mcfadd_r e67d92fc05 Merged in mnstrategy (pull request #19)
Explicit passing of MnStrategy during minimizer initialization

Approved-by: Suter Andreas
2025-01-10 10:00:30 +00:00
ext-mcfadd_r ead1674b13 Explicit passing of MnStrategy during minimizer initialization
This patch fixes compilation errors that arise with recent ROOT versions (e.g., 6.34.02),
which require a ROOT::Minuit2::MnStrategy object to be passed when initializing the
ROOT::Minuit2::MnX (X = Migrad, Simplex, Minimize) minimizers (i.e., instead of the integer
representing the "strategy").
2025-01-09 11:38:33 -08:00
suter_a fd22884ce8 slightly re-ordered the default files for mupp in the open dialog. 2024-12-16 07:41:24 +01:00
suter_a 20dd08fbef changed default ROOT color kGreen to kGreen+2. 2024-12-14 14:54:17 +01:00
suter_a 3e66760c26 adopted for custom button handling qt5. 2024-12-11 14:06:32 +01:00
suter_a d6bcdf52b8 adopted for custom button handling. 2024-12-11 13:58:11 +01:00
suter_a 30bd2b2876 added missing enum tag. 2024-12-11 09:36:57 +01:00
suter_a 9f8f89db6d make the theme handling in musredit more flexible. At the same time adopted some part to more modern c++. 2024-12-11 09:25:28 +01:00
suter_a 458913ca31 update of the ChangeLog 2024-12-03 18:13:02 +01:00
suter_a 5c3accc6ed added jump to block feature. 2024-12-02 20:05:50 +01:00
suter_a 6f8b0a2341 center edit widget for find. This gives a better user experience. 2024-12-02 17:06:02 +01:00
suter_a 4febdb42b4 make sure that for non-muSR data errors are not = 0. Will set it to 1, and issue a warning. This prevents chisq to crash. 2024-10-14 12:22:25 +02:00
suter_a ae95a5dc1c implemented unary operator for metaData in functions. 2024-10-11 16:34:49 +02:00
suter_a c3f531e0d5 fixed a bug for out-of-repo build to generate git-info. 2024-10-11 08:19:54 +02:00
suter_a 0b61130e28 adopted OpenMP handling for libZFRelaxation. 2024-09-23 09:41:20 +02:00
suter_a d1cd63dcb0 fixed a bug in the mupp gui refresh of a collection. 2024-09-21 13:02:31 +02:00
suter_a 7838901fbe make sure that the run template number has at least 4 digits before proceeding. 2024-09-17 16:27:04 +02:00
suter_a 00b012d0dd Merge https://bitbucket.org/muonspin/musrfit into root6 2024-09-12 09:29:03 +02:00
ext-mcfadd_r d2984d8923 Merged in avg (pull request #18)
fix batch mode averaged output

Approved-by: Andreas Suter
2024-09-12 07:28:15 +00:00
ext-mcfadd_r 58889614e5 fix batch mode averaged output
closes issue #63
2024-09-10 13:52:30 -07:00
suter_a c9fc373862 improved dat-file reading for mupp. 2024-07-02 09:26:44 +02:00
suter_a ebefcf7af9 updated the docu. 2024-06-24 09:44:07 +02:00
suter_a 64d3b6192b added the option to write the content of the MINUIT2.OUTPUT ascii file as yaml. This extends the previous commit from Ryan M.L. McFadden. 2024-06-18 11:16:15 +02:00
suter_a 6bcb26f9d5 Merge branch 'root6' of https://bitbucket.org/muonspin/musrfit into root6 2024-06-18 08:19:01 +02:00
ext-mcfadd_r 6b865efd3b Merged in ignore (pull request #17)
ignore all files generated from an in-repo build

Approved-by: Andreas Suter
2024-06-18 06:18:56 +00:00
ext-mcfadd_r caccfb175a Merged in yaml (pull request #16)
write the fit results to an easy-to-read/parse yaml file

Approved-by: Andreas Suter
2024-06-18 06:18:31 +00:00
ext-mcfadd_r 1845b5c176 Merged in segfault (pull request #15)
fix segfault

Approved-by: Andreas Suter
2024-06-18 06:18:14 +00:00
ext-mcfadd_r 8821112927 ignore all files generated from an in-repo build 2024-06-17 13:07:06 -03:00
ext-mcfadd_r 833171c712 write the fit results to an easy-to-read/parse yaml file
This patch adds routines for writing a comprehensive set of fit results (i.e., parameter values, parabolic errors, asymmetric errors, covariances, correlation coefficients, etc.) for an individual `.msr` file to an easy-to-read/parse `.yaml` file.

The main motivation for the code addition is to provide users with easy access to the fit's covariance matrix without the need for "extra" manual effort (e.g., parsing the contents of `MINUIT2.OUTPUT` or `MINUIT2.root`). The other fit quantities are also included for completeness.

Reading/accessing the output is trivial using, for example, the PyYAML Python library (https://github.com/yaml/pyyaml):

```python
import yaml

with open("2125_tf_histo.yaml", "r") as fh:
	results = yaml.load(fh, Loader=yaml.SafeLoader)

cov = results["covariance"]["Field_1"]["Sigma_1"]
```

Note: the naming conventions chosen for the blocks in the `.yaml` output closely follow those used by the iminuit Python library (https://github.com/scikit-hep/iminuit).
2024-06-17 12:51:04 -03:00
ext-mcfadd_r 61749b91c4 fix segfault
This patch provides a memory-safe alternative to the changes introduced in commit 418adfde67, which causes a segfault when the "batch mode" flag is required (i.e., for ascii/graphic export).

Note: the program name (i.e., argv[0]) has been added the list arguments passed to ROOT's TApplication. This ensures that the TApplication name matches that of the program (see https://github.com/root-project/root/blob/542b98b2ccca760fd83117b750b89d81b8e9b926/core/base/src/TApplication.cxx#L179-L180).
2024-06-17 10:52:14 -03:00
suter_a 3d92e2eefb add CPU info to the configure process. 2024-06-09 17:45:02 +02:00
suter_a b71dce9291 remove more accidently added file. 2024-06-08 16:39:57 +02:00
suter_a 1aa4ce0a99 remove accidentely added file. 2024-06-08 16:36:54 +02:00
suter_a 425ed02e22 update of the docu. 2024-06-08 09:23:36 +02:00
suter_a a36abfc461 updated version info, due to the macOS OpenMP support. 2024-06-08 09:17:05 +02:00
suter_a ccaba41868 modernize the way how to check/deal with OpenMP. This helps also on the macOS side. 2024-06-07 12:44:59 +02:00
suter_a 418adfde67 propagate only necessary root flags to TApplication. 2024-06-06 10:06:50 +02:00
suter_a 66df43c663 moved mupp examples form the mupp source destination to doc/examples. 2024-04-26 15:54:44 +02:00
suter_a 4a6885f55b update of the documentation. 2024-04-23 10:50:11 +02:00
suter_a 92b1aac7a6 got rid off some double brackets. 2024-04-20 18:13:09 +02:00
suter_a 26e25ce10b fixed a fruther bracket bug. 2024-04-20 17:39:18 +02:00
suter_a cedaabeb98 improved bracket handling in function string generation. 2024-04-20 09:40:04 +02:00
suter_a 032510fbcb update of the ChangeLog. 2024-04-19 12:44:43 +02:00
suter_a 8cfd0bcc4a increased musrfit patch number. 2024-04-19 12:40:50 +02:00
suter_a 7198521f60 make sure that brackets are not lost in the function reconstruct, e.g. 1/(2*parX) is not going over into 1/2*parX. 2024-04-19 12:39:01 +02:00
suter_a 834884f3a4 improved variable description. 2024-04-19 12:36:24 +02:00
suter_a 80591f6f13 fixed an error in DumpHeader when dumping a TDoubleVector. 2024-03-16 15:59:17 +01:00
suter_a 44456c49e9 fixed a typo: Atoi() instead of Atof(). 2024-03-16 15:34:00 +01:00
suter_a 495f02c3c6 for macos: add /usr/local/lib to DYLD_LIBRARY_PATH for qt5. This is needed to find the nexus lib. 2024-03-07 12:31:32 +01:00
suter_a ad2e84581f revert back to boost ellint_1, since on many compilers the c++17 std::comp_ellint_1 is not yet implemented. 2024-03-05 18:29:34 +01:00
suter_a 59dbae4a1e use the QProcess startDetached method and not the static one. 2024-02-14 09:30:17 +01:00
suter_a 4d176c395c use the QProcess startDetached method and not the static one. 2024-02-14 09:26:27 +01:00
suter_a 74978025fb start musrview as detached process: simplifies things. 2024-02-13 10:12:50 +01:00
suter_a deeee783f5 add /usr/local/lib to default DYLD_LIBRARY_PATH for macOS. 2024-02-08 14:00:06 +01:00
suter_a cadd28b9fe Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2024-02-03 20:01:01 +01:00
suter_a 79c8be54bf update of the copyright info. 2024-02-03 19:58:11 +01:00
suter_a 3cf89c6571 added some missing qutation marks musrfit_startup.xml. 2023-11-29 12:47:24 +01:00
suter_a 673a742631 added some more default search path to default musrfit_startup.xml. 2023-11-29 12:44:58 +01:00
suter_a f68775dd64 Merge branch 'root6' of https://gitlab.psi.ch/nemu/musrfit into root6 2023-11-15 16:07:37 +01:00
suter_a 23bf2ec2fc added proper rpath handling. 2023-11-15 16:04:21 +01:00
suter_a 23ac67a443 add an option to musrfit which allows to replace to musrfit_startup.xml by the default one. 2023-11-11 18:26:25 +01:00
suter_a d6a3767040 adopted default path/file-name scheme to the current state. 2023-11-10 15:05:38 +01:00
suter_a 75d0c9e01a adopted the technical doxygen files to the current state. 2023-11-10 08:26:52 +01:00
suter_a ecd9e4a953 improved the nonlocal field dump, by allowing a custom range. 2023-11-08 12:57:16 +01:00
suter_a 3c2b0322c0 mupp: got rid of some left over raw pointers by replacing them through smartpointers. 2023-11-03 07:54:52 +01:00
suter_a 4747fbc77d make sure that singleRunMsrFile is a legal pointer before proceeding. 2023-11-01 14:38:21 +01:00
suter_a b1b808ad7b switched TGapIntegrals from raw -> smart pointers. 2023-11-01 08:54:24 +01:00
suter_a 2d1875ebfe remove unused code. 2023-11-01 08:27:48 +01:00
suter_a d221ef1ed0 more work in switching raw -> smart pointer. 2023-11-01 08:27:04 +01:00
suter_a f7c45f46ff switched TLondon1D from raw -> smart pointers. 2023-11-01 08:00:47 +01:00
suter_a 5b093208eb fixed stupid copy/paste error when switching to smart pointers in PMusrWiz. 2023-10-31 18:08:31 +01:00
suter_a 7a1f60d00f adopted MusrRootDefinition doc to smart pointer use. Updated MusrRootDefinition.pdf 2023-10-31 08:18:01 +01:00
suter_a de2d8394d3 adopted MusrRootDefinition doc to smart pointer use. 2023-10-31 08:00:22 +01:00
suter_a af13e78c52 more work on Raw -> Smart Pointers for external libs. 2023-10-27 23:23:19 +02:00
suter_a 7691ef2815 Raw -> Smart Pointers in TMusrRunHeader. 2023-10-25 17:59:05 +02:00
suter_a 8f4a7c6b68 Raw -> Smart Pointers in PNeXus. 2023-10-25 17:52:24 +02:00
suter_a 1cb0cfd3e7 Nonlocal: Raw -> Smart Pointers. Improved config of standalone dump_nonlocal_field. 2023-10-25 17:40:56 +02:00
suter_a 344a5c8ba0 print for debug: the ostream need explicit string not char[]. 2023-10-25 13:47:00 +02:00
suter_a 6f521668c0 increased main version to 1.9.2, libPMusr to 1.4.0, and mupp to 1.1.0. 2023-10-25 08:46:02 +02:00
suter_a 02a1cb7a0c added check for mupp script in case the data collection is not readable. 2023-10-25 08:32:13 +02:00
suter_a fdeed5dec4 (i) fix of missing status init. (ii) changed vector copy evaluation. 2023-10-24 21:09:35 +02:00
suter_a e676d3c045 Raw -> Smart Pointers for mupp_plotter, qt5/qt6. 2023-10-24 16:07:56 +02:00
suter_a 9911d88889 Raw -> Smart Pointers for PVarDialog, mupp, qt5/qt6. 2023-10-24 13:08:30 +02:00
suter_a 51520868f1 Raw -> Smart Pointers for mupp, qt5/qt6. 2023-10-24 12:55:26 +02:00
suter_a 3d149dc6ab Raw -> Smart Pointers for musrWiz, qt5. 2023-10-24 12:15:20 +02:00
suter_a e79322b348 Raw -> Smart Pointers for musrStep, qt5. 2023-10-24 10:17:16 +02:00
suter_a 62e86f42b7 Raw -> Smart Pointers in PSubTextEdit, musredit, qt5. 2023-10-24 09:38:37 +02:00
suter_a c18ed68aa8 Raw -> Smart Pointers in PPrefsDialog, musredit, qt5. 2023-10-24 09:30:00 +02:00
suter_a e376e9a2e6 Raw -> Smart Pointers for musredit qt5. 2023-10-24 09:22:42 +02:00
suter_a a90af4c342 start replacing raw to smart pointers for mupp. 2023-10-23 20:32:01 +02:00
suter_a 1c7556a73d add missing include. 2023-10-22 19:06:56 +02:00
suter_a eb234b7de5 work on smart pointer transition of musrWiz. 2023-10-22 18:03:31 +02:00
suter_a 3d7d86d657 more work on smart pointer transition of musrStep. 2023-10-22 11:00:24 +02:00
suter_a 7743eaee09 more work on smart pointer transition of PTextEdit. 2023-10-22 09:31:22 +02:00
suter_a 9c2e981e2a more work on smart pointer transition of PTextEdit. 2023-10-22 09:23:07 +02:00
suter_a f9b1ef9dcc more work on smart pointer transition of PTextEdit. 2023-10-22 09:17:42 +02:00
suter_a 89146f3cee raw -> smart pointer for musredit where it makes sence. 2023-10-21 22:33:19 +02:00
suter_a be29e55834 switched PRunSingleHistoRRF where possible to smart pointers. 2023-10-21 19:19:04 +02:00
suter_a 8e7fda92e1 switched PRunDataHandler where possible to smart pointers. 2023-10-21 19:11:01 +02:00
suter_a 890d48a95c switched PRunBase where possible to smart pointers. 2023-10-21 18:46:24 +02:00
suter_a 823ef087c9 switched PRgeHandler where possible to smart pointers. 2023-10-21 18:40:35 +02:00
suter_a 05c06a071e switched PMusrT0 where possible to smart pointers. 2023-10-21 18:34:55 +02:00
suter_a dbfadc4e42 switched PMusrCanvas where possible to smart pointers. 2023-10-21 17:47:32 +02:00
suter_a 93754a9fc2 replaced some raw pointer by smart pointer in PFitter. 2023-10-21 17:45:49 +02:00
suter_a 0bff931af9 switch to smart pointers in PMsr2Data where possible. 2023-10-21 13:32:44 +02:00
suter_a 1a72d67be9 switched PFitter to smart pointers. 2023-10-21 11:39:16 +02:00
suter_a 7e17af0256 switched PMsrHandler where possible to smart pointers. 2023-10-21 11:21:27 +02:00
suter_a 5d731611cf remove one check for Fourier only. 2023-10-18 14:22:06 +02:00
suter_a 4b561b1f15 get rid of raw pointers for PFourierCanvas where it makes sense. 2023-10-18 14:21:15 +02:00
suter_a 69305f8b1d removed obsolate clean up. 2023-10-17 16:42:27 +02:00
suter_a 88b3ab8a01 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2023-10-17 16:40:22 +02:00
suter_a ca742a064f more work to get rid of raw pointers. 2023-10-17 16:35:54 +02:00
suter_a b5a391e355 replaced raw pointers by smart pointers for musrt0.cpp. 2023-10-13 22:46:21 +02:00
suter_a 1feed7116a replaced raw pointers by smart pointers for musrFT.cpp. 2023-10-13 22:46:01 +02:00
suter_a ff9245fd28 replaced raw pointers by smart pointers for msr2data.cpp. 2023-10-13 12:47:33 +02:00
suter_a 98026c725d replaced raw pointers by smart pointers for dump_header.cpp. 2023-10-13 12:33:47 +02:00
suter_a 5972391ff4 replaced raw pointers by smart pointers for any2many.cpp. 2023-10-13 12:23:32 +02:00
suter_a c5f6eb04b4 replaced raw pointers by smart pointers for addRun.cpp. 2023-10-13 12:19:58 +02:00
suter_a 2a2e2b40d5 replaced raw pointers by smart pointers for musrview.cpp. 2023-10-13 12:10:06 +02:00
suter_a c2a2051d29 replaced raw pointers by smart pointers for musrfit.cpp. 2023-10-13 11:56:52 +02:00
Zaher Salman 578dc900c2 Merged in master (pull request #14)
Master

Approved-by: Andreas Suter
2023-09-28 11:25:29 +00:00
salman cf44df21ed Fixed compatibility with C++17 2023-09-28 13:16:19 +02:00
Zaher Salman ef641de033 Merged muonspin/musrfit:root6 into master 2023-09-02 14:19:02 +02:00
suter_a 4c62ae547f updated the docu. Newly added: brief description of the supported file formats. 2023-09-02 13:15:07 +02:00
Zaher Salman 91d6a4bc99 Merged muonspin/musrfit:root6 into master 2023-09-01 11:51:52 +02:00
suter_a c6ebaf3675 more potential musr-data-file paths added. 2023-08-31 10:30:04 +02:00
suter_a 1df6643bfa more robust handling of positron detector entries. 2023-08-31 10:17:40 +02:00
suter_a 4d1c7c10c8 make sure that exported MusrRoot files have proper stats in the histo objects. 2023-08-31 08:22:37 +02:00
suter_a 0b3fc43123 handle dump of RunSummary with and without '\n' and/or '\r' properly. 2023-08-31 07:47:47 +02:00
suter_a 1f32698b5f try to improve the reload issue of musrT0 called via musredit - Issue #61 on bitbucket. 2023-08-30 15:41:34 +02:00
suter_a 22178f7869 improved search run, allowing to look for a specific file format in case the run is saved in multiple different file formats. 2023-08-30 15:05:56 +02:00
suter_a 2e6e5ecb97 added the flame instrument. 2023-08-30 14:09:19 +02:00
Zaher Salman 56a8730252 Merged muonspin/musrfit:root6 into master 2023-05-22 09:18:22 +02:00
suter_a 40e15218a3 add flag -c for dump_header via musredit. 2023-05-19 12:04:16 +02:00
suter_a 39a54d7f63 dump_header can dump #counts for each detector now also for mud and nexus. 2023-05-17 17:22:47 +02:00
Zaher Salman d664f5d877 Merged muonspin/musrfit:root6 into master 2023-05-17 10:00:49 +02:00
suter_a 420b301ac5 dump_header can dump #counts for each detector. Currently only for MusrRoot. 2023-05-16 14:21:33 +02:00
suter_a 5d9eb0dcec allow more flexible dealing with LEM run numbers > 9999. 2023-05-16 08:27:52 +02:00
suter_a 905dfde5c7 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2023-05-14 16:58:58 +02:00
suter_a 05a732c9ec add 5-digit run name template for lem, needed for addRun and dump_header. 2023-05-14 16:57:08 +02:00
suter_a bace23b97e add hint for potential flatpak. 2023-04-14 10:50:58 +02:00
Zaher Salman 8765ac9192 Merged muonspin/musrfit:root6 into master 2023-03-10 15:52:28 +01:00
suter_a f7620445dc fixed c++ streaming output flag error. 2023-03-07 12:28:01 +01:00
Zaher Salman f1b7ca226a Merged muonspin/musrfit:root6 into master 2023-02-20 10:15:20 +01:00
suter_a 3457ff9d25 make sure that dictionary generation works. 2023-02-19 11:29:55 +01:00
Zaher Salman 30d124ab51 Merged muonspin/musrfit:root6 into master 2023-02-17 18:19:37 +01:00
suter_a da6eea271d updated docu. 2023-02-17 15:09:35 +01:00
suter_a abe47395cd changed to more meaningful labelling. 2023-02-17 15:02:28 +01:00
Zaher Salman feb33b24ae Merged muonspin/musrfit:root6 into master 2023-02-17 09:46:39 +01:00
suter_a a9140ecd74 changed from energy_list to energy_vect in depth_profile_startup.xml. 2023-02-17 09:35:04 +01:00
suter_a 1d40e74869 tweak needed for rootcling dictionary generation. 2023-02-17 08:33:36 +01:00
suter_a 832450d183 updated ChangeLog. 2023-02-17 08:32:41 +01:00
suter_a f2b71c071e add musrfit version info on the config output. 2023-02-17 08:32:07 +01:00
suter_a 9e88ddb989 Merge remote-tracking branch 'origin/depthProf' into root6 2023-02-17 07:39:17 +01:00
suter_a 6c8c8d6706 add a full example to the test folder. 2023-02-16 16:00:48 +01:00
suter_a c2c4d0f3c5 cleanup and cosmetics. 2023-02-16 15:56:14 +01:00
suter_a 2a5f9182ef removed build directory which should not have gone to the git. 2023-02-16 07:29:17 +01:00
Maria Martins d37cb4add1 example files for depthProfile 2023-02-15 13:41:27 +01:00
Zaher Salman c6cf124ee3 Merged muonspin/musrfit:root6 into master 2023-01-30 09:31:34 +01:00
suter_a 7f3cc5a18f fixed wrong function declaration in the docu, not the code. 2023-01-30 09:21:23 +01:00
suter_a af3f282652 fixed typo. 2023-01-30 09:02:54 +01:00
Zaher Salman 401ff9ead6 Merged muonspin/musrfit:root6 into master 2023-01-10 16:39:45 +01:00
suter_a 26d4fbda11 fix of an old copy/paste error! 2023-01-10 15:33:44 +01:00
suter_a 2db15b2551 add OS tag for packages. 2023-01-09 10:46:55 +01:00
Zaher Salman 5fa84c74ec Merged muonspin/musrfit:root6 into master 2023-01-05 13:50:12 +01:00
suter_a 84eb7c8ec3 updated the copyright info. 2023-01-05 11:05:54 +01:00
suter_a fe32046c21 updated the copyright info. 2023-01-05 10:24:31 +01:00
suter_a 0f7e22f363 updated the ChangeLog. 2023-01-05 09:31:38 +01:00
suter_a db358591e9 provide some more info in the README for PDepthProfile. 2023-01-05 09:21:59 +01:00
suter_a 7d2abffc47 update of the copyright info. 2023-01-05 09:18:38 +01:00
suter_a 47bee12d3e improvement on: allow to draw theory only at the data points for PRunNonMusr. 2023-01-05 08:12:11 +01:00
suter_a 8a6e4dca6f allow to draw theory only at the data points for PRunNonMusr. 2023-01-05 07:59:15 +01:00
suter_a a3276dd352 Merge branch 'root6' of ssh://git.psi.ch/nemu/musrfit into root6 2022-12-21 15:09:25 +01:00
suter_a 39cf9854db improved dat file read routine for mupp for the case columns are added after RUN. 2022-12-21 15:07:52 +01:00
suter_a 7ab9892b96 some first bug-fixing and cleanup of the code. 2022-12-21 13:15:58 +01:00
suter_a 7c8548ef70 first implementation of a more efficient DepthProfile user function. Not yet tested! 2022-12-21 10:20:06 +01:00
suter_a 7e63d22cb5 fixed formatting issue. 2022-12-21 10:17:42 +01:00
suter_a 3b40c21226 remove obsolate file. 2022-12-21 08:05:49 +01:00
suter_a 3123a3f84a remove .idea from PDepthProfile. 2022-12-21 08:03:44 +01:00
suter_a 348f02b217 start to work on a more efficient version of MM PDepthProfile user function. 2022-12-21 07:55:33 +01:00
suter_a 7bf2cfd8c1 moved depth_profile_startup.xml to test directory, which still needs to be populated. 2022-12-21 07:53:49 +01:00
suter_a a31da8df70 add new inline function GetNoOfRgeDataSets(). 2022-12-21 07:51:40 +01:00
suter_a 41c90ef936 define tag energy_vec with attributes start, stop, step to define rge energy vector in a compact way in startup.xml files. 2022-12-21 07:49:57 +01:00
Zaher Salman 7b0492f499 Merged muonspin/musrfit:root6 into master 2022-12-14 14:36:34 +01:00
suter_a 1c447c8a92 make them OpenMP aware for macOS. 2022-12-13 12:11:59 +01:00
Zaher Salman da2705aa0e Merged muonspin/musrfit:root6 into master 2022-12-12 22:31:29 +01:00
suter_a f22b16876f update of the docu. 2022-12-12 16:28:13 +01:00
Zaher Salman dd733164d1 Merged muonspin/musrfit:root6 into master 2022-12-04 19:33:25 +01:00
suter_a 72dd9dea65 add feature that mupp_plotter can show/hide lines between the data points. 2022-12-03 11:02:20 +01:00
suter_a 6b31c0a35d Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2022-11-30 13:00:54 +01:00
suter_a 2f712cc2c7 added some more technical docu to PMsr2Data. 2022-11-30 13:00:28 +01:00
Zaher Salman 5658c06afd Merged muonspin/musrfit:root6 into master 2022-11-26 17:07:19 +01:00
suter_a 19b9375d88 added cumulative frequency output. 2022-11-26 15:44:05 +01:00
suter_a 9761666513 add a rgeHandler tester which allows quickly to test rge-file related handling. 2022-11-09 13:11:30 +01:00
suter_a b9d81668a7 add energy_vect tag which allows a more compact startup xml-file if the rge-files are equally spaced in energy. 2022-11-09 13:09:31 +01:00
suter_a 1e51d2a007 squeeze out version information of the used libs. 2022-11-09 09:15:30 +01:00
Zaher Salman b8622fefa8 Merged muonspin/musrfit:root6 into master 2022-11-07 15:44:01 +01:00
suter_a bface6bf1e adopted to the newer Qt versions. 2022-11-07 09:48:19 +01:00
suter_a e3c2149847 adopted to the newer boost versions. 2022-11-07 09:47:50 +01:00
Zaher Salman 382fd8ad99 Merged muonspin/musrfit:root6 into master 2022-11-06 12:21:54 +01:00
suter_a f3414f687c replaced sprintf -> snprintf throughout. 2022-11-05 20:16:44 +01:00
Zaher Salman 96ac7f68a2 Merged muonspin/musrfit:root6 into master 2022-09-07 10:55:54 +02:00
suter_a 44aacfca50 adopted from qt5 to qt6. 2022-09-06 20:50:59 +02:00
Zaher Salman 02f7c459c5 Merged muonspin/musrfit:root6 into master 2022-09-05 15:23:27 +02:00
suter_a 173d20f05e improved export parameter list behavior. Allow multiple deliminators: ',', ';', ' ' 2022-09-02 14:40:12 +02:00
suter_a ccc1dda352 fixed typo. 2022-09-02 14:38:54 +02:00
suter_a b4c7780ff5 improved msr<->mlog swap dialog. 2022-09-02 13:53:34 +02:00
suter_a 2ba6e8a230 make sure that the minimum height of musrStep is not larger than the available screen resolution height. 2022-09-02 13:29:45 +02:00
martins_m 8fed497adc implementation of depth step fits 2022-08-19 17:50:25 +02:00
Zaher Salman bb9942e34b Merged muonspin/musrfit:root6 into master 2022-08-09 10:10:11 +02:00
suter_a 43b4566870 fixed bug in msr2data global+ according to issue #33 reported on bitbucket. 2022-08-08 18:16:48 +02:00
Zaher Salman 8245728f82 Merged muonspin/musrfit:root6 into master 2022-07-06 16:26:04 +02:00
suter_a b1ffba391a lift cmake requirement to 3.17. 2022-07-06 13:48:59 +02:00
suter_a 804c56fd1f removed obsolete filed. 2022-07-06 13:48:07 +02:00
suter_a ae7f1a2168 more work towards a modern cmake. As a first example reworked FFTW3 binding. 2022-07-01 16:18:24 +02:00
Zaher Salman 3c607768b9 Merged muonspin/musrfit:root6 into master 2022-06-21 17:34:53 +02:00
suter_a 3f2e96303a improvement dealing with rpath on macOS. 2022-06-20 15:53:57 +02:00
Zaher Salman b47c735a1c Merged muonspin/musrfit:root6 into master 2022-06-01 13:47:28 +02:00
suter_a 1b190830e9 fixed typo. 2022-06-01 13:43:01 +02:00
suter_a 7b19ba8b36 use PFindRun facility now. Cleaned up various little things. 2022-06-01 13:08:07 +02:00
Zaher Salman c585fedb63 Merged muonspin/musrfit:root6 into master 2022-06-01 09:37:18 +02:00
suter_a 137a3f17c9 move on to modernize towards modern c++. 2022-05-31 12:32:58 +02:00
Zaher Salman 374367bee8 Merged muonspin/musrfit:root6 into master 2022-05-29 19:02:39 +02:00
suter_a 7e830a0c12 update of the docu. 2022-05-29 12:52:13 +02:00
suter_a e0ec00deab update ChangeLog 2022-05-29 11:31:41 +02:00
suter_a 06d20d4086 adopted to new PSI-BIN lib. Added facility for finding runs via musrfit_startup.xml templates. 2022-05-28 14:10:15 +02:00
suter_a 56820e498f refactor PSI-BIN lib. Fix a couple of bugs and start to adopt to more modern c++. 2022-05-28 14:08:04 +02:00
suter_a eefc49bd25 add search facility for runs via musrfit_startup.xml template entries. 2022-05-28 14:05:55 +02:00
suter_a 0625bc008f fixed a typo, and tell the user if the file format info is not provided MusrRoot is assumed. 2022-05-27 13:14:30 +02:00
Zaher Salman e1c9a61251 Merged muonspin/musrfit:root6 into master 2022-04-29 10:43:35 +02:00
Andreas Suter f47fdf7e54 use proper return value (int) rather than bool. 2022-04-29 07:56:38 +02:00
Zaher Salman 6e9d8b3e35 Merged muonspin/musrfit:root6 into master 2022-04-28 09:50:19 +02:00
suter_a 4aa903b879 replace the run-list handling through the already existing handler class PStringNumberList. 2022-04-27 16:45:33 +02:00
Zaher Salman e37dede866 Merged muonspin/musrfit:root6 into master 2022-04-27 10:46:43 +02:00
suter_a 57596ca441 fixed several copy/paste errors which prevented sometimes averaging and instead crashed. 2022-04-25 15:32:15 +02:00
Zaher Salman 0b93a08108 Merged muonspin/musrfit:root6 into master 2022-04-12 16:25:25 +02:00
suter_a 5361727583 NeXus: replaced deprecated NXgetnextattr by NXgetnextattra. 2022-04-12 15:01:59 +02:00
suter_a 9a92ec2d8e improved formated string handling to make compilers happy. 2022-04-11 16:18:36 +02:00
suter_a 17a31dfcc4 do not ignore the return value of system(cmd) anymore. 2022-04-11 16:10:00 +02:00
suter_a 9cc1957b2d added necessary include directory info for boost, for PRgeHandler. 2022-04-11 13:28:18 +02:00
suter_a 26c1f49554 added depth profiler skeleton for MM. 2022-03-17 13:07:00 +01:00
suter_a fc08b12769 fixed wrong description (copy/paste error). 2022-03-17 12:17:38 +01:00
suter_a c8c2df5eb8 add reading routine for the dat-files as generate from msr2data. Use case: special 'non muSR fit' type. 2022-03-15 15:47:37 +01:00
suter_a 2d85d10b2f start adding CSV like data reading routine with the FileFormat label DAT. 2022-03-14 20:59:37 +01:00
Zaher Salman 326b3bea17 Merged muonspin/musrfit:root6 into master 2022-03-04 14:46:21 +01:00
suter_a faffaec6ac fixed a typo. 2022-03-04 11:25:28 +01:00
Zaher Salman aeaa698be2 Merged muonspin/musrfit:root6 into master 2022-01-11 14:34:03 +01:00
ext-mcfadd_r 3cc36bcb6d Merged in constants (pull request #12)
update the physical constants pertaining to the muon

Approved-by: Andreas Suter
2022-01-11 10:41:59 +00:00
ext-mcfadd_r a3bcbefebe use the Particle Data Group's recommended value for the muon lifetime 2022-01-11 11:34:29 +01:00
Zaher Salman 5bcc460cce Merged muonspin/musrfit:root6 into master 2022-01-11 11:05:00 +01:00
ext-mcfadd_r a13ee27b9a Merged in skewedgauss (pull request #13)
improvements to PTheory::SkewedGauss

Approved-by: Andreas Suter
2022-01-11 07:23:12 +00:00
ext-mcfadd_r 27fe3ff5fd fix the discontinuity encountered at large t when sigma+/- is large
- Though the discontinuity encountered in the previous version is small (because of the large Gaussain damping terms), it introduced considerable numeric instability when fitting. Consequently, simply zeroing the already heavily damped is sensible and yeilds smooth behaviour of the function.
- Also ensure that the return value for the odd frequency component is always finite.
2022-01-10 17:13:11 +01:00
ext-mcfadd_r fdc9ac8e7e improvements to PTheory::SkewedGauss
- Divide the function evaluation into even/odd frequency components. Some additional "helper" terms have been added to aid in this.
- Use a better value to check for floating-point overflow in the evaluation of ROOT::conf_hyperg and return std::numeric_limits<Double_t>::max() when necessary. This extends the function's range of validity to arbitrary time (whereas the previous implementation would fail loudly for large sigma+/-).
- Format the src with clang-format.
2022-01-10 14:20:08 +01:00
ext-mcfadd_r c85a12b61e update the physical constants pertaining to the muon
- use the most recent/precise measurement of the muon's lifetime (MuLan experiment at PSI).
- define the gyromagnetic ratio in terms of the latest values for the fundamental physical constants (CODATA 2018).
2022-01-10 13:14:19 +01:00
Zaher Salman 6e4e9ab55e Merged muonspin/musrfit:root6 into master 2021-12-06 18:40:18 +01:00
suter_a 06389416a6 replace deprecated QFontDatabase by the new static functions. 2021-12-05 16:45:53 +01:00
Zaher Salman c4da2c4ec0 Merged muonspin/musrfit:root6 into master 2021-12-02 13:09:00 +01:00
suter_a 3a1247e3ec modernized the cmake <-> Qt handling. 2021-12-01 15:25:38 +01:00
suter_a c5e5bddd10 try re-create musredit_startup.xml in case it is corrupted. 2021-11-29 16:11:14 +01:00
suter_a c44ae75e15 get rid of deprecated dialogs and make them more uniform. 2021-11-29 15:39:34 +01:00
suter_a d682004467 remove obsolate qt6 musredit dialog. 2021-11-29 15:20:18 +01:00
Zaher Salman edbbb8fc45 Merged muonspin/musrfit:root6 into master 2021-11-05 15:01:19 +01:00
suter_a 7486637998 revision of ChangeLog. 2021-11-05 14:24:38 +01:00
suter_a c75427513f adopted the the new dyld on macOS Monterey. 2021-11-05 14:06:20 +01:00
Zaher Salman 3e6d55f0e8 Merged muonspin/musrfit:root6 into master 2021-11-01 08:22:44 +01:00
suter_a a34e9fe535 add a default y-range to the range option in the PLOT block. 2021-10-30 09:58:49 +02:00
suter_a 01ff382972 fixed a copy/paste error. 2021-10-30 09:56:15 +02:00
suter_a 7ff3391d61 fixed a copy/paste error. 2021-10-30 09:53:09 +02:00
Zaher Salman d9b29388d0 Merged muonspin/musrfit:root6 into master 2021-10-12 16:13:36 +02:00
suter_a c6602fb541 improved the error messages slightly. 2021-10-03 15:04:39 +02:00
suter_a 8274fb9d54 add option to musrfit that the user can choose from the command line the number of threads to be used for OpenMP. Updated the docu accordingly. 2021-10-02 19:41:45 +02:00
suter_a 4f0590fe10 allow to inspect how many cores are available for OpenMP. 2021-10-02 10:11:44 +02:00
suter_a 4f2041c141 allow to set the default size of musredit via the musredit_startup.xml. 2021-10-02 09:26:13 +02:00
Zaher Salman f94c43ccdf Merged muonspin/musrfit:root6 into master 2021-09-28 13:28:28 +02:00
suter_a df03277c4c removed debug info from phase detection. 2021-09-22 09:54:25 +02:00
suter_a 76f4e6846a increase version number from 1.7.4 -> 1.7.5 2021-09-22 08:09:46 +02:00
suter_a 00398c7fa9 fix phases to +-360 degree. 2021-09-22 08:09:18 +02:00
Zaher Salman 30d2275b86 Merged muonspin/musrfit:root6 into master 2021-09-21 12:25:32 +02:00
suter_a d357b9ad2f add missing include directory path in cmake. Thank's to Akihiro Koda for reporting the bug and proposing the fix. 2021-09-21 07:52:58 +02:00
Zaher Salman 7d6d8e279f Merged muonspin/musrfit:root6 into master 2021-08-19 08:57:08 +02:00
suter_a 4cc1dbecd1 increased the PippardFitter version number. 2021-08-19 07:53:11 +02:00
suter_a 5f4125bca9 added some necessary include paths. 2021-08-19 07:52:22 +02:00
suter_a ef4fae3ef7 adopt for proper git-info handling. 2021-08-18 19:17:57 +02:00
suter_a d332bffd29 added some docu. 2021-08-18 19:17:18 +02:00
suter_a 4a2d865282 add the option to dump the nonlocal field values for the ASlibs via the programm dump_nonlocal_field. 2021-08-18 16:57:29 +02:00
Zaher Salman f3388a7d17 Merged muonspin/musrfit:root6 into master 2021-07-28 14:24:05 +02:00
suter_a c6c7deec9c make PSI bulk MusrRoot files accessible if the file name is generated from the run-number, year, etc. 2021-07-28 13:22:42 +02:00
prokscha 341fa9f77c Removed MuTransistion from tests directory. 2021-07-20 10:51:10 +02:00
Zaher Salman 2d65bc4574 Merged muonspin/musrfit:root6 into master 2021-07-12 19:09:24 +02:00
suter_a ef1f323f07 fixed another git-revision.h which was forgotten. 2021-07-12 16:30:31 +02:00
suter_a 47e7ba2c70 some fixes on the qt5 side for a none-git project source. 2021-07-12 16:23:33 +02:00
suter_a 8faa501db7 more work on the none git source version. 2021-07-12 16:00:19 +02:00
suter_a 2f11d131c7 some more work on the none git source version. 2021-07-12 15:49:01 +02:00
suter_a daa2ea1347 make sure that git repo info is only added if the musrfit project source is indeed a git repo, and not e.g. a download. 2021-07-12 15:34:07 +02:00
Zaher Salman 51e4482945 Merged muonspin/musrfit:root6 into master 2021-07-05 19:40:34 +02:00
suter_a f41c633bfe add mupp plotter export function. 2021-07-05 17:43:32 +02:00
Zaher Salman 5235935f85 Merged muonspin/musrfit:root6 into master 2021-06-17 10:39:07 +02:00
suter_a 5bebe4062d adopted version info for the docu. 2021-06-17 10:28:16 +02:00
Zaher Salman 76c2a98f5a Merged muonspin/musrfit:root6 into master 2021-06-17 10:03:09 +02:00
suter_a a0dd51e1b7 updated the ChangeLog. 2021-06-16 19:57:00 +02:00
suter_a dd08eeae12 increased version number. 2021-06-16 19:56:30 +02:00
suter_a 66fee6a1b3 lift #forward == #backward restriction. 2021-06-16 19:55:43 +02:00
suter_a ab29dedb77 lift #forward == #backward restriction. 2021-06-16 17:58:40 +02:00
suter_a b2bb863e9d remove obsolete test. 2021-06-16 17:57:28 +02:00
Zaher Salman b488ed60a0 Merged muonspin/musrfit:root6 into master 2021-06-07 19:58:56 +02:00
suter_a 927f2e83c2 improve the readability of the time with packing in the code. 2021-06-07 18:34:36 +02:00
Zaher Salman b9e3ceea5c Merged muonspin/musrfit:root6 into master 2021-06-06 22:49:19 +02:00
suter_a 5bd5c08f39 adopted to the not quite standard ISIS NeXus files. 2021-06-05 10:51:19 +02:00
Zaher Salman e0ecad2f3a Merged muonspin/musrfit:root6 into master 2021-06-02 14:14:56 +02:00
suter_a f4232057b8 perform a more robust casting. 2021-06-02 12:29:00 +02:00
suter_a 90725dbf58 removed unnecessary check. 2021-06-02 12:28:24 +02:00
Zaher Salman 97400255a0 Merged muonspin/musrfit:root6 into master 2021-06-01 17:53:04 +02:00
suter_a 3b24d512be increased the version number. 2021-06-01 17:31:37 +02:00
suter_a eae35a750d updated mud to the newest version and made it Apple Silicon M1 ready. 2021-06-01 17:09:37 +02:00
Zaher Salman 16a1629ab6 Merged muonspin/musrfit:root6 into master 2021-05-21 15:57:51 +02:00
suter_a 8cce005fd5 add info on how musrfit is compiled Debug or Release. 2021-05-21 07:44:50 +02:00
Zaher Salman 939d4fb7b5 Merged muonspin/musrfit:root6 into master 2021-04-19 16:25:53 +02:00
Zaher Salman c638456afe Merged muonspin/musrfit:root6 into master 2021-04-19 15:20:12 +02:00
suter_a 86459e586d changed MuSR_td_PSI_bin in order to read old data. Not yet tested. 2021-04-19 11:58:24 +02:00
suter_a 32c892cad4 add README files for the DummyUsrFcn with an example. 2021-04-19 08:09:53 +02:00
suter_a 93c537ba22 update of ChangeLog. Increase version number. 2021-04-16 20:53:56 +02:00
suter_a 5eed60937a add a full dummy user function class with a global part. This can be used as a starting point to develop new polarization functions. Currently no rge-handling present. 2021-04-16 18:32:30 +02:00
Zaher Salman 29b603e124 Merged muonspin/musrfit:root6 into master 2021-04-13 15:33:36 +02:00
suter_a f775ef3545 Fix out-of-bound bug pointed out by Ryan McFadden. 2021-04-13 07:33:14 +02:00
suter_a fb85d025bb add missing Qt6 flag for the case the user wants to choose himself. 2021-04-13 07:31:01 +02:00
Zaher Salman 9c438b580b Merged muonspin/musrfit:root6 into master 2021-04-12 14:37:43 +02:00
suter_a 8271192f63 make sure that group has indeed any elements. 2021-04-12 07:50:37 +02:00
Zaher Salman 65ee70c52e Merged muonspin/musrfit:root6 into master 2021-04-11 11:47:31 +02:00
suter_a cac1415c3e update of the docu. 2021-04-09 15:41:52 +02:00
suter_a 692e7e44db propagate ROOT_GRTEQ_24 properly to the compile options. 2021-04-09 11:08:35 +02:00
suter_a 911c31fb1e applies already for 6.24-rc which is 6.23.99, hence the odd adaptation. 2021-04-09 11:07:14 +02:00
suter_a c06f510aff changes needed since upcoming ROOT6.24 (minuit2) will break the backward compatibility. 2021-04-09 10:03:34 +02:00
suter_a 38b289b99f add ROOT version information for better diagnostics. 2021-04-09 09:33:08 +02:00
Zaher Salman 6b32dcaa38 Merged muonspin/musrfit:root6 into master 2021-04-06 15:28:19 +02:00
suter_a 7089e4b3d6 switched libPhotoMeissner to the new centralized PRgeHandler. 2021-04-01 20:41:00 +02:00
suter_a 7de55705d2 slightly more modern c++ init style. 2021-04-01 20:38:32 +02:00
suter_a 56f094dad0 slightly improved the rge handler. 2021-04-01 20:37:08 +02:00
suter_a cab8703f85 fix an error number of theory points for the view data. 2021-04-01 20:30:53 +02:00
suter_a 72c085a0a8 make PRgeHandler to a shared libs. Adopted Nonlocal and PMagProximity accordingly. 2021-04-01 14:26:26 +02:00
suter_a 113996aa4e changed the user function for nonlocal fitting to the new rge-handler. This breaks the backwards compatibility! 2021-03-30 15:48:51 +02:00
suter_a cb0e8d2e65 update of the ChangeLog. 2021-03-30 15:43:26 +02:00
suter_a 0dc1c4d975 add some boost component checks. Increase the musrfit version number. 2021-03-30 15:41:38 +02:00
suter_a 21213a45eb add a central rge-handler which can be used by all user function classes. 2021-03-30 15:39:45 +02:00
Zaher Salman 7f2d8f6625 Merged muonspin/musrfit:root6 into master 2021-03-29 17:34:02 +02:00
suter_a e6e951e8f4 update the copyright info. 2021-03-29 08:22:38 +02:00
Zaher Salman 4dea80c6b6 Merged muonspin/musrfit:root6 into master 2021-03-09 11:51:10 +01:00
suter_a 551fa4e4a6 refresh of the setup docu. 2021-03-01 15:40:10 +01:00
Zaher Salman 8afc51f497 Merged muonspin/musrfit:root6 into master 2021-03-01 09:35:16 +01:00
suter_a 6d61cfd4d9 modernized the msr input file. 2021-02-26 15:18:12 +01:00
suter_a cc8ac60713 by changing the behaviour of the global parts of the class PUserFcnBase from pure virtual default NeedGlobalPart=false, the code can be simplified in many places. 2021-02-26 15:17:41 +01:00
suter_a 1372a8b782 xml schema more flexible about the order of 'histos' and 'RunHeader' 2021-02-18 14:59:35 +01:00
suter_a 27607a2fa1 fix of a typo. 2021-02-18 11:56:39 +01:00
suter_a 88b4e7600d fixed wrong casting originating from a copy/paste error. 2021-02-18 11:55:34 +01:00
Zaher Salman acd149a159 Merged muonspin/musrfit:root6 into master 2021-02-17 14:10:02 +01:00
suter_a 01ce90e97e better version for icons under macosx. 2021-02-16 20:46:52 +01:00
suter_a 457adc7e7e add macOS BigSur icon to musredit. 2021-02-14 22:13:40 +01:00
Zaher Salman c87906efd6 Merged muonspin/musrfit:root6 into master 2021-02-08 10:36:49 +01:00
suter_a 90fb81f16a add new method GetTypeOfPath to TMusrRunHeader. It allows deduce the type of a given path-name. 2021-02-06 19:05:40 +01:00
suter_a bfd7229252 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2021-01-26 10:33:13 +01:00
suter_a f9581ae9d5 fix typo. Increase minimal root version from rpm. 2021-01-26 10:21:06 +01:00
Zaher Salman 21dedba8fa Merged muonspin/musrfit:root6 into master 2021-01-25 09:01:24 +01:00
suter_a cd785b8e5d update of the docu. 2021-01-23 15:58:04 +01:00
suter_a 9cc9792054 some bug fixing in the cmake chain concerning the new Qt6 stuff. 2021-01-23 10:21:55 +01:00
suter_a ad9cf0abf9 remove comment. 2021-01-22 22:25:43 +01:00
suter_a 5dcc962351 add first Qt6 version of musredit, mupp, etc. 2021-01-22 22:04:11 +01:00
Zaher Salman 7279de07ff Merged muonspin/musrfit:root6 into master 2021-01-03 11:44:35 +01:00
suter_a 386217b1fe add proper p-wave (line,point) superfluid density calculation. 2020-12-28 15:13:45 +01:00
suter_a 12c2e5f7a4 fix minor '=' vs '==' bug. 2020-12-26 11:59:52 +01:00
suter_a daef50e35a adjust to Qt 5.14.x; remove compiler warnings. 2020-12-22 22:36:07 +01:00
suter_a 04fff97704 The musredit help system is using now the system default web-browser. This simplifies things, especially the qtwebengine package is not needed anymore. 2020-12-22 17:31:42 +01:00
suter_a 20d9794db2 replaced 3D description. The previous was just wrong! 2020-11-19 10:42:12 +01:00
suter_a ba7665c85f increment libGapIntegrals version number 2020-11-04 15:10:02 +01:00
suter_a 32cf3221d9 BMWlibs: add two p-wave gap funtions which can be used to evaluate the superfluid density. 2020-11-04 15:03:58 +01:00
Zaher Salman 693b99755d Merged muonspin/musrfit:root6 into master 2020-09-11 10:22:39 +02:00
suter_a 6ef53c6b6a remove redundant check from musredit/fileSaveAs 2020-09-10 15:23:27 +02:00
suter_a 18424fe149 musredit: if save cannot write file, popup an error message dialog. 2020-09-10 15:04:19 +02:00
Zaher Salman 0069ef02c8 Merged muonspin/musrfit:root6 into master 2020-09-01 16:15:43 +02:00
suter_a 6747e5c1ca added a missing check in Fourier difference handling. 2020-09-01 15:06:33 +02:00
Zaher Salman 45de42bc5b Merged muonspin/musrfit:root6 into master 2020-08-30 15:08:05 +02:00
suter_a 66f3b48e2a musrview gets the new feature: calculate theory points only at data points. 2020-08-29 11:15:02 +02:00
Zaher Salman 7d1cb313f2 Merged muonspin/musrfit:root6 into master 2020-07-28 09:33:30 +02:00
suter_a 33fe4ee5fb moved fTriggerColor toggle state to the proper position. 2020-07-28 08:50:59 +02:00
suter_a 0e2d880249 A single asymmetry plot allows to toggle the color of the theory function line by the key 't'. 2020-07-27 18:36:27 +02:00
Zaher Salman 6a8ec77037 Merged muonspin/musrfit:root6 into master 2020-07-14 19:43:52 +02:00
suter_a be8689853b musredit: check if system variables ROOTSYS and MUSRFITPATH are set, and if not popup a warning. 2020-07-12 11:24:57 +02:00
suter_a a81515cb95 add another startup check which makes sure that musrfit is found by musredit. 2020-07-11 19:55:11 +02:00
Zaher Salman 85359817f9 Merged muonspin/musrfit:root6 into master 2020-06-21 17:46:24 +02:00
suter_a a09d6878f2 make more function available to mupp (sinh, .., asin, .., and sqrt) 2020-06-20 09:44:14 +02:00
Zaher Salman 268772e953 Merged muonspin/musrfit:root6 into master 2020-06-19 09:10:47 +02:00
suter_a 5ec1228ea6 replaced obsolete QXmlDefaultHandler by QXmlStreamReader in musrWiz. 2020-06-18 22:35:29 +02:00
suter_a 8ecac5fd57 replaced obsolete QXmlDefaultHandler by QXmlStreamReader in PChangeDefaultPathsDialog. 2020-06-18 20:44:08 +02:00
Zaher Salman 260c2c19e7 Merged muonspin/musrfit:root6 into master 2020-06-18 20:40:21 +02:00
suter_a 35760525bb replaced obsolete QXmlDefaultHandler by QXmlStreamReader in mupp 2020-06-18 20:24:31 +02:00
suter_a c42bbd16f3 replaced obsolete QXmlDefaultHandler by QXmlStreamReader in musredit. 2020-06-18 18:46:03 +02:00
Zaher Salman c8e863617a Merged muonspin/musrfit:root6 into master 2020-06-18 09:45:43 +02:00
suter_a 4661dee936 update of the docu - describe meta info access in functions. 2020-06-17 20:22:42 +02:00
suter_a 7b6180a688 Functions can now not only operate on parameters and maps but also on meta information
obtained from the data files. Currently the following meta information can be accessed
if available:
field in (G): B or b
energy in (keV): En or en
temperature in (K): since some data files contain a vector of temperature, they have
                    to be accessed with an index, like T0 or t0, etc.
2020-06-17 19:31:31 +02:00
suter_a 602a5a4e6c add field, temperature values from meta-data of the data-files to the runs. This will be needed if functions want to access this information (not yet implemented). 2020-06-13 16:13:44 +02:00
Zaher Salman 8da82ee6cc Merged muonspin/musrfit:root6 into master 2020-06-09 10:46:31 +02:00
suter_a f03b918840 add minimum size to musredit help. 2020-06-08 18:35:19 +02:00
Zaher Salman a7e1477f7f Merged muonspin/musrfit:root6 into master 2020-05-27 09:18:18 +02:00
suter_a 07a3de1ed4 fixed double newline with alpha and beta, accidentally introduced. 2020-05-26 16:06:46 +02:00
Zaher Salman cbdef9b7b9 README.md edited online with Bitbucket 2020-05-26 07:22:22 +00:00
Zaher Salman 5cc8722a95 Merged muonspin/musrfit:root6 into master 2020-05-25 21:59:55 +02:00
suter_a 58461bf013 updated the docu and adopted the ChangLog 2020-05-25 16:27:18 +02:00
suter_a c930298972 allow alpha, beta in the RUN block being expressed via a function. 2020-05-25 16:21:16 +02:00
Zaher Salman 56337cf7a5 Merged muonspin/musrfit:root6 into master 2020-05-19 17:20:03 +02:00
suter_a 9af6b1fb8e make some cmake/boost/compiler combinations happy. 2020-05-19 15:44:37 +02:00
suter_a 815ca7162f fixed some doxygen bugs in the technical docu. 2020-05-19 15:33:21 +02:00
suter_a 5ee3b17953 updated the technical documentation. 2020-05-19 14:17:18 +02:00
Zaher Salman a2855bba19 Merged muonspin/musrfit:root6 into master 2020-05-17 18:06:43 +02:00
suter_a f2a598f512 mupp add var: check if a variable for a given collection already exists, and if yes, replace it, otherwise add the new variable. 2020-05-17 16:07:52 +02:00
Zaher Salman 263554dd37 Merged muonspin/musrfit:root6 into master 2020-05-16 14:22:13 +02:00
suter_a 48d531f90f update of the docu. 2020-05-15 21:46:12 +02:00
suter_a cf0ab74ba7 release new version 1.6.0 2020-05-15 21:19:26 +02:00
suter_a eac9a8adc9 update of the docu for version 1.6.0 2020-05-15 21:17:32 +02:00
suter_a a200c184cb add more comments to the mupp script. 2020-05-14 20:34:05 +02:00
suter_a 48a2ff632e fixed a typo. 2020-05-14 20:33:11 +02:00
suter_a 29428ec1bf removed obsolete debug information/comments. 2020-05-14 15:50:50 +02:00
suter_a 68ce56c7db add FindHDF4.cmake to musrfit since in more modern linux systems it is not available anymore. 2020-05-14 15:49:18 +02:00
suter_a 5779a24b3e add missing varEdit icons. 2020-05-14 11:20:18 +02:00
suter_a 651e24721f made the PmuppGui class ready for interactive variable handling. 2020-05-14 11:10:36 +02:00
suter_a df88345c55 fixed a signal emit error. Automatically select the first collection at startup. This way at least one collection is already selected. 2020-05-14 11:09:29 +02:00
suter_a 1a2853e548 mupp: worked on the doxygen docu. 2020-05-11 20:20:23 +02:00
suter_a f19a94651b work an interactive variable definition in mupp. Up to checking it is already working. Add variable still missing. 2020-05-11 16:09:13 +02:00
suter_a 867246874b make the version information more coherent. 2020-05-02 17:05:04 +02:00
suter_a a91002f807 remove accidental left-over debug info. 2020-05-02 14:47:13 +02:00
suter_a 884e0270a1 lift the mupp version to 1.0 2020-05-02 14:29:37 +02:00
suter_a 40fcc228fa add a dark_theme flag to the mupp_startup.xml. This is can help if mupp at runtime cannot decide on the used theme. 2020-05-02 14:29:04 +02:00
suter_a 6d0666f285 add empty constructor. 2020-04-30 17:37:52 +02:00
suter_a 5755331273 add missing files. 2020-04-30 17:20:38 +02:00
suter_a d81a10e450 first full mupp version allowing variables on scripting level, interactively still missing. 2020-04-30 17:11:57 +02:00
suter_a f4ac06cb20 add another mupp example. 2020-04-29 17:11:49 +02:00
suter_a 74cfa3ecbf more work on var handling. Inject collection variables. 2020-04-29 17:10:24 +02:00
suter_a 29064c44be add skeleton for variable handling. 2020-04-29 14:13:23 +02:00
suter_a 10271dab9a update of the copyright info. 2020-04-29 09:05:40 +02:00
suter_a 41b4b61f1b update of the copyright info. 2020-04-29 08:51:03 +02:00
suter_a cce7a6bcd0 improved syntax messages. 2020-04-28 16:25:48 +02:00
suter_a a4eb96a4a9 changed to explicit std namespace. 2020-04-28 12:08:21 +02:00
suter_a 572e0f96a5 changed to explicit std namespace. 2020-04-28 12:07:10 +02:00
suter_a 4ebb5bb377 allow to remove x/y entries from the command line. 2020-04-28 10:17:38 +02:00
suter_a 32ed8d4df2 work on the scripting part of mupp. Preparing for the step of parameter transformation. 2020-04-23 16:35:55 +02:00
Zaher Salman a701a7a336 Merged muonspin/musrfit:root6 into master 2020-04-13 17:33:16 +02:00
suter_a 83c4bff123 improved error messages for NeXus file reading. Especially for the case of HDF4/HDF5 <-> NeXus version issues. 2020-04-11 21:21:33 +02:00
Zaher Salman a30ac29032 Merged muonspin/musrfit:root6 into master 2020-04-10 12:04:50 +02:00
suter_a 90db9144fe fixes issue #24 reported on bitbucket. 2020-04-10 11:30:34 +02:00
suter_a e705ba5d9a remove unused variable. 2020-04-10 11:27:42 +02:00
Zaher Salman 479e81cc68 Merged muonspin/musrfit:root6 into master 2020-04-07 11:03:10 +02:00
suter_a 38ffcb3104 allow to plot normalize data in mupp 2020-04-05 08:28:35 +02:00
suter_a 54fee067df little extension which allows to normalize plots. Only dialogs added so far, no functionality yet. 2020-04-04 20:26:29 +02:00
suter_a 2035ae5ede Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2020-02-16 17:20:23 +01:00
suter_a 520ff84941 vortex film GL test: starting point. 2020-02-16 17:18:42 +01:00
suter_a de04b3f036 eventHandler test cleanup. Furthermore move make -> cmake. 2020-02-15 16:31:41 +01:00
Zaher Salman 896540bee6 Merged muonspin/musrfit:root6 into master 2020-02-10 10:36:16 +01:00
suter_a 785b32e945 proper cleanup. 2020-02-10 08:57:35 +01:00
suter_a 5232349ad1 updated to the new musrfit and doxygen version. 2020-02-05 15:03:47 +01:00
Zaher Salman 2f5259d6e5 Merged muonspin/musrfit:root6 into master 2020-02-05 09:42:37 +01:00
suter_a c3e3af0311 update of the docu including the SECTOR cmd. 2020-02-04 19:37:31 +01:00
suter_a e9247ed3d5 increment version. 2020-02-03 21:03:45 +01:00
suter_a fe7a1b7920 first full implementation of the sector command. 2020-02-03 20:54:23 +01:00
suter_a 1fb1753d82 more work on the SECTOR command. CalcNoOfFitBins() needed to be changed from protected to public. 2020-02-02 17:12:08 +01:00
suter_a ed0bfd516b started to implement a chisq/maxLH sector command. Currently only the skeleton is in place. 2020-01-31 16:39:52 +01:00
Zaher Salman 8742d9651b Merged muonspin/musrfit:root6 into master 2020-01-31 09:49:29 +01:00
suter_a 513144997e updated docu 2020-01-31 07:50:50 +01:00
Zaher Salman 63f73427b1 Merged muonspin/musrfit:root6 into master 2019-12-04 11:02:45 +01:00
suter_a 55b681acc1 replaced decrepitated OS system check under Qt. The new version works for Qt >= 5.4 which should cover everything still alive. 2019-11-22 18:15:09 +01:00
Zaher Salman 2afc21becc Merged muonspin/musrfit:root6 into master 2019-11-11 13:10:01 +01:00
suter_a c71fc92cf0 fixed some minor typos in the docu. 2019-11-11 12:57:06 +01:00
Zaher Salman 63a1b1c1f3 Merged muonspin/musrfit:root6 into master 2019-11-11 09:29:40 +01:00
suter_a af5a6e37d1 slightly improved call-up of mupp from musredit. If cancelling the db-dialog mupp will quit, but only at startup. 2019-11-09 09:27:42 +01:00
suter_a ca5bbbe1e0 Added explicitly CMP0075 policy in order to get rid of an unnessary warning. 2019-11-08 20:25:49 +01:00
Zaher Salman b916b0f6da Merged muonspin/musrfit:root6 into master 2019-11-08 16:20:35 +01:00
suter_a 921b8bbab4 fixed a bug in the global+ option of msr2data if a global section is present. 2019-11-08 12:23:27 +01:00
Zaher Salman 4ef4316b97 Merged muonspin/musrfit:root6 into master 2019-10-28 09:21:05 +01:00
suter_a 503336e685 also allow to add an offset. 2019-10-24 13:02:34 +02:00
suter_a 2650c7d12b allow to change the power N for 2^N elements. 2019-10-24 12:39:11 +02:00
Zaher Salman 357b225d53 Merged muonspin/musrfit:root6 into master 2019-10-24 09:16:57 +02:00
suter_a b3d9345def Merge https://gitlab.psi.ch/nemu/musrfit into root6 2019-10-24 07:49:13 +02:00
suter_a 9add9f2561 added a bare fftw3 test in order to make sure fftw3 works on a new platform. 2019-10-23 19:54:54 +02:00
suter_a b29d85dd4c fix for the case that a global section is present. 2019-09-23 13:53:19 +02:00
Zaher Salman 5fff38d36b Merged muonspin/musrfit:root6 into master 2019-09-12 15:03:14 +02:00
suter_a a37dc401d9 added missing include file when installing. 2019-09-12 10:50:33 +02:00
Zaher Salman d00752b196 Merged muonspin/musrfit:root6 into master 2019-09-02 10:07:32 +02:00
Zaher Salman a1924c2756 Merged in master (pull request #11)
Master
2019-08-31 08:31:26 +00:00
salman 75958d0bce Fix a bug to allow passing lifetimecorrection flag into global fit files generated by msr2data. 2019-08-30 11:27:41 +02:00
salman 2d2f7ae2ba Update MSR.pm to use the GLOBAL block. 2019-08-30 11:19:00 +02:00
Zaher Salman d80db45ffe Merged muonspin/musrfit:root6 into master 2019-07-26 15:27:23 +02:00
suter_a 708b6a6f9e if mupp is starting without db/dat file list, open the file dialog automatically. 2019-07-26 11:29:15 +02:00
suter_a b68286761a updated docu 2019-07-24 10:15:15 +02:00
suter_a cf03c49cf8 NeXus mxml support for now dropped since the upstream NeXus library is incompatible with the new mini-xml v3. 2019-07-24 08:31:08 +02:00
Zaher Salman 25a378d611 Merged muonspin/musrfit:root6 into master 2019-07-10 09:11:46 +02:00
suter_a a33248d3e8 switched the Fourier option of the NeXus2 example from POWER to REAL 2019-07-09 20:03:53 +02:00
Zaher Salman f42ace3cdb Merged muonspin/musrfit:root6 into master 2019-07-02 11:52:37 +02:00
suter_a 73db4a7c0e fix of a typo 2019-07-01 23:10:01 +02:00
suter_a e8982410b0 adopted to the enforced changes by root 6.18.00. 2019-07-01 21:56:50 +02:00
Zaher Salman 61aab019be Merged muonspin/musrfit:root6 into master 2019-06-03 16:15:23 +02:00
suter_a 34b432b185 Non-muSR data export from musrview
Add the theory export part again which was lost after restructuring.
2019-06-03 14:14:20 +02:00
prokscha 2e2c249e33 Fixed bug in runMuSimulation.C 2019-05-23 11:13:36 +02:00
Zaher Salman 7cfa5cbf31 Merged muonspin/musrfit:root6 into master 2019-05-22 10:13:14 +02:00
Zaher Salman 6ee9d829ff Merged in zaher-salman/musrfit/master (pull request #10)
Moved beta-NMR msr example files to doc/examples/

Approved-by: Zaher Salman <zaher.salman@gmail.com>
2019-05-21 13:18:27 +00:00
salman e89c9b5b2a Moved beta-NMR msr example files to doc/examples/ 2019-05-15 16:31:02 +02:00
Zaher Salman ebabc43383 Merged muonspin/musrfit:root6 into master 2019-05-15 11:44:52 +02:00
suter_a 25bfa1f66b update of the docu. 2019-05-15 10:14:39 +02:00
suter_a cc1c914d93 Merge branch 'beta-NMR' into root6 2019-05-15 09:00:47 +02:00
salman 3ae47bf5cb Correct typo 2019-05-14 11:35:02 +02:00
salman 5e67b3c962 Remove unused code. 2019-05-14 09:52:13 +02:00
Zaher Salman 0aa31470c3 Merged muonspin/musrfit:root6 into master 2019-05-13 10:11:39 +02:00
suter_a 50314c56e3 properly check the number of t0 parameters in the msr-file. 2019-05-11 13:15:43 +02:00
salman ce9c095f1f Fixed crash in example msr files for fitting two betaNMR helecities together. 2019-05-10 17:16:48 +02:00
salman b42abb2056 Minor changes to example beta-NMR msr files 2019-05-07 13:48:47 +02:00
salman 5d558833b0 Correct time resolution for betaNMR runs. 2019-05-06 14:33:22 +02:00
salman 924c297906 Debugging core dump issues 2019-05-03 17:10:07 +02:00
salman 553b1de240 Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-02 17:08:22 +02:00
Zaher Salman acc251ffbe Merged muonspin/musrfit:root6 into master 2019-05-02 17:05:39 +02:00
suter_a 2065904bec some minor ubuntu tweak concerning themes. 2019-05-02 15:04:55 +02:00
suter_a f320230b30 make sure that the icon theme is properly loaded when the prefs are reloaded. 2019-05-02 11:02:06 +02:00
suter_a 3256dde54e More flexible dark scheme handling
It works now as follows:
1) try to get theme information from the system, and if present us it.
2) if no theme information of the system is present, take the one from
   the musredit_startup.xml.

Now it is possible to switch the icon theme for the menu and toolbar
separately.
2019-05-02 10:44:04 +02:00
salman 6498e0b0bc Preparing for merge with master 2019-05-01 12:56:33 +02:00
suter_a 1ef1e6f42e updated default musredit_startup.xml file info. 2019-05-01 10:57:50 +02:00
salman 375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-01 10:40:32 +02:00
suter_a 20153c6ffc more work for dark theme under macOS. 2019-05-01 09:01:27 +02:00
suter_a bd3ade3136 improved icon scaling. 2019-04-30 14:20:38 +02:00
suter_a f51f3e2038 make toolbar icons switchable plain/dark. 2019-04-30 09:40:36 +02:00
Zaher Salman 08ee7991a5 Merged muonspin/musrfit:root6 into master 2019-04-29 09:29:15 +02:00
suter_a a5526d7f76 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2019-04-26 20:35:32 +02:00
suter_a 67421b2114 Allow switching icon theme in musredit
Added the needed facility in the preferences which allows to switch
the icon scheme between plain and dark. This is needed for some OS
where qt doesn't provide the necessary information.
2019-04-26 19:29:24 +02:00
Zaher Salman a2d8acb16d Merged muonspin/musrfit:root6 into master 2019-04-26 16:03:36 +02:00
suter_a 34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 11:46:15 +02:00
salman be8c809c6a Follow Andreas' code modernization for BNMR code and cleanup 2019-04-26 10:58:17 +02:00
salman 3ae49b6c23 Resolve merge conflicts manually 2019-04-26 09:25:48 +02:00
salman a4b5c82a8e Removed automake file to resolve conflict 2019-04-26 09:18:24 +02:00
salman 26dd28d2f1 Changes to template files 2019-04-26 09:18:24 +02:00
salman bd6a63421b More recent working version 2019-04-26 09:18:24 +02:00
Zaher Salman d38f670504 Added documentation relevant to beta-NMR asymmetry fits, fittype 5. 2019-04-26 09:18:24 +02:00
Zaher Salman 781c56fef5 Cleanup 2019-04-26 09:18:24 +02:00
Zaher Salman e28b907fb7 Estimate alpha for beta-NMR asymmetry calculation from the ratio of B/F counts if no alpha line is given in the run block. 2019-04-26 09:18:24 +02:00
salman 22141ae98d Deal with missing alpha line for beta-NMR. 2019-04-26 09:18:24 +02:00
salman c66849e133 Added estimation for the value of alpha from integrated counts. 2019-04-26 09:18:24 +02:00
salman 3d773d8537 Possible fix for alpha problem for beta-NMR asymmetry calculation. To be tested. 2019-04-26 09:18:24 +02:00
salman e3d5d03fca Fix x-axis label bug (reported by Gerland Morris). 2019-04-26 09:15:24 +02:00
Zaher Salman a837b1c420 Template files for two helicities and subtracted helicities updated. 2019-04-26 09:15:24 +02:00
Zaher Salman e04cddfac8 Remove beta-NMR ascci based templates to avoid confusion. 2019-04-26 09:15:24 +02:00
salman 970b7aafda Beta-NMR helicity subtraction seems to work in the new class. Still needs debugging and tests. Some of the changes from Jonas were reverted since SExp does not work otherwise. 2019-04-26 09:15:24 +02:00
Zaher Salman e3408ca5f5 Start substract asymmetry implementation. 2019-04-26 09:11:00 +02:00
Zaher Salman 9d76afdef9 Start substract asymmetry implementation. 2019-04-26 09:11:00 +02:00
Zaher Salman 2b00c92139 Fixed chisqr calculation bug in BNMR 2019-04-26 09:11:00 +02:00
salman a2d47a09f8 First working duplicate asymmetry class for beta-NMR. 2019-04-26 09:11:00 +02:00
Zaher Salman bcd1c98ad2 More work towards implementation of beta-NMR asymmetry calculation 2019-04-26 09:11:00 +02:00
Zaher Salman 8346e8debb First successful compilation of AsymmetryBNMR 2019-04-26 09:08:52 +02:00
Zaher Salman 4ad524216f Start branch to develop full featured beta-NMR support 2019-04-26 09:06:28 +02:00
Zaher Salman a1bc47c39e Merged muonspin/musrfit:root6 into master 2019-04-26 08:54:54 +02:00
suter_a dae9ef0ffb some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. 2019-04-25 20:33:43 +02:00
suter_a 074d8c77e4 some minor cleanup and update of the copyright info. 2019-04-25 20:30:44 +02:00
suter_a 96d9ba5f88 added some more specifc error codes. 2019-04-25 20:23:40 +02:00
suter_a 9d12700f39 added some additional error tags. 2019-04-25 20:22:43 +02:00
Zaher Salman 02d233b412 Merged muonspin/musrfit:root6 into master 2019-04-25 17:27:56 +02:00
salman 35612c25ca Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2019-04-25 17:27:26 +02:00
salman 904471b664 Resolve conflicts manually. 2019-04-25 17:27:03 +02:00
suter_a 795cd75b1e modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted,
the version is changed to 1.4.3
2019-04-16 15:34:49 +02:00
Zaher Salman cf2e127aae Merged master into beta-NMR 2019-04-05 08:15:03 +00:00
salman 6c88bce19c Removed automake file to resolve conflict 2019-04-05 10:14:16 +02:00
Zaher Salman 8247b19b84 Merged muonspin/musrfit:root6 into master 2019-04-05 09:00:38 +02:00
suter_a e6d424e900 removed outdated 'register' from code. 2019-04-04 15:52:21 +02:00
Zaher Salman aa6579af41 Merged muonspin/musrfit:root6 into master 2019-04-03 08:46:24 +02:00
suter_a 36cc3444a2 improve msr2data handling
It is now checked if a msr-file is already open so that the corresponding
tab is reloaded after msr2data is carried out with a file open request.
2019-04-01 10:32:24 +02:00
suter_a 15692b89e7 Fix crash when trying to close empty tab 2019-04-01 09:03:29 +02:00
Zaher Salman fa446460af Merged muonspin/musrfit:root6 into master 2019-03-13 10:55:52 +01:00
salman 05a62506d8 Resolving conflict. 2019-03-13 10:55:36 +01:00
salman ffae09354e Resolving conflict. 2019-03-13 10:54:33 +01:00
salman a00b93f6cd Resolving conflict. 2019-03-13 10:53:13 +01:00
salman 95ea5b6f68 Resolving conflict. 2019-03-13 10:52:05 +01:00
salman d66b132a0b Resolving conflict. 2019-03-13 10:50:28 +01:00
salman 33d0e51a05 Resolving conflict. 2019-03-13 10:46:53 +01:00
suter_a fec5017fc2 added log info for the cpack part. 2019-03-11 13:33:42 +01:00
suter_a 9cd35d1373 added missing include directory. 2019-03-08 16:24:45 +01:00
suter_a 86d03d7132 Docu updated
Removed the automake tool chain description (hopefully) everywhere.
2019-03-08 13:07:47 +01:00
suter_a dbfeeddf3f Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.
2019-03-08 12:50:41 +01:00
Zaher Salman dcfa461537 Merged master into beta-NMR 2019-02-19 08:43:38 +01:00
Zaher Salman 414165bc90 Merged muonspin/musrfit:root6 into master 2019-02-19 08:42:19 +01:00
suter_a 64f73ffb11 find theme in case default channel fail. This is ugly and eventually needs a better solution. 2019-02-14 09:35:32 +01:00
suter_a 97beb80c4b Dynamic Search Path for ROOT Dictionary
Added by default the dynamic search path '/usr/local/lib' to ROOT.
This is needed to find the necessary dictionaries for musrfit,
musrview, musrt0. Furthermore, added an option '--show-dynamic-path'
to these programs which allow the user to dump the currently used
dynamic search paths. This is potentially handy for diagnostics.
2019-02-05 09:51:30 +01:00
suter_a 29d35579a7 added the current source code path to root_generate_dictionary. 2019-02-04 19:43:31 +01:00
suter_a c64a8146b7 added the necessary header-, pcm-, and rootmap-files. This is needed when distrbuted as package. 2019-02-04 10:54:52 +01:00
suter_a d48615650e adopted for yum update which calls at the end the uninstall script. 2019-02-04 10:53:35 +01:00
suter_a a7806f7e02 added necessary CPack tag for redhat flavor. 2019-02-04 10:52:37 +01:00
suter_a 3cb950277f cmake/cpack root dictionary issue fixed.
In order that package assembly works, the code needs to be relocatble
and any hints linking it to the original source need to be absent.
The changes here do exactely this. For rootcling the '-inlineInputHeader'
option is needed, otherwise the dictionary wants to load the header
file from the source destination which of course will fail when installing
the package on a machine without the source.
2019-02-01 16:05:24 +01:00
suter_a faffd5bcd6 CPack post (un)install
add post (un)install scripts to musrfit cpack. Currently for rpm only. Furthermore a minimal required root version is added. Will need to see if this is sufficient or if more detailed work needs to be added.
2019-01-31 10:45:05 +01:00
Zaher Salman 7307406d05 Merged master into beta-NMR 2019-01-25 13:06:05 +01:00
Zaher Salman 467a799056 Merged muonspin/musrfit:root6 into master 2019-01-22 15:22:59 +01:00
suter_a 98057629e6 adopted musredit.pro such that the deprecated automake get things compiled. 2019-01-22 14:51:52 +01:00
suter_a 8485914b89 make msr-file comment consistent with the docu (for ifll and ifgk). 2019-01-22 14:15:43 +01:00
Zaher Salman 592b0cfc42 Merged muonspin/musrfit:root6 into master 2019-01-22 09:26:02 +01:00
suter_a 32220f754d Docu update
Added information about the not yet documented functions for internal fields with Gaussian/Lorentzian broadening.
2019-01-21 13:36:15 +01:00
suter_a 75a2a9b3f3 update version information. 2019-01-21 13:35:13 +01:00
suter_a c7e35dfdff Make so far undocumented functions ifgk and ifll public and at the same time properly normalize them. 2019-01-18 10:35:26 +01:00
suter_a d634fd2ce6 CPack/CMake for musrfit
more tweaks towards musrfit rpm
2019-01-14 11:19:19 +01:00
suter_a 87f706dfaa CPack stub to generate RPM, DEB, etc
Added the first necessary files allowing to generate all kind of packages for the future.
Currently not much testing is present.
2019-01-10 10:17:24 +01:00
Zaher Salman d1cf374354 Merged master into beta-NMR 2018-12-18 10:01:28 +01:00
Zaher Salman 91e2eca915 Merged muonspin/musrfit:root6 into master 2018-12-18 10:00:45 +01:00
suter_a 1831b8bf3e Add Default Search Paths via musredit preferences if previously no search paths were present
So far it was not possible to add Default Search Paths to musrfit via musredit if somebody delete all the predefined search paths. This bug is now fixed.
2018-12-17 17:30:58 +01:00
Zaher Salman e0eaa3efb5 Merged muonspin/musrfit:root6 into master 2018-12-12 17:26:44 +01:00
suter_a c6766864d9 AddT0 offset bug
Up to now there has been an addT0 offset bug which resulted to the following situation.
Since the offset was wrong by '1', for the first addt0 the t0 of the file was used
instead of the one given in the msr-file. If these t0's are substantially different, the
adding of the runs was quite off, resulting in strong distortions at very early times.
Pant Amba Datt pointed towards this bug which is fixed now.
2018-12-11 13:59:58 +01:00
Zaher Salman 8a7e96a8f7 Merged muonspin/musrfit:root6 into master 2018-11-30 08:51:19 +01:00
suter_a 7361dc6f70 Fourier relative phase: bug fix
The reference phase for real Fourier was accidentely counted twice.
2018-11-29 10:56:37 +01:00
suter_a 2d3ec33aa1 musredit help system if neither QWebEngine nor QWebKit is found.
If neither QWebEngine nor QWebKit is found, do not generate an build
error anymore. Instead just show a default window stating that
the help system is not available due to missing Qt web libs.
2018-11-28 20:14:16 +01:00
Zaher Salman 813bad88ab Merged muonspin/musrfit:root6 into master 2018-11-27 14:32:03 +01:00
suter_a c5c5b16c46 BNMR lib installation problems
Adopted the build system for the BNMR libs such that the generated files are found and can be installed. The BNMR lib mantainers (ZS, JK) are responsible for the functionality though.
2018-11-27 12:25:18 +01:00
Zaher Salman 42bb8a49b7 Merged muonspin/musrfit:root6 into master 2018-11-15 10:08:36 +01:00
suter_a a4cd0b065f updated docu 2018-11-13 08:59:54 +01:00
suter_a ee079fd8ff changed example to reference phase in the Fourier block. 2018-11-13 08:40:38 +01:00
suter_a 71f8f78b63 set reference phase index in the case of a phase vector 2018-11-13 08:39:26 +01:00
suter_a 3c55a72475 allow to define the phase parameter lists in the Fourier block with a reference phase parameter. This means all the other phase parameters are then relative to this reference phase parameter. This is often used when analysing LEM data. 2018-11-12 20:35:10 +01:00
Zaher Salman dc668131e1 Merged muonspin/musrfit:root6 into master 2018-11-05 16:36:56 +01:00
suter_a f3c58afa51 fixed wrong include path in the cmake infrastructure. 2018-11-05 10:16:51 +01:00
Zaher Salman acdfa60870 Merged muonspin/musrfit:root6 into master 2018-10-29 09:21:29 +01:00
suter_a 476e2b49d6 make sure that enough relevant digits of the parameters are exported to the db/dat-file. 2018-10-26 14:26:04 +02:00
Zaher Salman e702049b50 Merged muonspin/musrfit:root6 into master 2018-10-24 16:27:04 +02:00
nemu e34228da08 added missing header. 2018-10-24 11:34:14 +02:00
suter_a 34dd954613 increased the export precision. This is a quick and dirty fix only. 2018-10-23 16:00:54 +02:00
Zaher Salman d05a858e7e Merged muonspin/musrfit:root6 into master 2018-10-16 10:04:36 +02:00
suter_a 6ecd6954ce update of docu 2018-10-16 08:42:49 +02:00
suter_a 49055d447b added new Fourier phase feature to this example. 2018-10-15 17:06:59 +02:00
suter_a 5909d59f32 allow multiple Fourier phase parameters for phase shifted real Fourier. Autophasing still missing. 2018-10-15 16:09:17 +02:00
suter_a 82164a3b57 cleaned up outdated comment. 2018-10-15 16:00:37 +02:00
salman 92d1f0145c Resolve conflict with Andreas' musrfit 2018-10-15 10:25:15 +02:00
salman 8207aea183 Changes to template files 2018-10-15 10:19:02 +02:00
salman 2cd81cf235 More recent working version 2018-10-15 10:16:41 +02:00
suter_a 9c8a227f6a remove accidental previous commit. 2018-10-12 16:30:36 +02:00
suter_a fab31e13c7 added cmake policy for initial math tests. 2018-10-12 16:27:18 +02:00
suter_a 70013be8fc get rid of cmake warnings in connection with automoc and autouic 2018-10-11 12:42:36 +02:00
prokscha e91f8074a6 Added all Mu fractions to print method; added time stamps in root macro. 2018-09-11 17:35:11 +02:00
prokscha 4aa264c17a Added nu_13 and nu_24 for anisotropic Mu 2018-09-11 16:36:20 +02:00
salman 09111b659d Update to last working version. 2018-09-11 10:19:01 +02:00
nemu 2a848ed5f3 make sure that BOOST is found even if installed in any non-standard path. 2018-08-27 15:46:48 +02:00
Zaher Salman e428554f7e Added documentation relevant to beta-NMR asymmetry fits, fittype 5. 2018-08-26 11:33:13 +02:00
Zaher Salman e19289d0c3 Cleanup 2018-08-25 23:51:08 +02:00
Zaher Salman 8c2537efae Estimate alpha for beta-NMR asymmetry calculation from the ratio of B/F counts if no alpha line is given in the run block. 2018-08-25 23:06:57 +02:00
salman f81c6aa2bf Deal with missing alpha line for beta-NMR. 2018-08-24 17:42:23 +02:00
salman b5f5d26e9c Added estimation for the value of alpha from integrated counts. 2018-08-24 14:08:28 +02:00
salman dfea8334b7 Possible fix for alpha problem for beta-NMR asymmetry calculation. To be tested. 2018-08-24 13:03:28 +02:00
Zaher Salman 00d0fb863b Merged muonspin/musrfit:root6 into master 2018-08-24 11:30:03 +02:00
salman ae60581d5d Updated to the last working version. 2018-08-23 17:35:57 +02:00
suter_a 5f6a4c674b update of the docu. Added the beta-NMR docu written by Jonas Krieger. 2018-08-23 12:43:48 +02:00
salman b8dc67fa1a Fix x-axis label bug (reported by Gerland Morris). 2018-08-21 10:32:57 +02:00
Zaher Salman af4040228b Template files for two helicities and subtracted helicities updated. 2018-08-20 22:04:50 +02:00
Zaher Salman fa7e74e560 Remove beta-NMR ascci based templates to avoid confusion. 2018-08-20 20:04:43 +02:00
salman e9ec126d9e Beta-NMR helicity subtraction seems to work in the new class. Still needs debugging and tests. Some of the changes from Jonas were reverted since SExp does not work otherwise. 2018-08-20 17:51:39 +02:00
Zaher Salman 52a5bc25b1 Start substract asymmetry implementation. 2018-08-19 23:40:55 +02:00
Zaher Salman 782451e825 Start substract asymmetry implementation. 2018-08-19 23:37:48 +02:00
Zaher Salman e5c1450fc8 Fixed chisqr calculation bug in BNMR 2018-08-18 23:45:28 +02:00
salman 6c657e2c6b Merge branch 'master' into beta-NMR
The new beta-NMR class is ready and independent from the original
Asymmetry class.
2018-08-18 16:39:32 +02:00
Zaher Salman 4bbc7b4388 Merged muonspin/musrfit:root6 into master 2018-08-18 14:18:06 +02:00
salman ef653c11b2 Resolve conflict from Jonas' commits 2018-08-18 14:17:41 +02:00
suter_a 8ab2687e17 added some more necessary paths. 2018-08-17 20:55:04 +02:00
salman 758f338972 First working duplicate asymmetry class for beta-NMR. 2018-08-17 16:08:04 +02:00
JAK f5bdc75013 Merged in krieger_j/musrfit_jak/libBNMR (pull request #7)
libLineProfile
2018-08-17 13:07:58 +00:00
JAK 97d6a495a1 cmake should now also work on MacOS. 2018-08-17 14:57:36 +02:00
JAK 7d5429b5e3 Removed class MLRes from libBNMR. It wasn`t implemented. 2018-08-17 12:56:01 +02:00
JAK 9c73880b8b Updated docu in LineProfile.pdf. 2018-08-17 11:08:22 +02:00
JAK 12d36cc91b Updated docu in LineProfile.pdf. 2018-08-17 10:56:28 +02:00
JAK c19d1f473a The line shape width is now the correct FWHM. 2018-08-17 10:49:06 +02:00
Zaher Salman b044d97a55 More work towards implementation of beta-NMR asymmetry calculation 2018-08-16 23:17:39 +02:00
suter_a 4b2133bbca Added CMake files for libLineProfile. 2018-08-16 13:09:02 +02:00
Zaher Salman 4e54d9c0b9 First successful compilation of AsymmetryBNMR 2018-08-15 21:35:56 +02:00
Zaher Salman e2a59af6e1 Start branch to develop full featured beta-NMR support 2018-08-15 20:35:06 +02:00
Zaher Salman 3cdf3d356e Optimization and clean up 2018-08-15 20:17:13 +02:00
JAK 5ec5c0be40 Added libLineProfile and integrated it into automake. 2018-08-15 16:35:02 +02:00
Jonas A. Krieger 32f8535926 Speed up of SExpRlx by a factor of ~5 by using static TF1s. Might not be thread save. 2018-08-15 14:51:51 +02:00
Jonas A. Krieger e73ded0078 Cleaned up libBNMR a bit. 2018-08-15 10:38:21 +02:00
Zaher Salman 36e3d28130 Merged muonspin/musrfit:root6 into master 2018-08-07 06:35:34 +02:00
suter_a 52ecd62c90 README edited online with Bitbucket. Proper link to the new documentation. 2018-07-27 18:32:24 +00:00
suter_a b93188495f README.md edited online with Bitbucket. Proper link to the new documentation. 2018-07-27 18:25:13 +00:00
Zaher Salman 379b7c5206 Merged muonspin/musrfit:root6 into master 2018-07-11 15:20:46 +02:00
suter_a 8494ca71db allow the exponent for the temperature evolution for lambda to be set. If not given, the two fluid exponent 4 will be chosen. 2018-07-11 13:39:58 +02:00
Zaher Salman 955b628c23 Merged muonspin/musrfit:root6 into master 2018-07-11 11:51:39 +02:00
suter_a 98051779d5 switched from QTextEdit to QPlainTextEdit for efficiency reasons. Furthermore it allows to limit the block size. 2018-07-10 16:22:46 +02:00
Zaher Salman b56e5adce6 Merged muonspin/musrfit:root6 into master 2018-07-05 13:30:32 +02:00
suter_a 0882d2c854 change labels when toggling between scale and absolute value. 2018-07-04 17:03:10 +02:00
suter_a 86e1544c0e adopted the technical docu, according to the new sphinx user docu. 2018-07-04 12:43:26 +02:00
suter_a 7fa203b350 adopted docu install to the new sphinx docu system. 2018-07-04 07:52:16 +02:00
suter_a 256794e02d switch the docu system from foswiki to sphinx. 2018-07-03 18:50:09 +02:00
suter_a e4d4f82e8c updated MUSR version. 2018-07-03 10:49:01 +02:00
suter_a 568792dc00 added recent files to mupp. 2018-07-03 09:34:48 +02:00
suter_a 294eaa8fb1 make sure that multiple instances of mupp can run simultaneously. 2018-07-02 18:55:02 +02:00
suter_a a3ddd07a9e a more coherent error message handling. 2018-07-02 15:13:49 +02:00
suter_a 07ad8205c8 adopted to the directory tree. 2018-07-02 15:13:08 +02:00
suter_a df98ba5fd2 make sure that all runs have the same number of parameters. 2018-07-01 21:42:00 +02:00
suter_a 55b5788506 added MODULE to root_generate_dictionary in order to get the proper name scheme. 2018-06-28 13:17:43 +02:00
Zaher Salman 7f8e58b28c Merged muonspin/musrfit:root6 into master 2018-06-12 15:48:41 +02:00
suter_a 2d5d7d3d81 cmake: on macOS absorb mupp_plot into the mupp.app bundle. 2018-06-12 13:58:18 +02:00
suter_a 7f82ecb9e7 cmake: remove HAVE_FORK since it leads to performance issuses with the cuba lib. 2018-06-12 11:25:23 +02:00
suter_a 6103a293dc cmake fixed a destination bug on macOS. 2018-06-11 14:55:51 +02:00
suter_a c2353fab7d added mupp. Currently only build with cmake. 2018-06-11 11:23:40 +02:00
suter_a d832676494 adopted to macOS. 2018-06-10 16:13:08 +02:00
suter_a f07667ef25 added mupp actions to musredit. 2018-06-10 12:50:09 +02:00
suter_a 89b7eb8faa cmake: add the forgotten OpenMP flags and libs. 2018-06-09 21:13:58 +02:00
suter_a 104d18c333 cmake: make sure that gcc built-in functions are found. 2018-06-09 17:32:33 +02:00
Zaher Salman 989cd1fc9d Correct grammer 2018-06-09 13:30:12 +00:00
Zaher Salman 51265b5556 README edited online with Bitbucket 2018-06-09 08:24:34 +00:00
Zaher Salman 0593f7c150 Merged muonspin/musrfit:root6 into master 2018-06-09 10:18:16 +02:00
Zaher Salman d9049c73ba Cosmetics 2018-05-22 13:42:04 +00:00
Zaher Salman 831b66c9d4 Add web app 2018-05-22 13:38:29 +00:00
Zaher Salman 8cdb86245c Merged muonspin/musrfit/root6 into master 2018-04-05 13:58:18 +02:00
salman c7d28a599b Correction due to merge. 2018-04-04 09:55:14 +02:00
salman 02b05825b2 Fix merge conflic manually 2018-03-27 22:51:09 +02:00
salman beab905ecd Added Bessel functions. 2018-02-16 08:52:14 +01:00
salman 9eb908c795 Fixed some bugs in FUNCTIONS etc. 2018-02-14 23:20:14 +01:00
salman c62e4c1df6 Export using msr2data when appropriate 2018-02-12 15:42:46 +01:00
salman 4a16cbe5d3 Implemented dynamic number of multiple components and sharing 2018-02-12 13:54:11 +01:00
salman e4580072ff Moving on to variable number of components 2018-02-11 15:49:03 +01:00
salman ff681b99f5 Small rearrangement of GUI. 2018-02-11 15:44:06 +01:00
salman a965a171f7 Use msr2data for single histogram fits 2018-02-06 17:41:48 +01:00
salman 4b1301f494 Partial implementation of global fit option using msr2data. 2018-02-06 08:52:05 +01:00
salman c02df73149 Implemented run list following msr2data notations with hyphens and colons. Started implementation of global fits using msr2data. 2018-01-29 15:23:13 +01:00
Zaher Salman 4695ac799a Merged muonspin/musrfit/root6 into master 2018-01-24 12:32:43 +01:00
salman 34ef2ea926 Fixed a bug in the calculation of SExpRlx for beta-NMR (reported by Gerald Morris)/ 2018-01-19 11:32:20 +01:00
salman 1586df2704 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2018-01-18 14:00:05 +01:00
Zaher Salman c9bceb7527 Merged muonspin/musrfit/root6 into master 2017-12-06 16:08:26 +01:00
Zaher Salman 56e88d329e Merged muonspin/musrfit/root6 into master 2017-11-28 12:28:07 +01:00
Zaher Salman e9dba34688 Merged muonspin/musrfit/root6 into master 2017-11-18 10:14:18 +01:00
Zaher Salman 8301c88478 Merged muonspin/musrfit/root6 into master 2017-11-14 15:38:40 +01:00
Zaher Salman 1821ecfbc0 Merged muonspin/musrfit/root6 into master 2017-11-03 12:49:32 +01:00
Zaher Salman 04e3e8eb37 Merged muonspin/musrfit/root6 into master 2017-10-10 12:28:13 +02:00
salman 96d15f027a Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-09-20 14:26:09 +02:00
Zaher Salman aa4dec86ef Merged muonspin/musrfit/root6 into master 2017-09-06 16:26:41 +02:00
Zaher Salman 3782f6e247 Merged muonspin/musrfit/root6 into master 2017-09-06 09:16:16 +02:00
Zaher Salman ae7822a21e Merged muonspin/musrfit/root6 into master 2017-09-05 15:28:26 +02:00
Zaher Salman bf593a9ee8 Merged muonspin/musrfit/root6 into master 2017-09-04 11:41:04 +02:00
salman 66324638ea Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-08-15 15:40:42 +02:00
Zaher Salman dfa33303d1 Merged muonspin/musrfit/root6 into master 2017-06-08 11:01:27 +02:00
salman a1c4c4cc02 Minor error corrections in messages 2017-06-01 13:04:19 +02:00
salman a9df2d3a5a Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-06-01 12:46:15 +02:00
Zaher Salman 852f9eafe6 README.md edited online with Bitbucket 2017-05-23 12:55:14 +00:00
Zaher Salman 7a87bb1141 README.md edited online with Bitbucket 2017-05-23 12:54:31 +00:00
Zaher Salman 2e30a58af4 Merged muonspin/musrfit/root6 into master 2017-05-23 14:42:44 +02:00
salman 0c3cc452d2 Cleanup 2017-03-23 21:53:45 +01:00
salman 4a9b767f7f Complete porting og MuSRFit GUI to qt4 2017-03-23 17:00:28 +01:00
salman 2460f845b1 More progress in porting MuSRFit to qt4. 2017-03-22 23:07:42 +01:00
salman aaeef7b685 Porting MuSRFit to qt4, work in progress... 2017-03-20 17:04:23 +01:00
Zaher Salman c63f9e0ce1 Merged muonspin/musrfit/root6 into master 2017-02-15 11:01:44 +01:00
Zaher Salman 4f12de989c Merged muonspin/musrfit/root6 into master 2017-02-13 10:18:09 +01:00
Zaher Salman effc6095a5 Merged muonspin/musrfit/root6 into master 2017-02-08 15:17:56 +01:00
Zaher Salman ddfb845755 Merged muonspin/musrfit/root6 into master 2017-02-06 13:52:26 +01:00
Zaher Salman 3141548262 Merged muonspin/musrfit/root6 into master 2017-01-19 09:22:28 +01:00
Zaher Salman 149f9184f7 Merged muonspin/musrfit into master 2017-01-03 13:48:55 +01:00
Zaher Salman 65e73041fa Merged muonspin/musrfit into master 2016-12-19 17:15:13 +01:00
salman c8e1a294aa Manual conflicting commits from Andreas 2016-12-19 17:15:01 +01:00
salman 38348ffa05 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2016-12-14 13:52:44 +01:00
salman a4e6d111ee Address issue Issue #4 regarding old run on pta instead of tdc. 2016-12-14 13:51:32 +01:00
Zaher Salman c5d519c4ac Merged muonspin/musrfit into master 2016-11-22 10:55:28 +01:00
Zaher Salman 5f8d2f9b2d Merged muonspin/musrfit into master 2016-11-08 11:36:45 +01:00
Zaher Salman f412247bfe Merged muonspin/musrfit into master 2016-11-03 09:36:22 +01:00
Zaher Salman 709f482120 Merged muonspin/musrfit into master 2016-08-29 13:27:41 +02:00
Zaher Salman fa95622be2 Merged muonspin/musrfit into master 2016-08-22 16:15:08 +02:00
Zaher Salman c1cda51474 Merged muonspin/musrfit into master 2016-08-18 14:54:11 +02:00
Zaher Salman e207612ab4 Merged muonspin/musrfit into master 2016-08-11 12:35:49 +02:00
Zaher Salman a64d0abccd Merged muonspin/musrfit into master 2016-08-09 14:18:54 +02:00
Zaher Salman 737f3dfaa4 Merged muonspin/musrfit into master 2016-08-04 15:52:10 +02:00
Zaher Salman 9fbf837631 Merged muonspin/musrfit into master 2016-06-22 11:18:23 +02:00
Zaher Salman 45fe398659 Merged muonspin/musrfit into master 2016-05-09 09:07:27 +02:00
Zaher Salman 5a9ad3d799 Merged muonspin/musrfit into master 2016-05-06 09:07:52 +02:00
Zaher Salman c9ddde8ea1 Merged muonspin/musrfit into master 2016-05-03 12:39:29 +02:00
Zaher Salman c6f65d95e3 Merged muonspin/musrfit into master 2016-04-29 10:26:44 +02:00
Zaher Salman 4cd62c4b5b Merged muonspin/musrfit into master 2016-04-28 11:38:22 +02:00
Zaher Salman 314f91282a Merged muonspin/musrfit into master 2016-04-26 15:45:43 +02:00
Zaher Salman 3b08cad70b Merged muonspin/musrfit into master 2016-04-25 09:19:01 +02:00
Zaher Salman 5ae40cacb6 Merged muonspin/musrfit into master 2016-04-12 08:52:52 +02:00
Zaher Salman 85fcc0a050 Merged muonspin/musrfit into master 2016-03-30 12:50:04 +02:00
Zaher Salman bc9132db3c Merged muonspin/musrfit into master 2016-03-16 10:06:16 +01:00
Zaher Salman 888c277b8c Merged muonspin/musrfit into master 2016-03-02 11:49:24 +01:00
Zaher Salman 5cbe1be73f Merged muonspin/musrfit into master 2016-02-24 11:06:27 +01:00
Zaher Salman 54ec7e204f Merged muonspin/musrfit into master 2016-02-22 10:23:13 +01:00
salman dd3f9b1792 Changed msr template file. 2016-02-22 10:23:47 +01:00
salman 76325ed1e7 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2016-01-29 10:05:05 +01:00
salman a66917e9a7 Commited changes from Andreas manually. 2016-01-29 10:03:35 +01:00
Zaher Salman 31aa325a3c Merged muonspin/musrfit into master 2016-01-25 08:50:07 +01:00
salman 51b08ccc58 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2016-01-22 17:32:38 +01:00
salman 3e9bfbc5be Merge remote-tracking branch 'remotes/muonspin/musrfit/master' 2016-01-22 17:31:27 +01:00
Zaher Salman 835536b6cb Merged muonspin/musrfit into master 2015-11-23 10:05:13 +01:00
salman e5f98215e9 Converge musrfit.cgi and MuSRFit. 2015-11-17 15:40:44 +01:00
salman a0d8e76ff0 Use MUSR-ROOT format as default for LEM instead of ROOT-NPP 2015-11-17 15:03:01 +01:00
Zaher Salman 5e85262915 Merged muonspin/musrfit into master 2015-11-16 09:44:41 +01:00
Zaher Salman 7bd5fdc7c7 Merged muonspin/musrfit into master 2015-11-11 14:38:45 +01:00
Zaher Salman ce300fe7a4 Merged muonspin/musrfit into master 2015-11-02 12:41:04 +01:00
Zaher Salman 4ccacfacb9 Merged muonspin/musrfit into master 2015-09-24 17:40:18 +02:00
Zaher Salman 4cc7026dd3 Merged muonspin/musrfit into master 2015-09-22 16:38:27 +02:00
Zaher Salman dcc4c88ee2 Merged muonspin/musrfit into master 2015-09-21 15:45:24 +02:00
Zaher Salman e9226158c3 Merged muonspin/musrfit into master 2015-09-17 16:35:17 +02:00
Zaher Salman ce0b3370fa Merged muonspin/musrfit into master 2015-09-14 14:22:34 +02:00
Zaher Salman dcc01c4be1 Merged muonspin/musrfit into master 2015-09-08 17:25:24 +02:00
Zaher Salman 4df380370b Merged muonspin/musrfit into master 2015-09-08 09:33:54 +02:00
Zaher Salman 8e122c74a8 Merged muonspin/musrfit into master 2015-09-07 15:46:42 +02:00
Zaher Salman f29916dde1 Merged muonspin/musrfit into master 2015-08-17 11:42:17 +02:00
Zaher Salman c7bdf8636d Merged muonspin/musrfit into master 2015-07-01 16:02:30 +02:00
Zaher Salman 84a70e6076 Merged muonspin/musrfit into master 2015-06-25 15:26:14 +02:00
Zaher Salman 0ce4bb7624 Merged muonspin/musrfit into master 2015-05-30 15:34:03 +02:00
Zaher Salman a578c1d5a3 Merged muonspin/musrfit into master 2015-05-20 10:48:57 +02:00
salman 3a34d3b8ed Use seconds time scale for bNMR relaxation data. This is needed to avoid divergence due to large numbers. 2015-04-01 16:14:23 +02:00
salman 4e0da5f4e9 Updated example msr files for libBNMR. 2015-04-01 12:09:45 +02:00
Zaher Salman 48e63ea05e Merged muonspin/musrfit into master 2015-04-01 10:21:06 +02:00
Zaher Salman 8817d3a516 Merged muonspin/musrfit into master 2015-03-16 12:11:31 +01:00
Zaher Salman 7b36edc241 Merged muonspin/musrfit into master 2015-03-02 11:29:27 +01:00
Zaher Salman 2c0c10d455 Merged muonspin/musrfit into master 2015-02-24 14:25:32 +01:00
Zaher Salman 398d8ff1e2 Merged muonspin/musrfit into master 2015-02-23 08:42:41 +01:00
Zaher Salman af7ab0d6b1 Merged muonspin/musrfit into master 2015-02-20 13:47:06 +01:00
Zaher Salman 22ad7b1c59 Sync with muonspin/musrfit 2015-02-20 12:41:07 +01:00
1679 changed files with 216734 additions and 58038 deletions
+45
View File
@@ -0,0 +1,45 @@
name: Build and Deploy Documentation
on:
push:
branches:
- root6
workflow_dispatch:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
container:
image: gitea.psi.ch/images/alpine-jupyterbook
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install system dependencies
run: |
apk add doxygen graphviz
- name: Build musrfit-tech-docu
run: |
cd doc
mkdir technical
doxygen musrfit_dox.cfg
doxygen musredit_qt6_dox.cfg
doxygen mupp_qt6_dox.cfg
doxygen musrStep_qt6_dox.cfg
doxygen musrWiz_qt6_dox.cfg
- name: Configure Git
run: |
git config --global user.name "Gitea Actions"
git config --global user.email "actions@gitea.local"
- name: Push to gitea-pages branch
run: |
git checkout --orphan gitea-pages
git reset --hard
cp -r ./doc/technical/html/* .
git add .
git commit -m "Deploy site"
git push --verbose -f https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git gitea-pages
+2
View File
@@ -0,0 +1,2 @@
# ignore all files generated from an in-repo build
build/
+3 -4
View File
@@ -1,7 +1,5 @@
#---------------------------------------------------------------------
# AUTHORS
# Andreas Suter, 2009/06/21
# $Id: AUTHORS 4013 2009-06-21
#---------------------------------------------------------------------
Andreas Suter <andreas.suter@psi.ch>
@@ -9,8 +7,9 @@ Andreas Suter <andreas.suter@psi.ch>
Bastian M. Wojek
msr2data; initial testing; full initial documentation; BMWlibs;
unified building process on Linux, MacOSX and Windows (Cygwin)
through autotools
Zaher Salman <zaher.salman@psi.ch>
beta-NMR and web-interface
#---------------------------------------------------------------------
# this is the end ...
+273 -95
View File
@@ -1,38 +1,55 @@
# - musrfit
cmake_minimum_required(VERSION 3.6)
# - musrfit
cmake_minimum_required(VERSION 3.17)
project(musrfit VERSION 1.3.0 LANGUAGES C CXX)
# cmake: use BoostConfig.cmake instead of FindBoost
if (CMAKE_VERSION GREATER_EQUAL "3.3")
cmake_policy(SET CMP0167 NEW)
endif ()
project(musrfit VERSION 1.10.0 LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Object code libraries")
include(GNUInstallDirs)
#--- musrfit specific options -------------------------------------------------
option(nexus "build optional NeXus support. Needed for ISIS" OFF)
option(ASlibs "build optional ASlibs" OFF)
option(BMWlibs "build optional BMWlibs" OFF)
option(BNMRlibs "build optional beta-NMR libs" OFF)
option(DummyUserFcn "build optional dummy user function" OFF)
option(qt_based_tools "try to install Qt based tools (musredit, musrWiz, musrStep, mupp)" ON)
option(try_OpenMP "try to use OpenMP if available" ON)
# define qt_version with possible values 'auto' or version '3', '4', '5'
# define qt_version with possible values 'auto' or version '3', '4', '5', '6'
set(qt_version AUTO CACHE STRING "provide a specific Qt version to be used.")
set_property(CACHE qt_version PROPERTY STRINGS AUTO 3 4 5)
set_property(CACHE qt_version PROPERTY STRINGS AUTO 3 4 5 6)
#--- set a default build type if none was specified ---------------------------
set(default_build_type "Release")
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
endif ()
#--- perform some checks and generate the config.h ----------------------------
#--- the next two lines are needed that the math functions are found ----------
set(CMAKE_REQUIRED_INCLUDES math.h)
set(CMAKE_REQUIRED_LIBRARIES m)
include(CheckTypeSize)
include(CheckIncludeFiles)
include(CheckFunctionExists)
check_include_files(alloca.h HAVE_ALLOCA_H)
check_include_files("sys/ipc.h;sys/shm.h" HAVE_SHMGET)
check_function_exists(fork HAVE_FORK)
check_include_files(dlfcn.h HAVE_DLFCN_H)
check_function_exists(erf HAVE_ERF)
check_function_exists(getloadavg HAVE_GETLOADAVG)
@@ -59,95 +76,115 @@ endif (${LONG_DOUBLE} GREATER ${DOUBLE})
#--- add path to my own find modules and other stuff
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
#--- check for pkg-config -----------------------------------------------------
find_package(PkgConfig REQUIRED)
#--- check for git ------------------------------------------------------------
find_package(Git REQUIRED)
#--- check for ROOT -----------------------------------------------------------
find_package(ROOT 6.06 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
find_package(ROOT 6.18 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
if (ROOT_mathmore_FOUND)
execute_process(COMMAND root-config --bindir OUTPUT_VARIABLE ROOT_BINDIR)
string(STRIP ${ROOT_BINDIR} ROOT_BINDIR)
execute_process(COMMAND root-config --version OUTPUT_VARIABLE ROOT_VERSION)
string(STRIP ${ROOT_VERSION} ROOT_VERSION)
message("-- Found ROOT: ${ROOT_BINDIR} (found version: ${ROOT_VERSION})")
#---Define useful ROOT functions and macros (e.g. ROOT_GENERATE_DICTIONARY)
include(${ROOT_USE_FILE})
endif (ROOT_mathmore_FOUND)
#--- the next check is need to set a flag, since root 6.24 (minuit2) breaks
#--- the backwards compatibility. ---------------------------------------------
if (ROOT_VERSION VERSION_LESS "6.23")
set(ROOT_GRTEQ_24 0)
else ()
set(ROOT_GRTEQ_24 1)
endif ()
set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")
#--- check for boost ----------------------------------------------------------
find_package(Boost REQUIRED)
find_package(Boost QUIET)
if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
find_package(Boost REQUIRED COMPONENTS filesystem)
set(BOOST_LINK_LIBS Boost::filesystem)
else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
find_package(Boost REQUIRED COMPONENTS system filesystem)
set(BOOST_LINK_LIBS Boost::filesystem Boost::system)
endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
message(STATUS "Boost libs: ${Boost_LIBRARIES}")
#--- check for gsl ------------------------------------------------------------
find_package(GSL REQUIRED)
#--- check for fftw3 ----------------------------------------------------------
find_package(FFTW3 REQUIRED)
if (FFTW3_THREAD_FOUND)
set(HAVE_LIBFFTW3_THREADS 1 CACHE INTERNAL "fftw3_threads are available")
endif (FFTW3_THREAD_FOUND)
if (FFTW3F_THREAD_FOUND)
set(HAVE_LIBFFTW3F_THREADS 1 CACHE INTERNAL "fftw3f_threads are available")
endif (FFTW3F_THREAD_FOUND)
#--- check for libxml2 --------------------------------------------------------
find_package(LibXml2 REQUIRED)
#--- check for OpenMP ---------------------------------------------------------
if (try_OpenMP AND NOT APPLE)
if (try_OpenMP)
find_package(OpenMP)
if (OpenMP_FOUND)
add_definitions(-DHAVE_GOMP)
if (OpenMP_CXX_FOUND)
add_compile_definitions(HAVE_GOMP)
set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
endif (OpenMP_FOUND)
endif (try_OpenMP AND NOT APPLE)
endif (OpenMP_CXX_FOUND)
endif (try_OpenMP)
#--- check for Qt -------------------------------------------------------------
if (qt_based_tools)
# check for any Qt, i.e. AUTO
if (qt_version STREQUAL AUTO)
# first try Qt5
# Find the QtCore library
find_package(Qt5Core)
if (Qt5Core_FOUND)
# Find the QtWidgets library
find_package(Qt5Widgets CONFIG REQUIRED)
# Find the QtXml library
find_package(Qt5Xml CONFIG REQUIRED)
# Find the QtNetwork library
find_package(Qt5Network CONFIG REQUIRED)
# Find the QtSvg library
find_package(Qt5Svg CONFIG REQUIRED)
# Fing the QtPrintSupport
find_package(Qt5PrintSupport CONFIG REQUIRED)
endif (Qt5Core_FOUND)
# try Qt6
find_package(Qt6Core QUIET)
if (Qt6Core_FOUND)
find_package(Qt6Widgets CONFIG REQUIRED)
find_package(Qt6Xml CONFIG REQUIRED)
find_package(Qt6Network CONFIG REQUIRED)
find_package(Qt6Svg CONFIG REQUIRED)
find_package(Qt6PrintSupport CONFIG REQUIRED)
endif (Qt6Core_FOUND)
# try Qt5
if (NOT Qt6Core_FOUND)
find_package(Qt5Core QUIET)
if (Qt5Core_FOUND)
find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5Xml CONFIG REQUIRED)
find_package(Qt5Network CONFIG REQUIRED)
find_package(Qt5Svg CONFIG REQUIRED)
find_package(Qt5PrintSupport CONFIG REQUIRED)
endif (Qt5Core_FOUND)
endif (NOT Qt6Core_FOUND)
# if Qt5 is not found, try Qt4
if (NOT Qt5Core_FOUND)
# if Qt6 and Qt5 is not found, try Qt4
if (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND)
find_package(Qt4 COMPONENTS QtGui QtWebKit QtXml)
endif (NOT Qt5Core_FOUND)
endif (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND)
# if Qt5 and Qt4 is not found try Qt3. Hopefully you never reach this point
if (NOT Qt5Core_FOUND)
if (NOT Qt4_FOUND)
find_package(Qt3)
endif (NOT Qt4_FOUND)
endif (NOT Qt5Core_FOUND)
# if Qt6, Qt5 and Qt4 is not found try Qt3. Hopefully you never reach this point
if (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND AND Qt4_FOUND)
find_package(Qt3)
endif (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND AND Qt4_FOUND)
endif (qt_version STREQUAL AUTO)
# check specifically for Qt5
# check specifically for Qt6
if (qt_version STREQUAL 6)
find_package(Qt6Core)
if (Qt6Core_FOUND)
find_package(Qt6Widgets CONFIG REQUIRED)
find_package(Qt6Xml CONFIG REQUIRED)
find_package(Qt6Network CONFIG REQUIRED)
find_package(Qt6Svg CONFIG REQUIRED)
find_package(Qt6PrintSupport CONFIG REQUIRED)
else (Qt6Core_FOUND)
message(FATAL_ERROR "Couldn't find the specifically requested Qt6 version.")
endif (Qt6Core_FOUND)
endif (qt_version STREQUAL 6)
# check specifically for Qt5
if (qt_version STREQUAL 5)
# Find the QtCore library
find_package(Qt5Core)
if (Qt5Core_FOUND)
# Find the QtWidgets library
find_package(Qt5Widgets CONFIG REQUIRED)
# Find the QtXml library
find_package(Qt5Xml CONFIG REQUIRED)
# Find the QtNetwork library
find_package(Qt5Network CONFIG REQUIRED)
# Find the QtSvg library
find_package(Qt5Svg CONFIG REQUIRED)
# Fing the QtPrintSupport
find_package(Qt5PrintSupport CONFIG REQUIRED)
else (Qt5Core_FOUND)
message(FATAL_ERROR "Couldn't find the specifically requested Qt5 version.")
@@ -171,13 +208,38 @@ if (qt_based_tools)
endif (qt_version STREQUAL 3)
endif (qt_based_tools)
#--- if NeXus check also for HDF4, HDF5, and MXML -----------------------------
#--- if NeXus check also for HDF4 (optional), HDF5 ----------------------------
if (nexus)
find_package(HDF5 COMPONENTS CXX REQUIRED )
#//as35 - STILL NEEDED?? -> find_package(HDF4 REQUIRED)
find_package(MXML REQUIRED)
find_package(NeXus REQUIRED)
add_definitions(-DPNEXUS_ENABLED)
find_package(HDF5 COMPONENTS CXX REQUIRED)
if (HAVE_HDF4)
#--- check for HDF4 -----------------------------------------------------------
# Find HDF4 manually (pkg-config often doesn't have hdf4)
find_path(HDF4_INCLUDE_DIR
NAMES mfhdf.h
PATH_SUFFIXES hdf
)
find_library(HDF4_DF_LIBRARY
NAMES df libdf
)
find_library(HDF4_MFHDF_LIBRARY
NAMES mfhdf libmfhdf
)
if (HDF4_INCLUDE_DIR AND HDF4_DF_LIBRARY AND HDF4_MFHDF_LIBRARY)
set(HDF4_FOUND TRUE)
set(HDF4_INCLUDE_DIRS ${HDF4_INCLUDE_DIR})
set(HDF4_LIBRARIES ${HDF4_MFHDF_LIBRARY} ${HDF4_DF_LIBRARY})
message(STATUS "Found HDF4: ${HDF4_INCLUDE_DIR}")
message(STATUS " HDF4 libraries: ${HDF4_LIBRARIES}")
else()
message(FATAL_ERROR "HDF4 library not found. Please install libhdf4-dev or hdf-devel")
endif()
add_compile_definitions(HAVE_HDF4)
endif (HAVE_HDF4)
add_compile_definitions(PNEXUS_ENABLED)
endif (nexus)
#--- check for Cuba lib if BMWlibs are enabled --------------------------------
@@ -187,10 +249,65 @@ endif (nexus)
set(HAVE_CONFIG_H 1 CACHE INTERNAL "config.h is available")
configure_file(${CMAKE_SOURCE_DIR}/cmake/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
#--- check if project source is a git repo ------------------------------------
if (EXISTS "${CMAKE_SOURCE_DIR}/.git/HEAD")
message(STATUS "is a git repo")
set(IS_GIT_REPO 1)
else ()
message(STATUS "is NOT a git repo")
set(IS_GIT_REPO 0)
endif ()
#--- start create git-revision.h ----------------------------------------------
if (IS_GIT_REPO)
add_custom_target(git_revision ALL
COMMAND sh ${CMAKE_SOURCE_DIR}/src/git_revision.sh ${CMAKE_BINARY_DIR}/src
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Checking git revision"
)
set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
else (IS_GIT_REPO)
set(HAVE_GIT_REV_H "")
endif (IS_GIT_REPO)
#--- end create git-revision.h ------------------------------------------------
#--- rpath related things -----------------------------------------------------
# use, i.e. don't skip the full RPATH for the build tree
set(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already
# (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# the RPATH to be used when installing, but only if it's not a system directory
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
endif("${isSystemDir}" STREQUAL "-1")
if (UNIX)
set(rpath ${CMAKE_INSTALL_RPATH})
string(APPEND rpath ";/usr/local/lib")
set(CMAKE_INSTALL_RPATH "${rpath}")
endif ()
#--- propagate to the sub-directories -----------------------------------------
add_subdirectory(src)
#--- write summary of the installation
#--- testing ------------------------------------------------------------------
enable_testing()
add_subdirectory(tests)
#--- write summary of the installation
cmake_host_system_information(RESULT PROCESSOR QUERY PROCESSOR_DESCRIPTION)
message("")
message("|-----------------------------------------------------------------------|")
message("| |")
@@ -198,8 +315,12 @@ message("| Summary
message("| |")
message("|-----------------------------------------------------------------------|")
message("")
message(" System: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
message(" -------")
message(" System: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
message(" Processor: ${PROCESSOR} (${CMAKE_SYSTEM_PROCESSOR})")
message(" ----------")
message("")
message(" musrfit Version: ${musrfit_VERSION}")
message(" ----------------")
message("")
message(" Build Type: ${CMAKE_BUILD_TYPE}")
message(" -----------")
@@ -207,14 +328,14 @@ message("")
message(" Requirements:")
message(" -------------")
message("")
message(" FFTW3 found in ${FFTW3_INCLUDE_DIR}")
message(" GSL found in ${GSL_INCLUDE_DIRS}")
message(" BOOST found in ${Boost_INCLUDE_DIRS}")
message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}")
message(" ROOT found in ${ROOT_INCLUDE_DIRS}")
message(" FFTW3 found in ${FFTW3_INCLUDE}, Version: ${FFTW_VERSION}")
message(" GSL found in ${GSL_INCLUDE_DIRS}, Version: ${GSL_VERSION}")
message(" BOOST found in ${Boost_INCLUDE_DIRS}, Version: ${Boost_VERSION}")
message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}, Version: ${LIBXML2_VERSION_STRING}")
message(" ROOT found in ${ROOT_INCLUDE_DIRS}, Version: ${ROOT_VERSION}")
if (OpenMP_FOUND)
if (OpenMP_CXX_VERSION)
message(" OpenMP found (version ${OpenMP_CXX_VERSION})")
message(" OpenMP found Version: ${OpenMP_CXX_VERSION}")
else (OpenMP_CXX_VERSION)
message(" OpenMP found")
endif (OpenMP_CXX_VERSION)
@@ -222,24 +343,31 @@ endif (OpenMP_FOUND)
if (nexus)
message("")
#//as35 message(" HDF4 found in ${HDF4_INCLUDE_DIRS}")
message(" HDF5 found in ${HDF5_INCLUDE_DIRS}")
message(" NeXus found in ${NEXUS_INCLUDE_DIR}")
if (HAVE_HDF4)
message(" HDF4 found in ${HDF4_INCLUDE_DIRS}")
else (HAVE_HDF4)
message(" HDF4 not present.")
endif (HAVE_HDF4)
message(" HDF5 found in ${HDF5_INCLUDE_DIRS}, Version: ${HDF5_VERSION}")
endif (nexus)
message("")
if (qt_based_tools)
if (Qt5Core_FOUND)
message(" Qt found in ${Qt5Core_INCLUDE_DIRS} (Version: ${Qt5Core_VERSION})")
else (Qt5Core_FOUND)
if (Qt4_FOUND)
message(" Qt found (Version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})")
else (Qt4_FOUND)
if (QT_FOUND)
message(" Qt found (Version: ${QT_VERSION})")
endif (QT_FOUND)
endif (Qt4_FOUND)
endif (Qt5Core_FOUND)
if (Qt6Core_FOUND)
message(" Qt found in ${Qt6Core_INCLUDE_DIRS}, Version: ${Qt6Core_VERSION}")
else (Qt6Core_FOUND)
if (Qt5Core_FOUND)
message(" Qt found in ${Qt5Core_INCLUDE_DIRS}, Version: ${Qt5Core_VERSION}")
else (Qt5Core_FOUND)
if (Qt4_FOUND)
message(" Qt found Version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
else (Qt4_FOUND)
if (QT_FOUND)
message(" Qt found Version: ${QT_VERSION}")
endif (QT_FOUND)
endif (Qt4_FOUND)
endif (Qt5Core_FOUND)
endif (Qt6Core_FOUND)
endif (qt_based_tools)
message("")
message(" Features:")
@@ -275,27 +403,32 @@ if (BNMRlibs)
else (BNMRlibs)
message(" BNMRlibs : no")
endif (BNMRlibs)
if (DummyUserFcn)
message(" PDummyUserFcn : yes")
endif (DummyUserFcn)
if (qt_based_tools)
if (Qt5Core_FOUND)
if (Qt6Core_FOUND)
message("")
message(" Qt6 based tools:")
message(" musredit, musrStep, musrWiz, mupp : yes")
elseif (Qt5Core_FOUND)
message("")
message(" Qt5 based tools:")
message(" musredit, musrStep, musrWiz, mupp : yes")
endif (Qt5Core_FOUND)
if (Qt4_FOUND)
elseif (Qt4_FOUND)
message("")
message(" Qt4 based tools (deprecated):")
message(" musredit : yes")
endif (Qt4_FOUND)
if (QT_FOUND)
else ()
message("")
message(" Qt3 based tools (outdated):")
message(" musrgui : yes")
endif (QT_FOUND)
if (NOT Qt5Core_FOUND AND NOT Qt4_FOUND AND NOT QT_FOUND)
endif ()
if (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND AND NOT Qt4_FOUND AND NOT QT_FOUND)
message("")
message(" NO Qt based tools will be installed since Qt is not found or not installed on the system")
endif (NOT Qt5Core_FOUND AND NOT Qt4_FOUND AND NOT QT_FOUND)
endif (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND AND NOT Qt4_FOUND AND NOT QT_FOUND)
else (qt_based_tools)
message("")
message(" Qt based tools (musredit, musrStep, musrWiz, mupp) have been disabled")
@@ -311,4 +444,49 @@ message("")
message("-------------------------------------------------------------------------")
message("")
#--- generate and install cmake package config files --------------------------
include(CMakePackageConfigHelpers)
configure_package_config_file(
${CMAKE_SOURCE_DIR}/cmake/musrfitConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/musrfitConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
)
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/musrfitConfigVersion.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion
)
install(
EXPORT musrfitTargets
FILE musrfitTargets.cmake
NAMESPACE musrfit::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/musrfitConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/musrfitConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
)
#--- cpack specific info ......................................................
file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} PROJECT_SOURCE_DIR_NATIVE)
file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} PROJECT_BINARY_DIR_NATIVE)
string(REPLACE "\\" "\\\\" PROJECT_SOURCE_DIR_NATIVE_D ${PROJECT_SOURCE_DIR_NATIVE})
string(REPLACE "\\" "\\\\" PROJECT_BINARY_DIR_NATIVE_D ${PROJECT_BINARY_DIR_NATIVE})
configure_file(${CMAKE_SOURCE_DIR}/cmake/CPackOptions.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CPackOptions.cmake @ONLY)
set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CPackOptions.cmake")
#set (CPACK_GENERATOR TGZ) # not use ZIP on UNIX as problem with symlinks
#set (CPACK_SOURCE_GENERATOR TGZ) # not use ZIP on UNIX as problem with symlinks
if (UNIX)
set (CPACK_GENERATOR ${CPACK_GENERATOR};RPM)
endif ()
# Include of CPack must always be last
include(CPack)
#--- end ----------------------------------------------------------------------
+179 -2
View File
@@ -6,11 +6,188 @@ The ChangeLog will describe feature changes rather than coding detail changes.
For detailed information about changes have a look here:
https://gitlab.psi.ch/nemu/musrfit/activity
https://gitea.psi.ch/LMU/musrfit
or
https://bitbucket.org/muonspin/musrfit/commits/all
https://bitbucket.org/muonspin/musrfit
Release of V1.10.0, 2026/02/21
==============================
ditch the use of the NeXus lib. NeXus files are now directly read via hdf4/5
add deadtime correction of pulsed sources, assuming the relevant parameters are
present in the file.
Release of V1.9.10, 2026/01/16
==============================
function handling lifted from boost/spirit classic/qi to x3
Release of V1.9.9, 2025/06/08
=============================
add THEORY functions for local Gaussian / global Lorentzian, and a simple F-mu-F function.
Release of V1.9.8, 2025/03/24
=============================
add a user interface option to export data from a msr-file view (single- or multiple files).
Release of V1.9.7, 2025/01/18
=============================
allow spaces in RUN block path-filename
Release of V1.9.6, 2024/12/02
=============================
added jump to block feature in musredit.
Release of V1.9.5, 2024/06/24
=============================
yaml export of ALL fit-parameters, as initiated by R.M.L. McFadden.
Release of V1.9.4, 2024/06/08
=============================
enable OpenMP for macOS.
Release of V1.9.3, 2024/04/19
=============================
fix of function string generation from AST.
Release of V1.9.2, 2023/10/25
=============================
switch over to smart pointers wherever possible.
Release of V1.9.1, 2023/05/16
=============================
add option [-c, --count] to dump_header which will dump the number of counts
per detector and the total number of counts. Currently for MusrRoot data format
only. For the other data formats it will be implement asap
Release of V1.9.0, 2023/02/17
=============================
add depth profile user lib:
A.F.A. Simões, et al.
Muon implantation experiments in films: obtaining depth-resolved information
Review of Scientific Instruments. 2020; 91(2): 023906 (7 pp.).
Release of V1.8.2, 2022/12/03
=============================
add feature that mupp_plotter can show/hide lines between the data points.
Release of V1.8.1, 2022/11/07
=============================
adopted to the newer Qt versions.
Release of V1.8.0, 2022/05/22
=============================
new: addRun - allows to add runs and write it to file
refactoring of Class_MuSR_PSI: (i) class variables and methods renamed according to ROOT
rules. (ii) start to modernize to newer c++ standards.
Release of V1.7.6, 2021/10/02
=============================
new: choose number of threads from the commandline for OpenMP.
Release of V1.7.5, 2021/09/22
=============================
make sure that phases stay within +-360 degrees.
Release of V1.7.4, 2021/06/16
=============================
allow in asymmetry fits #forward groups != #backward groups
Release of V1.7.3, 2021/06/01
=============================
making musrfit Apple Silicon M1 ready. Currently there is still an open issue
with NeXus (HDF4 only).
Release of V1.7.2, 2021/04/16
=============================
add a full dummy user function class with a global part. This can be used as
a starting point to develop new polarization functions.
Currently no rge-handling present.
Release of V1.7.1, 2021/04/09
=============================
update of the docu. More version info. Dealing with the upcoming ROOT V6.24.
Release of V1.7.0, 2021/04/30
=============================
Centralize the rge-handling for user functions.
Release of V1.6.5, 2021/01/22
=============================
Add Qt6 version of musredit, mupp, etc.
Release of V1.6.4, 2020/08/29
=============================
Allow to view time spectra and Fourier theory only calculated at the data points
via the option '-1' or '--one_to_one'.
Release of V1.6.3, 2020/07/27
=============================
A single asymmetry plot allows to toggle the color of the theory function line
by the key 't'.
Release of V1.6.2, 2020/06/17
=============================
Functions not only can use parameters and maps but now also meta data from the
data files like, field (B or b), energy (En or en), or temperature (T<x> pr t<x>
where <x> is a number starting from 0, e.g. t0).
Release of V1.6.1, 2020/05/25
=============================
For asymmetry fits: allow alpha, beta in the RUN block to be functions.
Release of V1.6.0, 2020/05/16
=============================
Allow to transform parameter vectors of run collections for mupp.
This allows for instance to calculate the superfluid density directly from the
depolarization rate and plot it.
Release of V1.5.2, 2020/02/03
=============================
Implemented a SECTOR command. It allows to get chisq/maxLH information from
different time sector slots.
Release of V1.5.0, 2019/05/15
=============================
Added beta-NMR support (thanks to Zaher Salman).
Release of V1.4.2, 2019/03/08
=============================
The tool chain support for automake is removed. Only the cmake tool chain is
supported from now one.
Release of V1.2.0, 2017/10/26
=============================
+8 -42
View File
@@ -2,43 +2,9 @@
# INSTALL
#---------------------------------------------------------------------
There are currently 2 wasy to build musrfit:
1) via the automake tool chain (this will phase out until 2019)
2) via the cmake tool chain (this will be the default starting from now)
In the following it is assumed that the system variable ROOTSYS is already
defined and pointing to the place where CERN/ROOT is installed.
#----------------------------------
# Install via automake tool chain
#----------------------------------
To get it build:
sh autogen.sh
./configure --prefix=$ROOTSYS (or where ever musrfit should be installed)
make
make install (as superuser -- maybe)
/sbin/ldconfig (as superuser)
configure comes with a couple of options. For details either execute
./configure --help
or check under http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFitSetup.html
for a more detailed description.
An example with NeXus support and BMWlibs needed would look like this
sh autogen.sh
./configure --enable-NeXus --enable-BMWlibs --prefix=$ROOTSYS
make
make install (as superuser -- maybe)
/sbin/ldconfig (as superuser)
In the optimal case, everything is set up ;-)
#----------------------------------
# Install via cmake tool chain
#----------------------------------
@@ -52,11 +18,10 @@ directory and
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS (or where ever musrfit should be installed)
cmake --build ./ --clean-first
make install (as superuser -- maybe)
cmake --install ./ (as superuser -- maybe)
/sbin/ldconfig (as superuser)
cmake configuration allows a couple of switches. For details check the user
docu under
cmake configuration allows a couple of switches. For details check the documentation at
http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFitSetup.html
@@ -66,18 +31,19 @@ An example with NeXus support and BMWlibs needed would look like this
cd build
cmake ../ -Dnexus=1 -DBMWlibs=1 -DCMAKE_INSTALL_PREFIX=$ROOTSYS
cmake --build ./ --clean-first
make install (as superuser -- maybe)
cmake --install ./ (as superuser -- maybe)
/sbin/ldconfig (as superuser)
In the optimal case, everything is set up ;-)
In the optimal case everything is ready to be used ;-)
#----------------------------------
# Link to the docu
# Link to the documentation
#----------------------------------
More information about the software requirements and the installation can be found at:
More information regarding software requirements and the installation process
can be found here:
http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFitSetup.html
https://lmu.pages.psi.ch/musrfit-docu/setup-standard.html
#---------------------------------------------------------------------
# this is the end ...
-44
View File
@@ -1,44 +0,0 @@
## Process this file with automake to create Makefile.in
SUBDIRS = src
EXTRA_DIST = autogen.sh acinclude.m4
# The following is to install the documentation
# It is a bit lengthy because one cannot simply install whole directories (except copying them recursively -- which also takes the .svn directories...)
DOCDIRS = examples \
examples/data \
examples/ASlibs \
examples/ASlibs/data \
examples/ASlibs/profiles \
examples/BMWlibs \
examples/BMWlibs/data \
examples/BMWlibs/profiles \
html/user \
html/user/MUSR \
html/user/pub/Main/SmiliesPluginPSI \
html/user/pub/Main/WebPreferences \
html/user/pub/MUSR/LibFitPofB \
html/user/pub/MUSR/LibZFRelaxation \
html/user/pub/MUSR/Msr2Data \
html/user/pub/MUSR/MusrFit \
html/user/pub/MUSR/MusrGui \
html/user/pub/MUSR/QuickStart \
html/user/pub/MUSR/TutorialSingleHisto \
html/user/pub/System/DocumentGraphics \
html/user/pub/System/HeadlinesPlugin \
html/user/pub/System/PatternSkin \
html/user/pub/System/PatternSkinTheme2009 \
html/user/pub/System/PsiSkin \
html/user/pub/System/SkinTemplates
#html/technical
install-data-hook:
@$(NORMAL_INSTALL)
for DIR in $(DOCDIRS); do $(MKDIR_P) $(DOCDIR)/$$DIR; $(INSTALL_DATA) doc/$$DIR/*.* $(DOCDIR)/$$DIR; done
$(MKDIR_P) $(DOCDIR)/latex_images
$(INSTALL_DATA) src/musredit/latex_images/*.png $(DOCDIR)/latex_images
uninstall-hook:
@$(NORMAL_UNINSTALL)
rm -rf $(DOCDIR)
+23 -15
View File
@@ -1,35 +1,43 @@
README
------
musrfit - muSR data analysis package
musrfit - muSR and beta-NMR data analysis package
Contents
--------
This is a data analysis package to analyze time differential muSR and beta-NMR data.
Currently it allows the following things:
Currently it allows the following:
* setting up most commonly used fitting functions for muSR and beta-NMR
* fitting data, including global fits
* showing the fit results and the residuals
* showing the Fourier transform of the data
* extracting easily the fitting parameters to be used in other programs (gnuplot, qtiplot/origin, ...)
* allows to generate fitting input files for follow-up runs
* allows to generate global fitting input files based on a single run template
* allows to implement more sophisticated user functions
* set up most commonly used fitting functions for muSR and beta-NMR
* fit data, including global fits
* show the fit results and the residuals
* show the Fourier transform of the data
* easily extract the fit parameters and import in other programs (gnuplot, qtiplot/origin, ...)
* generate input fitting files for follow-up runs
* generate global input fitting files based on a single run template
* implement more sophisticated user functions
(e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
Currently supported platforms:
Currently supported platforms
-----------------------------
* Linux
* Mac OS X
* Windows - not really, only for the very brave ones
* Windows 10 1809 or newer - current state is for the commited ones
* Web based implementation - http://musruser.psi.ch/cgi-bin/musrfit.cgi
Documentation
-------------
For a more exhaustive user documentation see:
http://lmu.web.psi.ch/musrfit/user/MUSR/WebHome.html
https://lmu.pages.psi.ch/musrfit-docu/index.html
Contact
Contacts
<andreas.suter@psi.ch>
<andreas.suter@psi.ch>
For the beta-NMR related parts, please contact
<zaher.salman@psi.ch>
+37 -33
View File
@@ -1,33 +1,37 @@
# musrfit - muSR data analysis package #
### Contents ###
This is a data analysis package to analyze time differential muSR and beta-NMR data.
Currently it allows the following things:
* setting up most commonly used fitting functions for muSR and beta-NMR
* fitting data, including global fits
* showing the fit results and the residuals
* showing the Fourier transform of the data
* extracting easily the fitting parameters to be used in other programs (gnuplot, qtiplot/origin, ...)
* allows to generate fitting input files for follow-up runs
* allows to generate global fitting input files based on a single run template
* allows to implement more sophisticated user functions
(e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
### Currently supported platforms: ###
* Linux
* Mac OS X
* Windows - not really, only for the very brave ones
### Documentation ####
For a more exhaustive user documentation see:
http://lmu.web.psi.ch/musrfit/user/MUSR/WebHome.html
### Contact ###
<andreas.suter@psi.ch>
# musrfit - muSR and beta-NMR data analysis package #
### Contents ###
This is a data analysis package to analyze time differential muSR and beta-NMR data.
Currently it allows the following:
* set up most commonly used fitting functions for muSR and beta-NMR
* fit data, including global fits
* show the fit results and the residuals
* show the Fourier transform of the data
* easily extract the fit parameters and import in other programs (gnuplot, qtiplot/origin, ...)
* generate input fitting files for follow-up runs
* generate global input fitting files based on a single run template
* implement more sophisticated user functions
(e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
### Currently supported platforms: ###
* Linux
* Mac OS X
* Windows 10 1809 or newer - current state is for the commited ones
* Web based implementation - http://musruser.psi.ch/cgi-bin/musrfit.cgi
### Documentation ####
For a more exhaustive user documentation see:
https://lmu.pages.psi.ch/musrfit-docu/index.html
### Contacts ###
<andreas.suter@psi.ch>
For the beta-NMR related parts, please contact Zaher Salman
<zaher.salman@psi.ch>
-128
View File
@@ -1,128 +0,0 @@
dnl -*- mode: autoconf -*-
dnl
dnl $Id: root.m4,v 1.3 2005/03/21 21:42:21 rdm Exp $
dnl $Author: rdm $
dnl $Date: 2005/03/21 21:42:21 $
dnl
dnl Autoconf macro to check for existence or ROOT on the system
dnl Synopsis:
dnl
dnl ROOT_PATH([MINIMUM-VERSION, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
dnl
dnl Some examples:
dnl
dnl ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old))
dnl ROOT_PATH(, AC_DEFINE([HAVE_ROOT]))
dnl
dnl The macro defines the following substitution variables
dnl
dnl ROOTCONF full path to root-config
dnl ROOTEXEC full path to root
dnl ROOTCLING full path to rootcling
dnl ROOTLIBDIR Where the ROOT libraries are
dnl ROOTINCDIR Where the ROOT headers are
dnl ROOTETCDIR Where the ROOT configuration is
dnl ROOTCFLAGS Extra compiler flags
dnl ROOTLIBS ROOT basic libraries
dnl ROOTGLIBS ROOT basic + GUI libraries
dnl ROOTAUXLIBS Auxilary libraries and linker flags for ROOT
dnl ROOTAUXCFLAGS Auxilary compiler flags
dnl ROOTRPATH Same as ROOTLIBDIR
dnl
dnl The macro will fail if root-config and rootcling isn't found.
dnl
dnl Christian Holm Christensen <cholm@nbi.dk>
dnl
AC_DEFUN([ROOT_PATH],
[
AC_ARG_WITH([rootsys],
[AC_HELP_STRING([--with-rootsys],
[top of the ROOT installation directory])],
[user_rootsys=$withval],
[user_rootsys="none"])
if test ! x"$user_rootsys" = xnone; then
rootbin="$user_rootsys/bin"
elif test ! x"$ROOTSYS" = x ; then
rootbin="$ROOTSYS/bin"
else
rootbin=$PATH
fi
AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)
AC_PATH_PROG(ROOTEXEC, root , no, $rootbin)
AC_PATH_PROG(ROOTCLING, rootcling , no, $rootbin)
if test ! x"$ROOTCONF" = "xno" && \
test ! x"$ROOTCLING" = "xno" ; then
# define some variables
ROOTLIBDIR=`$ROOTCONF --libdir`
ROOTINCDIR=`$ROOTCONF --incdir`
ROOTETCDIR=`$ROOTCONF --etcdir`
ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags`
ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs`
ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs`
ROOTAUXCFLAGS=`$ROOTCONF --auxcflags`
ROOTAUXLIBS=`$ROOTCONF --auxlibs`
ROOTRPATH=$ROOTLIBDIR
ROOTVERSION=`$ROOTCONF --version`
ROOTSOVERSION=`dirname $ROOTVERSION`
if test $1 ; then
AC_MSG_CHECKING(whether ROOT version >= [$1])
vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
requ=`echo $1 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
if test $vers -lt $requ ; then
AC_MSG_RESULT(no)
no_root="yes"
else
AC_MSG_RESULT(yes)
fi
fi
else
# otherwise, we say no_root
no_root="yes"
fi
AC_SUBST(ROOTLIBDIR)
AC_SUBST(ROOTINCDIR)
AC_SUBST(ROOTETCDIR)
AC_SUBST(ROOTCFLAGS)
AC_SUBST(ROOTLIBS)
AC_SUBST(ROOTGLIBS)
AC_SUBST(ROOTAUXLIBS)
AC_SUBST(ROOTAUXCFLAGS)
AC_SUBST(ROOTRPATH)
AC_SUBST(ROOTVERSION)
AC_SUBST(ROOTSOVERSION)
if test "x$no_root" = "x" ; then
ifelse([$2], , :, [$2])
else
ifelse([$3], , :, [$3])
fi
])
#
# Macro to check if ROOT has a specific feature:
#
# ROOT_FEATURE(FEATURE,[ACTION_IF_HAVE,[ACTION_IF_NOT]])
#
# For example
#
# ROOT_FEATURE([ldap],[AC_DEFINE([HAVE_ROOT_LDAP])])
#
AC_DEFUN([ROOT_FEATURE],
[
AC_REQUIRE([ROOT_PATH])
feat=$1
res=`$ROOTCONF --has-$feat`
if test "x$res" = "xyes" ; then
ifelse([$2], , :, [$2])
else
ifelse([$3], , :, [$3])
fi
])
#
# EOF
#
-101
View File
@@ -1,101 +0,0 @@
#! /bin/sh
# autogen.sh
#
# Copyright (c) 2009 BMW
# Copyright (c) 2002 Daniel Elstner <daniel.elstner@gmx.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License VERSION 2 as
# published by the Free Software Foundation. You are not allowed to
# use any other version of the license; unless you got the explicit
# permission from the author to do so.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
PATHTOAUTOCONF=$(which autoconf)
PATHTOAUTOMAKE=$(which automake)
PATHTOLIBTOOL=$(which libtoolize)
PATHTOGLIBTOOL=
if [ "$PATHTOLIBTOOL" = "" ]; then
PATHTOGLIBTOOL=$(which glibtoolize)
fi
if [ "$PATHTOAUTOCONF" = "" ]; then
echo
echo ">> GNU autoconf has not been found!"
echo ">> Please install it first and then re-run the script!"
echo
exit 1
elif [ "$PATHTOAUTOMAKE" = "" ]; then
echo
echo ">> GNU automake has not been found!"
echo ">> Please install it first and then re-run the script!"
echo
exit 1
elif [ "$PATHTOLIBTOOL" = "" ] && [ "$PATHTOGLIBTOOL" = "" ]; then
echo
echo ">> GNU libtool has not been found!"
echo ">> Please install it first and then re-run the script!"
echo
exit 1
fi
if [ "$PATHTOLIBTOOL" = "" ]; then
LIBTOOLIZE="glibtoolize"
else
LIBTOOLIZE="libtoolize"
fi
dir=`echo "$0" | sed 's,[^/]*$,,'`
test "x${dir}" = "x" && dir='.'
if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
then
echo "This script must be executed directly from the source directory!"
exit 1
fi
if !(test -d admin); then
mkdir admin
fi
rm -f config.cache
if test -e admin/depcomp && \
test -e admin/install-sh && \
test -e admin/ltmain.sh && \
test -e admin/missing && \
test -e aclocal.m4
then
echo ">> autoreconf" && \
autoreconf && exit 0
else
echo "" && \
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \
echo "+ This script prepares the building environment for the configuration of +" && \
echo "+ musrfit. During this process some informative messages might appear which +" && \
echo "+ can safely be ignored as long as they are not tagged as errors. +" && \
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \
echo "" && \
echo ">> libtoolize" && \
$LIBTOOLIZE --force && \
echo ">> aclocal" && \
aclocal && \
echo ">> autoconf" && \
autoconf && \
echo ">> autoheader" && \
autoheader && \
echo ">> automake" && \
automake --add-missing --gnu && exit 0
fi
exit 1
+43
View File
@@ -0,0 +1,43 @@
# musrfit - cpack
include(CPackComponent)
set (CPACK_PACKAGE_NAME "musrfit-root6")
set (CPACK_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM")
set (CPACK_PACKAGE_DIRECTOR "@CMAKE_CURRENT_BINARY_DIR@/pack")
set (CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
set (CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
set (CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_PATCH@")
set (CPACK_PACKAGE_CONTACT "<andreas.suter@psi.ch>")
set (CPACK_PACKAGE_DESCRIPTION_FILE "@PROJECT_SOURCE_DIR@/README.md")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "musrfit - muSR data analysis package")
set (CPACK_PACKAGE_HOMEPAGE_URL "http://lmu.web.psi.ch/musrfit/user/html/index.html")
set (CPACK_PACKAGE_CHECKSUM "MD5")
set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING")
set (CPACK_RESOURCE_FILE_README "@PROJECT_SOURCE_DIR@/README.md")
set (CPACK_RESOURCE_FILE_WELCOME "@PROJECT_SOURCE_DIR@/cmake/welcome.txt")
set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "@CMAKE_INSTALL_PREFIX@;@CMAKE_INSTALL_PREFIX@/bin;@CMAKE_INSTALL_PREFIX@/include;@CMAKE_INSTALL_PREFIX@/share;@CMAKE_INSTALL_PREFIX@/lib64;@CMAKE_INSTALL_PREFIX@/lib;@CMAKE_INSTALL_PREFIX@/pkgconfig;@CMAKE_INSTALL_PREFIX@/share/applications;@CMAKE_INSTALL_PREFIX@/share/icons;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/48x48;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/48x48/apps")
# we do not have any absolute paths, so do not need DESTDIR
set (CPACK_SET_DESTDIR "OFF")
set (CPACK_PACKAGE_RELOCATABLE "true")
if (${CPACK_GENERATOR} STREQUAL "RPM")
set (CPACK_RPM_PACKAGE_REQUIRES "root >= 6.22.00")
set (CPACK_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set (CPACK_PACKAGING_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set (CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set (CPACK_RPM_PACKAGE_RELEASE "1")
# next variable for RHEL, CentOS, Fedora
set (CPACK_RPM_PACKAGE_RELEASE_DIST "el8")
set (CPACK_RPM_PACKAGE_LICENSE "GPLv2")
set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM")
set (CPACK_RPM_CHANGELOG_FILE "@PROJECT_SOURCE_DIR@/cmake/ChangeLogRPM")
set (CPACK_RPM_POST_INSTALL_SCRIPT_FILE "@PROJECT_SOURCE_DIR@/cmake/post_install.sh")
set (CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "@PROJECT_SOURCE_DIR@/cmake/post_uninstall.sh")
endif ()
if (${CPACK_GENERATOR} STREQUAL "DEB")
# to be populated yet
endif ()
+4
View File
@@ -0,0 +1,4 @@
* Mon Mar 11 2019 Andreas Suter <andreas.suter@psi.ch> - 1.4.2-2
- minor version update
* Mon Jan 14 2019 Andreas Suter <andreas.suter@psi.ch> - 1.4.0-1
- first cpack/cmake version
+148 -81
View File
@@ -1,7 +1,7 @@
# - Find fftw3 library
# Find the native FFTW3 includes and library
# This module defines
# FFTW3_INCLUDE_DIR, where to find fftw3.h, etc.
# FFTW3_INCLUDE, where to find fftw3.h, etc.
# ---
# FFTW3_LIBRARY, library to link against to use FFTW3
# FFTW3_OMP_LIBRARY, library to link against to use FFTW3_omp
@@ -31,16 +31,50 @@
# FFTW3Q_OMP_FOUND, if false, do not try to use OpenMP FFTW3q.
# FFTW3Q_THREADS_FOUND, if false, do not try to use threaded FFTW3q.
find_path(FFTW3_INCLUDE_DIR fftw3.h
HINTS "/usr/include" "/opt/local/include"
)
function(add_imported_library lib_name library headers)
add_library(FFTW3::${lib_name} UNKNOWN IMPORTED)
set_target_properties(FFTW3::${lib_name} PROPERTIES
IMPORTED_LOCATION ${library}
INTERFACE_INCLUDE_DIRECTORIES ${headers}
)
set(${lib_name}_FOUND 1 CACHE INTERNAL "FFTW3 ${lib_name} found" FORCE)
set(${lib_name}_LIBRARY ${library}
CACHE STRING "Path to FFTW3::${lib_name} library" FORCE)
set(FFTW3_INCLUDE ${headers}
CACHE STRING "Path to FFTW3 headers" FORCE)
mark_as_advanced(FORCE ${lib_name}_LIBRARY)
mark_as_advanced(FORCE FFTW3_INCLUDE)
endfunction()
# find position of fftw3.h from the end
string(FIND "${FFTW3_INCLUDE_DIR}" "/fftw3.h" pos REVERSE)
# truncate the string
string(SUBSTRING "${FFTW3_INCLUDE_DIR}" 0 ${pos} substr)
set(FFTW3_INCLUDE_DIR ${substr})
unset(substr)
#as35 if (FFTW3_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3_LIBRARY} ${FFTW3_INCLUDE})
#as35 if (FFTW3_OMP_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3_OMP_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3_THREAD_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3_THRED_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3L_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3L_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3L_OMP_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3L_OMP_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3L_THREAD_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3L_THRED_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3F_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3F_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3F_OMP_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3F_OMP_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3F_THREAD_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3F_THRED_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3Q_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3Q_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3Q_OMP_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3Q_OMP_LIBRARY} ${FFTW3_INCLUDE})
#as35 elseif (FFTW3Q_THREAD_LIBRARY AND FFTW3_INCLUDE)
#as35 add_imported_library(${FFTW3Q_THRED_LIBRARY} ${FFTW3_INCLUDE})
#as35 endif()
#as35 return()
#as35 endif()
find_path(FFTW3_INCLUDE NAMES fftw3.h)
find_library(FFTW3_LIBRARY fftw3)
find_library(FFTW3_OMP_LIBRARY fftw3_omp)
@@ -58,94 +92,127 @@ find_library(FFTW3Q_THREAD_LIBRARY fftw3q_threads)
# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
# FFTW3
find_package_handle_standard_args(FFTW3
REQUIRED_VARS FFTW3_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE
)
if (FFTW3_FOUND)
add_imported_library("FFTW3" "${FFTW3_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3_OMP
find_package_handle_standard_args(FFTW3_OMP
REQUIRED_VARS FFTW3_OMP_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3_OMP_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3_OMP_FOUND)
add_imported_library("FFTW3_OMP" "${FFTW3_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3_THREAD
find_package_handle_standard_args(FFTW3_THREAD
REQUIRED_VARS FFTW3_THREAD_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3_THREAD_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3_THREAD_FOUND)
add_imported_library("FFTW3_THREAD" "${FFTW3_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3L
find_package_handle_standard_args(FFTW3L
REQUIRED_VARS FFTW3L_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3L_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3L_FOUND)
add_imported_library("FFTW3L" "${FFTW3L_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3L_OMP
find_package_handle_standard_args(FFTW3L_OMP
REQUIRED_VARS FFTW3L_OMP_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3L_OMP_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3L_OMP_FOUND)
add_imported_library("FFTW3L_OMP" "${FFTW3L_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3L_THREAD
find_package_handle_standard_args(FFTW3L_THREAD
REQUIRED_VARS FFTW3L_THREAD_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3L_THREAD_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3L_THREAD_FOUND)
add_imported_library("FFTW3L_THREAD" "${FFTW3L_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3F
find_package_handle_standard_args(FFTW3F
REQUIRED_VARS FFTW3F_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3F_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3F_FOUND)
add_imported_library("FFTW3F" "${FFTW3F_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3F_OMP
find_package_handle_standard_args(FFTW3F_OMP
REQUIRED_VARS FFTW3F_OMP_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3F_OMP_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3F_OMP_FOUND)
add_imported_library("FFTW3F_OMP" "${FFTW3F_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3F_THREAD
find_package_handle_standard_args(FFTW3F_THREAD
REQUIRED_VARS FFTW3F_THREAD_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3F_THREAD_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3F_THREAD_FOUND)
add_imported_library("FFTW3F_THREAD" "${FFTW3F_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3Q
find_package_handle_standard_args(FFTW3Q
REQUIRED_VARS FFTW3Q_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3Q_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3Q_FOUND)
add_imported_library("FFTW3Q" "${FFTW3Q_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3Q_OMP
find_package_handle_standard_args(FFTW3Q_OMP
REQUIRED_VARS FFTW3Q_OMP_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
REQUIRED_VARS FFTW3Q_OMP_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3Q_OMP_FOUND)
add_imported_library("FFTW3Q_OMP" "${FFTW3Q_OMP_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
# FFTW3Q_THREAD
find_package_handle_standard_args(FFTW3Q_THREAD
REQUIRED_VARS FFTW3Q_THREAD_LIBRARY FFTW3_INCLUDE_DIR
VERSION_VAR "3")
if (NOT FFTW3_FOUND)
unset(FFTW3_LIBRARY)
endif()
if (NOT FFTW3_OMP_FOUND)
unset(FFTW3_OMP_LIBRARY)
endif()
if (NOT FFTW3_THREAD_FOUND)
unset(FFTW3_THREAD_LIBRARY)
REQUIRED_VARS FFTW3Q_THREAD_LIBRARY FFTW3_INCLUDE
HANDLE_COMPONENTS
NAME_MISMATCHED
)
if (FFTW3Q_THREAD_FOUND)
add_imported_library("FFTW3Q_THREAD" "${FFTW3Q_THREAD_LIBRARY}" "${FFTW3_INCLUDE}")
endif()
if (NOT FFTW3L_FOUND)
unset(FFTW3L_LIBRARY)
endif()
if (NOT FFTW3L_OMP_FOUND)
unset(FFTW3L_OMP_LIBRARY)
endif()
if (NOT FFTW3L_THREAD_FOUND)
unset(FFTW3L_THREAD_LIBRARY)
endif()
if (NOT FFTW3F_FOUND)
unset(FFTW3F_LIBRARY)
endif()
if (NOT FFTW3F_OMP_FOUND)
unset(FFTW3F_OMP_LIBRARY)
endif()
if (NOT FFTW3F_THREAD_FOUND)
unset(FFTW3F_THREAD_LIBRARY)
endif()
if (NOT FFTW3Q_FOUND)
unset(FFTW3Q_LIBRARY)
endif()
if (NOT FFTW3Q_OMP_FOUND)
unset(FFTW3Q_OMP_LIBRARY)
endif()
if (NOT FFTW3Q_THREAD_FOUND)
unset(FFTW3Q_THREAD_LIBRARY)
endif()
mark_as_advanced(
FFTW3_INCLUDE_DIR
FFTW3_LIBRARY FFTW3_OMP_LIBRARY FFTW3_THREAD_LIBRARY
FFTW3L_LIBRARY FFTW3L_OMP_LIBRARY FFTW3L_THREAD_LIBRARY
FFTW3F_LIBRARY FFTW3F_OMP_LIBRARY FFTW3F_THREAD_LIBRARY
FFTW3Q_LIBRARY FFTW3Q_OMP_LIBRARY FFTW3Q_THREAD_LIBRARY
)
pkg_check_modules(FFTW fftw3 QUIET)
if (FFTW3_FOUND)
message("-- Found FFTW3: ${FFTW3_INCLUDE_DIR}")
message("-- Found FFTW3: ${FFTW3_INCLUDE}, Version: ${FFTW_VERSION}")
endif (FFTW3_FOUND)
-34
View File
@@ -1,34 +0,0 @@
# - find MXML
# find the MXML lib and includes
# This module defines
# LIBMXML_INCLUDE_DIR, where to find mxml.h
# LIBMXML_LIBRARY, library to link against
# LIBMXML_FOUND, if false, do not try to use the MXML lib
find_path(LIBMXML_INCLUDE_DIR mxml.h
HINT "/usr/include"
)
# find position of mxml.h from the end
string(FIND "${LIBMXML_INCLUDE_DIR}" "/mxml.h" pos REVERSE)
# truncate the string
string(SUBSTRING "${LIBMXML_INCLUDE_DIR}" 0 ${pos} substr)
set(LIBMXML_INCLUDE_DIR ${substr})
unset(substr)
find_library(LIBMXML_LIBRARY mxml)
# get version string
# currently do not know from where to get it automatically
# handle the QUIETLY and REQUIRED arguments and set LIBMXML_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MXML
REQUIRED_VARS LIBMXML_LIBRARY LIBMXML_INCLUDE_DIR)
if (NOT LIBMXML_FOUND)
unset(LIBMXML_LIBRARY)
endif()
mark_as_advanced(LIBMXML_INCLUDE_DIR LIBMXML_LIBRARY)
-45
View File
@@ -1,45 +0,0 @@
# - Find NeXus library
# Find the native NEXUS includes and library
# This module defines
# NEXUS_INCLUDE_DIR, where to find NeXus.h, etc.
# NEXUS_LIBRARY, library to link against to use NEXUS
# NEXUS_FOUND, if false, do not try to use NEXUS.
find_path(NEXUS_INCLUDE_DIR napi.h
HINTS "/usr/local/include" "/opt/nexus/include" "/usr/local/include/nexus"
)
# find position of napi.h from the end
string(FIND "${NEXUS_INCLUDE_DIR}" "/napi.h" pos REVERSE)
# truncate the string
string(SUBSTRING "${NEXUS_INCLUDE_DIR}" 0 ${pos} substr)
set(NEXUS_INCLUDE_DIR ${substr})
unset(substr)
find_library(NEXUS_LIBRARY NeXus
HINTS "/usr/lib" "/usr/lib64" "/usr/local/lib" "/usr/local/lib64" "/opt/nexus/lib")
# get version string
if (NEXUS_INCLUDE_DIR AND EXISTS ${NEXUS_INCLUDE_DIR}/napi.h)
file(STRINGS "${NEXUS_INCLUDE_DIR}/napi.h" NEXUS_version_str
REGEX "^#define[\t ]+NEXUS_VERSION[\t ].*")
string(REGEX REPLACE "^#define[\t ]+NEXUS_VERSION[\t ]+\"([^\"]*).*"
"\\1" NEXUS_VERSION_STRING "${NEXUS_version_str}")
unset(NEXUS_version_str)
endif()
# handle the QUIETLY and REQUIRED arguments and set NEXUS_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEXUS
REQUIRED_VARS NEXUS_LIBRARY NEXUS_INCLUDE_DIR
VERSION_VAR NEXUS_VERSION_STRING)
if (NOT NEXUS_FOUND)
unset(NEXUS_LIBRARY)
endif()
mark_as_advanced(NEXUS_INCLUDE_DIR NEXUS_LIBRARY)
+4 -2
View File
@@ -1,9 +1,11 @@
// config.h
#define PACKAGE_VERSION "@PROJECT_VERSION@"
#define ROOT_VERSION_USED "@ROOT_VERSION@"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
// define to 1 if you have fork and it should be used
#cmakedefine HAVE_FORK 1
// define to 1 if minor ROOT6 version is >= 24
#define ROOT_GRTEQ_24 @ROOT_GRTEQ_24@
// define to 1 if you have <alloca.h> and it should be used
#cmakedefine HAVE_ALLOCA_H 1
@@ -1,30 +0,0 @@
# configure_musrfit_version_file.cmake.in:
set(SRC_DIR "@CMAKE_SOURCE_DIR@")
set(BIN_DIR "@CMAKE_CURRENT_BINARY_DIR@")
# Set variables
set(CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set(MUSRFIT_VERSION "@MUSRFIT_VERSION@")
# Get the current working branch
execute_process(
COMMAND git rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# Get the latest abbreviated commit hash of the working branch
execute_process(
COMMAND git log -1 --pretty="%h, %ci"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_CURRENT_SHA1
OUTPUT_STRIP_TRAILING_WHITESPACE
)
configure_file(
${SRC_DIR}/cmake/git-revision.h.in
${BIN_DIR}/git-revision.h
@ONLY
)
# EOF
+13
View File
@@ -0,0 +1,13 @@
[Desktop Entry]
Name=MuSRedit
Comment=editor and launcher for the musrfit data analysis
GenericName=musrfit editor
Exec=musredit %F
Icon=musredit
Terminal=false
Type=Application
StartupWMClass=MuSRedit
Categories=Science;DataEditing;
MimeType=text/plain;
Keywords=muSR;fitting;musrfit;physics;muon;
StartupNotify=true
+103
View File
@@ -0,0 +1,103 @@
Name: musrfit-root6
Version: 1.4
Release: 1%{?dist}
Summary: musrfit - muSR data analysis package
License: GPLv2
URL: http://lmu.web.psi.ch/musrfit/user/html/index.html
Source0: https://gitlab.psi.ch/nemu/musrfit/repository/%{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: libtool
BuildRequires: gcc
BuildRequires: make
BuildRequires: hdf-devel hdf5-devel
BuildRequires: mxml-devel
BuildRequires: fftw3-devel
BuildRequires: boost-devel
BuildRequires: gsl-devel
BuildRequires: libxml2-devel
BuildRequires: root
BuildRequires: root-io-xml
BuildRequires: root-mathmore
BuildRequires: root-minuit2
BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel qt5-qtwebkit-devel
BuildRequires: nexus
Requires: hdf hdf5
Requires: mxml
Requires: fftw3
Requires: gsl
Requires: boost-devel
Requires: libxml2
Requires: root
Requires: root-io-xml
Requires: root-mathmore
Requires: root-minuit2
Requires: qt5-qtbase qt5-qtsvg qt5-qtwebkit
Requires: nexus
%description
This is a data analysis package to analyze time differential muSR and beta-NMR data. Currently it allows the following things:
- setting up most commonly used fitting functions for muSR and beta-NMR
- fitting data, including global fits
- showing the fit results and the residuals
- showing the Fourier transform of the data
- extracting easily the fitting parameters to be used in other programs (gnuplot, qtiplot/origin, ...)
- allows to generate fitting input files for follow-up runs
- allows to generate global fitting input files based on a single run template
- allows to implement more sophisticated user functions (e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
Currently supported platforms:
- Linux
- Mac OS X
- Windows - not really, only for the very brave ones
%prep
%setup -q -n %{name}-%{version}
%build
##æs35 ./autogen.sh
# DOCDIR is needed to be set here. BMWlibs still makes troubles
%cmake -DASlibs=1 -DBMWlbis=1 -Dnexus=1 DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/musrfit
%cmake --build ./ --clean-first -- -j8
##æs35 %configure --enable-ASlibs --enable-BMWlibs --enable-NeXus DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/musrfit
##æs35 %make_build
%install
# INSTALL_ROOT is needed for Qt applications
rm -rf $RPM_BUILD_ROOT
%make_install INSTALL_ROOT=%{buildroot}
%files
%_prefix/bin/any2many
%_prefix/bin/dump_header
%_prefix/bin/msr2data
%_prefix/bin/msr2msr
%_prefix/bin/mupp
%_prefix/bin/mupp_plot
%_prefix/bin/musredit
%_prefix/bin/musrfit
%_prefix/bin/musrFT
%_prefix/bin/musrRootValidation
%_prefix/bin/musrStep
%_prefix/bin/musrt0
%_prefix/bin/musrview
%_prefix/bin/musrWiz
%_prefix/bin/write_musrRoot_runHeader
%_prefix/include/*
%_prefix/lib64/*
%license COPYING
%doc %_prefix/share/doc/musrfit
%{_datadir}/applications/musredit.desktop
%{_datadir}/icons/hicolor/48x48/apps/musredit.png
%changelog
* Thu Dec 20 2018 Andreas Suter <andreas.suter@psi.ch> - 1.4-1
- adopted to cmake
* Wed Oct 25 2017 Andreas Suter <andreas.suter@psi.ch> - 1.2-1
- first spec file for musrfit-root6
+15
View File
@@ -0,0 +1,15 @@
# musrfitConfig.cmake.in
# CMake package configuration template for musrfit.
# Generated by configure_package_config_file().
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(ROOT REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
find_dependency(Boost REQUIRED COMPONENTS filesystem)
find_dependency(GSL REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/musrfitTargets.cmake")
check_required_components(musrfit)
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
echo " >> musrfit post install script started ..."
# test if nemu-x86_64.conf does not exist
if [ ! -f "/etc/ld.so.conf.d/nemu-x86_64.conf" ]
then
echo "/usr/local/lib" >> /etc/ld.so.conf.d/nemu-x86_64.conf
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/nemu-x86_64.conf
fi
/sbin/ldconfig
#update .desktop and icons
if command -v update-desktop-database &>/dev/null; then
update-desktop-database -q /usr/share/applications || true
fi
if command -v gtk-update-icon-cache &>/dev/null; then
gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
fi
+13
View File
@@ -0,0 +1,13 @@
#!/bin/bash
echo " >> musrfit post uninstall script started ..."
/sbin/ldconfig
#update .desktop and icons
if command -v update-desktop-database &>/dev/null; then
update-desktop-database -q /usr/share/applications || true
fi
if command -v gtk-update-icon-cache &>/dev/null; then
gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
fi
+1
View File
@@ -0,0 +1 @@
Welcome to the musrfit package
-1474
View File
File diff suppressed because it is too large Load Diff
+5 -4
View File
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
<comment>
$Id: nonlocal_startup.xml 4047 2009-07-02 13:36:18Z nemu $
nonlocal_startup.xml
</comment>
<nonlocal_par>
<fourier_points>262144</fourier_points>
</nonlocal_par>
<trim_sp_part>
<data_path>profiles/Sn_E</data_path>
<trim_sp>
<data_path>./profiles/</data_path>
<rge_fln_pre>Sn_E</rge_fln_pre>
<energy_list>
<energy>1000</energy>
<energy>2000</energy>
@@ -22,5 +23,5 @@
<energy>25000</energy>
<energy>27300</energy>
</energy_list>
</trim_sp_part>
</trim_sp>
</nonlocal>
+17 -15
View File
@@ -4,21 +4,21 @@ FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 one 1 0 none
2 zero 0 0 none
3 Asy 0.2235 -0.0066 0.0072 0 0.33
4 energy 22 0 none
3 Asy 0.2235 -0.0065 0.0072 0 0.33
4 energy 22000 0 none
5 redTemp 0.8683 0 none
6 thickness 5000 0 none
7 ell 12000 0 none
8 xi 94 0 none
9 lambdaL 52.5 -1.4 1.2
9 lambdaL 52.5 -1.3 1.2
10 Bext 47.11 0 none
11 deadLayer 0.00052 -0.00052 6.89563 0 none
11 deadLayer 0.0004 0.0037 none 0 none
12 RateSmear 0.418 -0.015 0.015
13 N0_L 301.61 0.62 none
14 Bkg_L 24.442 0.076 none
13 N0_L 301.6 -1.1 1.2
14 Bkg_L 24.441 -0.092 0.092
15 Phase_L 42.0 -2.2 2.2
16 Alpha_LR 1.0614 -0.0066 0.0064
17 Bkg_R 27.646 -0.090 0.090
16 Alpha_LR 1.0613 -0.0066 0.0064
17 Bkg_R 27.646 -0.089 0.090
18 RelPhase_R 154.4 -1.1 1.1
###############################################################
@@ -37,7 +37,6 @@ RUN data/lem10_his_0825 MUE4 PSI ROOT-NPP (name beamline institute data-file-f
fittype 0 (single histogram fit)
norm 13
backgr.fit 14
lifetimecorrection
map 1 2 0 0 0 0 0 0 0 0
forward 1
data 3289 65000
@@ -49,7 +48,6 @@ RUN data/lem10_his_0825 MUE4 PSI ROOT-NPP (name beamline institute data-file-f
fittype 0 (single histogram fit)
norm fun1
backgr.fit 17
lifetimecorrection
map 16 18 0 0 0 0 0 0 0 0
forward 3
data 3289 65000
@@ -69,23 +67,27 @@ SAVE
###############################################################
PLOT 0 (single histo plot)
lifetimecorrection
runs 1 2
range 0 9 -0.3 0.3
view_packing 500
###############################################################
FOURIER
units Gauss # units either 'Gauss', 'MHz', or 'Mc/s'
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 10
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8.5
#range_for_phase_correction 50.0 70.0
range 0.0 200.0
range 0 200
###############################################################
STATISTIC --- 2014-11-05 12:34:54
maxLH = 415.6, NDF = 358, maxLH/NDF = 1.160933
STATISTIC --- 2021-03-30 15:04:30
maxLH = 415.6, NDF = 358, maxLH/NDF = 1.160942
expected maxLH = 418.1, NDF = 358, expected maxLH/NDF = 1.168011
run block 1: (NDF/red.maxLH/red.maxLH_e) = (177/1.072511/1.087460)
run block 2: (NDF/red.maxLH/red.maxLH_e) = (175/1.290186/1.289528)
@@ -2,23 +2,23 @@ LSCO x=0.195 single
###############################################################
FITPARAMETER
# No Name Value Step Pos_Error Boundaries
1 phase 8.09 0.30 none
2 field 107.08786 0.00052 none
3 lambda 195.5703 0.0029 none 1 none
1 phase 10.34 0.21 none
2 field 112.82363 0.00033 none
3 lambda 170.4570 0.0022 none 1 none
4 xi 4 0 none 0 10
5 asym1 0.1980 0.0011 none 0 0.3
6 rate1 0.7697 0.0063 none
5 asym1 0.19219 -0.00079 0.00079 0 0.3
6 rate1 0.7955 0.0043 none
7 asymBg 0 0 none 0 0.3
8 rateBg 0 0 none 0 none
9 N01 3311.3 1.7 none 0 none
10 bg1 68.70 0.30 none 0 none
11 N02 3577.8 1.7 none 0 none
12 bg2 69.62 0.31 none 0 none
13 relphase 181.63 0.41 none 150 210
9 N01 3313.6 1.2 none 0 none
10 bg1 68.54 0.21 none 0 none
11 N02 3575.9 1.2 none 0 none
12 bg2 69.82 0.22 none 0 none
13 relphase 181.46 0.29 none 150 210
14 zero 0 0 none
15 relasy 1.0325 0.0075 none
15 relasy 1.0365 0.0051 none
16 one 1 0 none
###############################################################
@@ -39,52 +39,51 @@ fun3 = par5 * map2
fun4 = par7 * map2
###############################################################
RUN data/deltat_pta_gps_3093 PIM3 PSI PSI-BIN (name beamline institute data-file-format)
GLOBAL
fittype 0 (single histogram fit)
fit 0 8
packing 30
###############################################################
RUN data/deltat_pta_gps_3093 PIM3 PSI PSI-BIN (name beamline institute data-file-format)
map 14 16 0 0 0 0 0 0 0 0
forward 3
norm 9
lifetimecorrection
backgr.fit 10
t0 125.0
data 128 8001
fit 0 8
packing 30
RUN data/deltat_pta_gps_3093 PIM3 PSI PSI-BIN (name beamline institute data-file-format)
fittype 0 (single histogram fit)
map 13 15 0 0 0 0 0 0 0 0
forward 4
norm 11
lifetimecorrection
backgr.fit 12
t0 124.0
data 127 8000
fit 0 8
packing 30
###############################################################
COMMANDS
MAX_LIKELIHOOD
MINIMIZE
#MIGRAD
HESSE
#MINOS
MINOS
SAVE
###############################################################
FOURIER
units Gauss # units either 'Gauss', 'MHz', or 'Mc/s'
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 9
apodization NONE # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase par1
range 0 500
###############################################################
PLOT 0 (single histo plot)
lifetimecorrection
runs 1 2
range 0 4 -0.25 0.25
###############################################################
STATISTIC --- 2013-05-03 09:08:20
chisq = 1200.8, NDF = 415, chisq/NDF = 2.893391
STATISTIC --- 2021-02-26 14:54:47
maxLH = 1497.5, NDF = 415, maxLH/NDF = 3.608471
@@ -4,19 +4,19 @@ FITPARAMETER
# No Name Value Step Pos_Error Boundaries
1 field 94.717 0 none
2 deadlayer 10.5 0 none
3 lambda 115.96 -0.92 0.88
3 lambda 115.98 -0.65 0.63
# E = 22keV
4 phase22 25.4956 0 none
5 asym22 0.1047 -0.0029 0.0030 0 0.3
6 rate22 0.559 -0.032 0.033
7 NormL22 753.00 -0.86 0.87
8 BGL22 51.08 -0.13 0.13
9 NormR22 545.93 -0.77 0.76
10 BGR22 38.60 -0.11 0.12
11 relasyR22 1.068 -0.038 0.039 0.2 2
12 relphaR22 162.8 -1.5 1.5 110 210
5 asym22 0.1047 -0.0021 0.0021 0 0.3
6 rate22 0.558 -0.023 0.023
7 NormL22 752.98 -0.61 0.61
8 BGL22 51.114 -0.094 0.094
9 NormR22 545.95 -0.54 0.54
10 BGR22 38.634 -0.082 0.082
11 relasyR22 1.068 -0.027 0.027 0.2 2
12 relphaR22 162.8 -1.1 1.1 110 210
13 energy22 22 0 none
14 one 1 0 none
@@ -35,53 +35,48 @@ fun2 = map1 + map5
fun3 = par1 * gamma_mu
###############################################################
RUN data/lem09_his_0916 MUE4 PSI ROOT-NPP (name beamline institute data-file-format)
GLOBAL
fittype 0 (single histogram fit)
norm 7
backgr.fit 8
lifetimecorrection
map 4 5 6 14 15 13 0 0 0 0
forward 1
background 65000 66500
data 3419 63000
t0 3419.0
fit 0.15 10
packing 150
RUN data/lem09_his_0916 MUE4 PSI ROOT-NPP (name beamline institute data-file-format)
fittype 0 (single histogram fit)
norm 9
backgr.fit 10
lifetimecorrection
map 4 5 6 11 12 13 0 0 0 0
forward 3
background 65000 66500
data 3419 63000
t0 3419.0
fit 0.15 10
packing 150
###############################################################
RUN data/lem09_his_0916 MUE4 PSI ROOT-NPP (name beamline institute data-file-format)
norm 7
backgr.fit 8
map 4 5 6 14 15 13 0 0 0 0
forward 1
RUN data/lem09_his_0916 MUE4 PSI ROOT-NPP (name beamline institute data-file-format)
norm 9
backgr.fit 10
map 4 5 6 11 12 13 0 0 0 0
forward 3
###############################################################
COMMANDS
#MAX_LIKELIHOOD
MAX_LIKELIHOOD
MINIMIZE
MINOS
SAVE
###############################################################
FOURIER
units Gauss # units either 'Gauss', 'MHz', or 'Mc/s'
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 10
apodization WEAK # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase par4
range 0 200
###############################################################
PLOT 0 (single histo plot)
runs 1 2
lifetimecorrection
runs 1 2
range 0 4 -0.25 0.25
###############################################################
STATISTIC --- 2013-11-12 10:25:11
chisq = 696.9, NDF = 663, chisq/NDF = 1.051076
STATISTIC --- 2021-02-26 14:50:08
maxLH = 695.5, NDF = 663, maxLH/NDF = 1.049008
@@ -1,21 +1,20 @@
# Run Numbers: 1111
LaAlO3, SLR, 30G, 150K, Bias=23 kV, Ix=0A, Iy=+3A, aligned, beam on=1s
###############################################################
FITPARAMETER
###############################################################
# No Name Value Err Min Max
1 Alpha 1.11587 0.00038 none
2 Asy 0.0570 0.0011 none
1 Alpha 1.11592 0.00035 none
2 Asy 0.05868 0.00091 none 0 0.2
3 T 1 0 none
4 Rlx 1.015 0.023 none
4 Rlx 1.142 0.023 none 0 15000
5 One 1 0 none
6 Bet -1.052 0.027 none
6 FlHel -1.048 0.022 none -2 0
###############################################################
THEORY
###############################################################
asymmetry fun1
userFcn .libs/libBNMR.so ExpRlx 3 4
userFcn libBNMR.so ExpRlx 3 4
###############################################################
FUNCTIONS
@@ -28,12 +27,11 @@ fittype 2 (asymmetry fit)
alpha 1
forward 3
backward 4
data 11 800 11 800
#backgr.fix 0
data 11 910 11 910
background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250
t0 10.0 10.0
map 2 5 0 0 0 0 0 0 0 0
fit 0.5 8
fit 0.2 9
packing 5
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
@@ -41,15 +39,13 @@ fittype 2 (asymmetry fit)
alpha 1
forward 5
backward 6
data 11 800 11 800
#backgr.fix 0
data 11 910 11 910
background 1 9 1 9 # estimated bkg: 11.6250 / 15.6250
t0 10.0 10.0
map 2 6 0 0 0 0 0 0 0 0
fit 0.5 8
fit 0.2 9
packing 5
###############################################################
COMMANDS
MINIMIZE
@@ -68,9 +64,9 @@ FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8
#range FRQMIN FRQMAX
###############################################################
STATISTIC --- 2015-04-14 11:00:19
chisq = 399.5, NDF = 290, chisq/NDF = 1.377736
STATISTIC --- 2019-05-03 17:05:58
chisq = 566.6, NDF = 346, chisq/NDF = 1.637584
+53
View File
@@ -0,0 +1,53 @@
LaAlO3, SLR, 30G, 150K, Bias=23 kV, Ix=0A, Iy=+3A, aligned, beam on=1s
###############################################################
FITPARAMETER
###############################################################
# No Name Value Err Min Max
1 Alpha 1 0 none
2 Asy 0.05992 0.00063 none 0 0.2
3 T 1 0 none
4 Rlx 1.143 0.023 none 0 100
###############################################################
THEORY
###############################################################
asymmetry 2
userFcn libBNMR ExpRlx 3 4
###############################################################
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 5 (beta-NMR fit)
alpha 1
forward 3 5
backward 4 6
data 11 910 11 910
background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250
t0 10.0 10.0 10.0 10.0
map 0 0 0 0 0 0 0 0 0 0
fit 0.2 9
packing 5
###############################################################
COMMANDS
MINIMIZE
HESSE
SAVE
###############################################################
PLOT 5 (beta-NMR asymmetry plot)
runs 1
use_fit_ranges
view_packing 10
###############################################################
FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8
#range FRQMIN FRQMAX
###############################################################
STATISTIC --- 2019-05-03 17:06:29
chisq = 419.1, NDF = 173, chisq/NDF = 2.422357
@@ -0,0 +1,73 @@
LaAlO3, SLR, 30G, 150K, Bias=23 kV, Ix=0A, Iy=+3A, aligned, beam on=1s
###############################################################
FITPARAMETER
###############################################################
# No Name Value Err Min Max
1 Alpha 1.11589 0.00037 none
2 Asy 0.1121 0.0094 none 0 0.2
3 T 1 0 none
4 Rlx 4.12 0.87 none 0 15000
5 Beta 0.434 0.031 none 0.3 2
6 One 1 0 none
7 FlHel -1.048 0.023 none -2 0
###############################################################
THEORY
###############################################################
asymmetry fun1
userFcn libBNMR SExpRlx 3 4 5
###############################################################
FUNCTIONS
###############################################################
fun1 = 0.5 * map1 * map2
###############################################################
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 2 (asymmetry fit)
alpha 1
forward 3
backward 4
data 11 1000 11 1000
background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250
t0 10.0 10.0
map 2 6 0 0 0 0 0 0 0 0
fit 0.2 9
packing 5
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 2 (asymmetry fit)
alpha 1
forward 5
backward 6
data 11 1000 11 1000
background 1 9 1 9 # estimated bkg: 11.6250 / 15.6250
t0 10.0 10.0
map 2 7 0 0 0 0 0 0 0 0
fit 0.2 9
packing 5
###############################################################
COMMANDS
MINIMIZE
HESSE
SAVE
###############################################################
PLOT 2 (asymmetry plot)
runs 1 2
use_fit_ranges
view_packing 10
###############################################################
FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8
#range FRQMIN FRQMAX
###############################################################
STATISTIC --- 2019-05-01 11:29:06
chisq = 358.6, NDF = 345, chisq/NDF = 1.039300
+54
View File
@@ -0,0 +1,54 @@
LaAlO3, SLR, 30G, 150K, Bias=23 kV, Ix=0A, Iy=+3A, aligned, beam on=1s
###############################################################
FITPARAMETER
###############################################################
# No Name Value Err Min Max
1 Alpha 0.9 1.0 none
2 Asy 0.115 0.012 none 0 0.2
3 T 1 0 none
4 Rlx 4.16 0.88 none 0 100
5 Beta 0.433 0.031 none 0.3 2
###############################################################
THEORY
###############################################################
asymmetry 2
userFcn libBNMR SExpRlx 3 4 5
###############################################################
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 5 (beta-NMR fit)
alpha 1
forward 3 5
backward 4 6
data 11 910 11 910
background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250
t0 10.0 10.0 10.0 10.0
map 0 0 0 0 0 0 0 0 0 0
fit 0.2 9
packing 5
###############################################################
COMMANDS
MINIMIZE
HESSE
SAVE
###############################################################
PLOT 5 (beta-NMR asymmetry plot)
runs 1
use_fit_ranges
view_packing 10
###############################################################
FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8
#range FRQMIN FRQMAX
###############################################################
STATISTIC --- 2019-05-03 17:07:01
chisq = 210.2, NDF = 171, chisq/NDF = 1.229344
@@ -0,0 +1,57 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.1531 0.0078 none
2 f2 0.04051 0.00021 none
3 f3 0.00447 0.00054 none
4 x1 39.7 6.4 none
5 x2 103.8 4.8 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3 4 5
###############################################################
RUN data/1300Ar_PECVD_Escan_260K_5G_withDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE AsymCorrected
fit 1 25
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 0 25
###############################################################
STATISTIC --- 2023-02-16 15:19:15
chisq = 28.6, NDF = 10, chisq/NDF = 2.856386
@@ -0,0 +1,57 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.379 -0.014 0.014
2 f2 0.1866 -0.0034 0.0034
3 f3 0.0201 -0.0024 0.0024
4 x1 55.9 1.1 none
5 x2 103.80 0.19 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3 4 5
###############################################################
RUN data/1300Ar_PECVD_Escan_260K_5G_withDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE DiaFrac
fit 1 25
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 0 25
###############################################################
STATISTIC --- 2023-02-16 15:20:11
chisq = 28.3, NDF = 10, chisq/NDF = 2.831612
Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

@@ -0,0 +1,55 @@
DEPTH PARTICLES
5. 1085
15. 2257
25. 2936
35. 3431
45. 3826
55. 4232
65. 4472
75. 4777
85. 4907
95. 5151
105. 5117
115. 5205
125. 5038
135. 4803
145. 4568
155. 4366
165. 3973
175. 3570
185. 3174
195. 2766
205. 2294
215. 1932
225. 1520
235. 1279
245. 950
255. 737
265. 503
275. 374
285. 243
295. 181
305. 126
315. 75
325. 45
335. 27
345. 15
355. 8
365. 2
375. 2
385. 0
395. 0
405. 0
415. 0
425. 0
435. 0
445. 0
455. 0
465. 0
475. 0
485. 0
495. 0
505. 0
515. 0
525. 0
535. 0
@@ -0,0 +1,128 @@
DEPTH PARTICLES
5. 7
15. 12
25. 20
35. 19
45. 23
55. 38
65. 23
75. 29
85. 33
95. 34
105. 33
115. 48
125. 38
135. 64
145. 47
155. 60
165. 48
175. 58
185. 65
195. 83
205. 80
215. 72
225. 74
235. 84
245. 87
255. 108
265. 90
275. 115
285. 126
295. 104
305. 163
315. 153
325. 150
335. 158
345. 142
355. 195
365. 204
375. 183
385. 208
395. 211
405. 251
415. 245
425. 291
435. 294
445. 340
455. 338
465. 382
475. 398
485. 420
495. 475
505. 480
515. 505
525. 578
535. 637
545. 677
555. 752
565. 746
575. 816
585. 879
595. 1020
605. 1000
615. 1153
625. 1192
635. 1417
645. 1402
655. 1478
665. 1644
675. 1717
685. 1749
695. 1958
705. 2029
715. 2156
725. 2277
735. 2460
745. 2549
755. 2666
765. 2914
775. 2952
785. 3034
795. 3217
805. 3201
815. 3337
825. 3326
835. 3339
845. 3243
855. 3202
865. 3113
875. 3013
885. 2849
895. 2628
905. 2448
915. 2155
925. 1858
935. 1584
945. 1306
955. 1036
965. 854
975. 626
985. 437
995. 324
1005. 307
1015. 165
1025. 77
1035. 27
1045. 5
1055. 2
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
@@ -0,0 +1,137 @@
DEPTH PARTICLES
5. 5
15. 5
25. 15
35. 15
45. 28
55. 23
65. 23
75. 27
85. 21
95. 37
105. 24
115. 29
125. 28
135. 44
145. 48
155. 46
165. 44
175. 45
185. 50
195. 53
205. 48
215. 59
225. 67
235. 51
245. 73
255. 85
265. 67
275. 79
285. 73
295. 95
305. 84
315. 88
325. 101
335. 107
345. 100
355. 126
365. 144
375. 120
385. 171
395. 146
405. 147
415. 175
425. 184
435. 205
445. 232
455. 238
465. 218
475. 237
485. 265
495. 279
505. 322
515. 334
525. 380
535. 426
545. 443
555. 424
565. 497
575. 544
585. 561
595. 561
605. 693
615. 714
625. 740
635. 832
645. 864
655. 924
665. 1018
675. 1108
685. 1094
695. 1197
705. 1264
715. 1357
725. 1570
735. 1600
745. 1650
755. 1817
765. 1924
775. 1936
785. 2128
795. 2243
805. 2346
815. 2541
825. 2609
835. 2766
845. 2827
855. 2990
865. 2999
875. 3090
885. 3040
895. 3146
905. 3202
915. 3192
925. 3114
935. 3080
945. 2964
955. 2814
965. 2629
975. 2340
985. 2091
995. 1843
1005. 2635
1015. 1996
1025. 1345
1035. 931
1045. 577
1055. 310
1065. 155
1075. 74
1085. 22
1095. 15
1105. 3
1115. 1
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
@@ -0,0 +1,144 @@
DEPTH PARTICLES
5. 1
15. 13
25. 11
35. 8
45. 18
55. 13
65. 12
75. 14
85. 16
95. 24
105. 23
115. 24
125. 28
135. 29
145. 29
155. 35
165. 25
175. 33
185. 37
195. 37
205. 30
215. 40
225. 52
235. 47
245. 49
255. 60
265. 59
275. 54
285. 51
295. 64
305. 60
315. 69
325. 62
335. 71
345. 48
355. 98
365. 97
375. 105
385. 91
395. 112
405. 130
415. 112
425. 134
435. 137
445. 155
455. 132
465. 165
475. 170
485. 192
495. 213
505. 228
515. 174
525. 229
535. 262
545. 286
555. 320
565. 319
575. 352
585. 378
595. 373
605. 396
615. 419
625. 466
635. 476
645. 560
655. 582
665. 605
675. 651
685. 675
695. 797
705. 796
715. 823
725. 942
735. 958
745. 1037
755. 1140
765. 1195
775. 1213
785. 1281
795. 1426
805. 1510
815. 1668
825. 1782
835. 1778
845. 1945
855. 2077
865. 2153
875. 2311
885. 2403
895. 2502
905. 2556
915. 2782
925. 2869
935. 2994
945. 2953
955. 3105
965. 2947
975. 3057
985. 2977
995. 2806
1005. 4704
1015. 4484
1025. 4038
1035. 3583
1045. 3104
1055. 2517
1065. 1902
1075. 1395
1085. 927
1095. 540
1105. 307
1115. 154
1125. 65
1135. 20
1145. 6
1155. 0
1165. 2
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
@@ -0,0 +1,151 @@
DEPTH PARTICLES
5. 3
15. 5
25. 10
35. 9
45. 14
55. 10
65. 5
75. 15
85. 18
95. 15
105. 30
115. 21
125. 15
135. 19
145. 28
155. 32
165. 30
175. 19
185. 27
195. 35
205. 25
215. 27
225. 32
235. 32
245. 27
255. 36
265. 34
275. 37
285. 32
295. 42
305. 43
315. 53
325. 55
335. 43
345. 62
355. 62
365. 60
375. 78
385. 66
395. 69
405. 81
415. 79
425. 84
435. 99
445. 83
455. 79
465. 108
475. 108
485. 112
495. 122
505. 146
515. 142
525. 163
535. 154
545. 149
555. 179
565. 199
575. 219
585. 211
595. 243
605. 305
615. 293
625. 320
635. 298
645. 299
655. 323
665. 383
675. 410
685. 423
695. 494
705. 531
715. 504
725. 578
735. 614
745. 610
755. 688
765. 709
775. 809
785. 848
795. 888
805. 1009
815. 1027
825. 1091
835. 1228
845. 1288
855. 1275
865. 1435
875. 1466
885. 1535
895. 1725
905. 1754
915. 1868
925. 1920
935. 2067
945. 2168
955. 2280
965. 2337
975. 2390
985. 2442
995. 2404
1005. 4622
1015. 4594
1025. 4645
1035. 4742
1045. 4683
1055. 4587
1065. 4305
1075. 4175
1085. 3515
1095. 3009
1105. 2458
1115. 1837
1125. 1301
1135. 909
1145. 573
1155. 290
1165. 179
1175. 79
1185. 30
1195. 12
1205. 3
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
@@ -0,0 +1,160 @@
DEPTH PARTICLES
5. 4
15. 0
25. 13
35. 12
45. 3
55. 13
65. 12
75. 13
85. 16
95. 19
105. 8
115. 16
125. 9
135. 8
145. 21
155. 22
165. 20
175. 16
185. 23
195. 23
205. 23
215. 26
225. 25
235. 28
245. 37
255. 26
265. 27
275. 39
285. 51
295. 38
305. 31
315. 32
325. 28
335. 48
345. 42
355. 57
365. 55
375. 56
385. 62
395. 57
405. 60
415. 60
425. 60
435. 74
445. 81
455. 77
465. 83
475. 72
485. 86
495. 110
505. 86
515. 104
525. 106
535. 108
545. 122
555. 145
565. 167
575. 145
585. 142
595. 161
605. 177
615. 186
625. 207
635. 213
645. 239
655. 237
665. 266
675. 306
685. 304
695. 315
705. 314
715. 362
725. 354
735. 372
745. 392
755. 438
765. 493
775. 472
785. 530
795. 557
805. 545
815. 649
825. 730
835. 656
845. 727
855. 841
865. 861
875. 895
885. 940
895. 988
905. 1116
915. 1141
925. 1188
935. 1309
945. 1335
955. 1446
965. 1534
975. 1560
985. 1651
995. 1722
1005. 3264
1015. 3379
1025. 3688
1035. 3695
1045. 4036
1055. 4218
1065. 4500
1075. 4620
1085. 4648
1095. 4579
1105. 4502
1115. 4213
1125. 3958
1135. 3524
1145. 3046
1155. 2451
1165. 2001
1175. 1364
1185. 1009
1195. 619
1205. 316
1215. 189
1225. 89
1235. 42
1245. 13
1255. 5
1265. 3
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
@@ -0,0 +1,171 @@
DEPTH PARTICLES
5. 1
15. 4
25. 10
35. 11
45. 16
55. 11
65. 6
75. 13
85. 6
95. 18
105. 15
115. 16
125. 14
135. 14
145. 11
155. 15
165. 15
175. 17
185. 15
195. 18
205. 21
215. 18
225. 23
235. 17
245. 17
255. 27
265. 24
275. 23
285. 38
295. 21
305. 23
315. 22
325. 26
335. 29
345. 28
355. 40
365. 44
375. 30
385. 40
395. 37
405. 57
415. 43
425. 24
435. 41
445. 47
455. 55
465. 54
475. 64
485. 67
495. 64
505. 69
515. 72
525. 72
535. 94
545. 92
555. 85
565. 100
575. 101
585. 99
595. 118
605. 104
615. 140
625. 120
635. 132
645. 159
655. 139
665. 181
675. 178
685. 174
695. 202
705. 218
715. 254
725. 229
735. 234
745. 254
755. 308
765. 273
775. 297
785. 347
795. 370
805. 409
815. 385
825. 451
835. 470
845. 477
855. 458
865. 568
875. 619
885. 605
895. 650
905. 690
915. 746
925. 784
935. 815
945. 876
955. 874
965. 989
975. 1010
985. 1113
995. 1146
1005. 2027
1015. 2185
1025. 2309
1035. 2646
1045. 2743
1055. 3051
1065. 3262
1075. 3511
1085. 3716
1095. 3893
1105. 4147
1115. 4266
1125. 4356
1135. 4592
1145. 4520
1155. 4354
1165. 4075
1175. 3994
1185. 3577
1195. 3044
1205. 2582
1215. 2073
1225. 1482
1235. 1061
1245. 679
1255. 430
1265. 227
1275. 124
1285. 65
1295. 22
1305. 6
1315. 3
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
@@ -0,0 +1,178 @@
DEPTH PARTICLES
5. 0
15. 3
25. 8
35. 5
45. 4
55. 10
65. 6
75. 9
85. 8
95. 9
105. 10
115. 7
125. 11
135. 13
145. 19
155. 14
165. 10
175. 16
185. 16
195. 23
205. 14
215. 22
225. 17
235. 22
245. 19
255. 18
265. 16
275. 21
285. 23
295. 22
305. 19
315. 28
325. 36
335. 18
345. 23
355. 32
365. 32
375. 31
385. 28
395. 38
405. 37
415. 33
425. 33
435. 33
445. 44
455. 40
465. 49
475. 39
485. 43
495. 57
505. 46
515. 47
525. 61
535. 63
545. 66
555. 72
565. 77
575. 83
585. 78
595. 87
605. 80
615. 98
625. 102
635. 106
645. 103
655. 116
665. 118
675. 149
685. 141
695. 137
705. 150
715. 165
725. 130
735. 154
745. 175
755. 194
765. 179
775. 201
785. 223
795. 246
805. 229
815. 239
825. 250
835. 301
845. 320
855. 326
865. 355
875. 362
885. 374
895. 411
905. 437
915. 436
925. 451
935. 513
945. 541
955. 563
965. 589
975. 600
985. 643
995. 673
1005. 1320
1015. 1335
1025. 1475
1035. 1612
1045. 1760
1055. 1976
1065. 2166
1075. 2333
1085. 2472
1095. 2763
1105. 2836
1115. 3142
1125. 3328
1135. 3592
1145. 3795
1155. 4133
1165. 4215
1175. 4289
1185. 4387
1195. 4246
1205. 4430
1215. 4063
1225. 4026
1235. 3637
1245. 3269
1255. 2724
1265. 2188
1275. 1656
1285. 1178
1295. 867
1305. 508
1315. 335
1325. 163
1335. 89
1345. 37
1355. 9
1365. 6
1375. 0
1385. 0
1395. 1
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
@@ -0,0 +1,185 @@
DEPTH PARTICLES
5. 3
15. 3
25. 8
35. 6
45. 10
55. 8
65. 8
75. 6
85. 7
95. 7
105. 11
115. 7
125. 5
135. 8
145. 12
155. 18
165. 8
175. 12
185. 11
195. 17
205. 11
215. 18
225. 10
235. 10
245. 13
255. 12
265. 15
275. 22
285. 17
295. 11
305. 15
315. 27
325. 27
335. 22
345. 21
355. 24
365. 22
375. 32
385. 23
395. 13
405. 31
415. 24
425. 28
435. 33
445. 32
455. 33
465. 26
475. 27
485. 34
495. 35
505. 35
515. 38
525. 41
535. 51
545. 36
555. 48
565. 55
575. 63
585. 72
595. 58
605. 71
615. 67
625. 74
635. 69
645. 73
655. 73
665. 99
675. 89
685. 95
695. 83
705. 91
715. 103
725. 128
735. 109
745. 119
755. 118
765. 123
775. 128
785. 155
795. 156
805. 171
815. 192
825. 221
835. 224
845. 175
855. 225
865. 231
875. 223
885. 255
895. 234
905. 276
915. 325
925. 284
935. 321
945. 351
955. 365
965. 393
975. 397
985. 442
995. 442
1005. 804
1015. 870
1025. 973
1035. 980
1045. 1093
1055. 1255
1065. 1314
1075. 1492
1085. 1552
1095. 1700
1105. 1845
1115. 2058
1125. 2218
1135. 2442
1145. 2541
1155. 2768
1165. 3028
1175. 3267
1185. 3480
1195. 3737
1205. 3937
1215. 4003
1225. 4200
1235. 4187
1245. 4320
1255. 4206
1265. 4140
1275. 3963
1285. 3653
1295. 3389
1305. 2748
1315. 2467
1325. 1935
1335. 1425
1345. 1047
1355. 655
1365. 411
1375. 235
1385. 158
1395. 69
1405. 36
1415. 7
1425. 7
1435. 1
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
@@ -0,0 +1,197 @@
DEPTH PARTICLES
5. 2
15. 1
25. 1
35. 4
45. 3
55. 9
65. 9
75. 2
85. 10
95. 10
105. 6
115. 3
125. 5
135. 14
145. 9
155. 15
165. 10
175. 9
185. 4
195. 8
205. 10
215. 10
225. 12
235. 12
245. 7
255. 12
265. 17
275. 12
285. 15
295. 12
305. 20
315. 18
325. 14
335. 15
345. 19
355. 5
365. 21
375. 21
385. 20
395. 23
405. 12
415. 19
425. 24
435. 34
445. 25
455. 21
465. 20
475. 26
485. 29
495. 30
505. 18
515. 39
525. 43
535. 32
545. 33
555. 35
565. 42
575. 28
585. 41
595. 35
605. 47
615. 43
625. 46
635. 69
645. 34
655. 63
665. 60
675. 52
685. 59
695. 78
705. 63
715. 81
725. 79
735. 84
745. 91
755. 86
765. 87
775. 104
785. 110
795. 121
805. 108
815. 114
825. 122
835. 117
845. 130
855. 157
865. 141
875. 160
885. 165
895. 179
905. 201
915. 200
925. 203
935. 205
945. 212
955. 231
965. 245
975. 280
985. 296
995. 260
1005. 531
1015. 536
1025. 591
1035. 651
1045. 689
1055. 756
1065. 870
1075. 935
1085. 966
1095. 1111
1105. 1177
1115. 1216
1125. 1388
1135. 1448
1145. 1572
1155. 1859
1165. 1996
1175. 2155
1185. 2277
1195. 2516
1205. 2680
1215. 2940
1225. 3063
1235. 3276
1245. 3471
1255. 3667
1265. 3803
1275. 3880
1285. 4168
1295. 4167
1305. 4319
1315. 3979
1325. 4171
1335. 3878
1345. 3426
1355. 3159
1365. 2706
1375. 2207
1385. 1691
1395. 1260
1405. 926
1415. 626
1425. 379
1435. 229
1445. 110
1455. 60
1465. 27
1475. 11
1485. 5
1495. 2
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
@@ -0,0 +1,203 @@
DEPTH PARTICLES
5. 1
15. 5
25. 2
35. 8
45. 5
55. 5
65. 4
75. 6
85. 6
95. 9
105. 11
115. 5
125. 5
135. 8
145. 5
155. 7
165. 4
175. 12
185. 8
195. 12
205. 11
215. 12
225. 11
235. 8
245. 7
255. 8
265. 8
275. 11
285. 14
295. 11
305. 8
315. 17
325. 17
335. 5
345. 12
355. 23
365. 19
375. 19
385. 9
395. 13
405. 15
415. 13
425. 16
435. 13
445. 15
455. 16
465. 14
475. 21
485. 28
495. 15
505. 23
515. 17
525. 29
535. 20
545. 29
555. 27
565. 31
575. 34
585. 42
595. 37
605. 39
615. 29
625. 41
635. 57
645. 41
655. 31
665. 44
675. 50
685. 51
695. 52
705. 52
715. 54
725. 56
735. 51
745. 66
755. 59
765. 71
775. 59
785. 67
795. 88
805. 75
815. 78
825. 102
835. 91
845. 97
855. 102
865. 124
875. 112
885. 122
895. 119
905. 141
915. 136
925. 127
935. 125
945. 166
955. 158
965. 188
975. 165
985. 177
995. 192
1005. 345
1015. 367
1025. 405
1035. 439
1045. 450
1055. 448
1065. 528
1075. 652
1085. 614
1095. 687
1105. 717
1115. 840
1125. 902
1135. 992
1145. 1025
1155. 1115
1165. 1267
1175. 1318
1185. 1427
1195. 1578
1205. 1764
1215. 1762
1225. 2022
1235. 2187
1245. 2270
1255. 2518
1265. 2696
1275. 2911
1285. 3090
1295. 3202
1305. 3494
1315. 3725
1325. 3828
1335. 3881
1345. 3990
1355. 4101
1365. 4127
1375. 4030
1385. 3921
1395. 3674
1405. 3282
1415. 2889
1425. 2549
1435. 2105
1445. 1637
1455. 1230
1465. 873
1475. 606
1485. 358
1495. 205
1505. 124
1515. 66
1525. 30
1535. 17
1545. 9
1555. 0
1565. 1
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
@@ -0,0 +1,66 @@
DEPTH PARTICLES
5. 232
15. 535
25. 712
35. 913
45. 1012
55. 1271
65. 1431
75. 1604
85. 1828
95. 2037
105. 2178
115. 2547
125. 2861
135. 3030
145. 3383
155. 3769
165. 3942
175. 4109
185. 4356
195. 4519
205. 4366
215. 4539
225. 4489
235. 4474
245. 4256
255. 4081
265. 3849
275. 3453
285. 3098
295. 2620
305. 2335
315. 1837
325. 1513
335. 1216
345. 917
355. 712
365. 467
375. 327
385. 251
395. 133
405. 92
415. 59
425. 37
435. 12
445. 9
455. 3
465. 2
475. 2
485. 1
495. 0
505. 0
515. 0
525. 0
535. 0
545. 0
555. 0
565. 0
575. 0
585. 0
595. 0
605. 0
615. 0
625. 0
635. 0
645. 0
@@ -0,0 +1,215 @@
DEPTH PARTICLES
5. 1
15. 1
25. 1
35. 2
45. 2
55. 6
65. 5
75. 6
85. 8
95. 7
105. 12
115. 5
125. 4
135. 4
145. 9
155. 3
165. 7
175. 9
185. 4
195. 13
205. 6
215. 12
225. 8
235. 13
245. 7
255. 6
265. 10
275. 5
285. 12
295. 8
305. 12
315. 8
325. 9
335. 6
345. 19
355. 11
365. 12
375. 21
385. 17
395. 13
405. 19
415. 16
425. 22
435. 21
445. 20
455. 13
465. 21
475. 22
485. 16
495. 22
505. 25
515. 17
525. 21
535. 14
545. 22
555. 33
565. 26
575. 30
585. 21
595. 23
605. 26
615. 21
625. 30
635. 28
645. 30
655. 34
665. 32
675. 44
685. 47
695. 36
705. 48
715. 37
725. 37
735. 59
745. 52
755. 50
765. 48
775. 49
785. 45
795. 68
805. 51
815. 63
825. 68
835. 51
845. 72
855. 60
865. 71
875. 72
885. 89
895. 98
905. 86
915. 94
925. 113
935. 110
945. 95
955. 109
965. 110
975. 124
985. 112
995. 133
1005. 251
1015. 256
1025. 252
1035. 298
1045. 313
1055. 340
1065. 335
1075. 391
1085. 423
1095. 461
1105. 492
1115. 517
1125. 589
1135. 638
1145. 639
1155. 736
1165. 808
1175. 813
1185. 937
1195. 1011
1205. 1067
1215. 1176
1225. 1264
1235. 1302
1245. 1486
1255. 1578
1265. 1741
1275. 1855
1285. 1979
1295. 2103
1305. 2377
1315. 2546
1325. 2636
1335. 2834
1345. 3077
1355. 3227
1365. 3420
1375. 3650
1385. 3655
1395. 3809
1405. 3927
1415. 4062
1425. 3909
1435. 3911
1445. 3718
1455. 3544
1465. 3202
1475. 2855
1485. 2480
1495. 2132
1505. 1654
1515. 1274
1525. 911
1535. 621
1545. 401
1555. 270
1565. 145
1575. 71
1585. 34
1595. 16
1605. 3
1615. 1
1625. 0
1635. 0
1645. 1
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
@@ -0,0 +1,225 @@
DEPTH PARTICLES
5. 0
15. 4
25. 5
35. 1
45. 10
55. 7
65. 2
75. 2
85. 7
95. 6
105. 5
115. 0
125. 4
135. 4
145. 4
155. 7
165. 8
175. 5
185. 3
195. 10
205. 6
215. 12
225. 4
235. 4
245. 9
255. 6
265. 8
275. 4
285. 6
295. 8
305. 8
315. 11
325. 7
335. 7
345. 5
355. 4
365. 11
375. 13
385. 6
395. 9
405. 17
415. 18
425. 13
435. 11
445. 12
455. 12
465. 13
475. 10
485. 18
495. 20
505. 13
515. 18
525. 11
535. 16
545. 12
555. 19
565. 20
575. 19
585. 20
595. 26
605. 28
615. 21
625. 25
635. 28
645. 40
655. 16
665. 28
675. 27
685. 31
695. 37
705. 29
715. 38
725. 25
735. 35
745. 31
755. 35
765. 43
775. 36
785. 39
795. 51
805. 42
815. 40
825. 44
835. 49
845. 56
855. 61
865. 40
875. 62
885. 61
895. 54
905. 67
915. 75
925. 73
935. 89
945. 67
955. 91
965. 78
975. 79
985. 89
995. 95
1005. 162
1015. 170
1025. 173
1035. 190
1045. 205
1055. 236
1065. 219
1075. 266
1085. 255
1095. 297
1105. 318
1115. 327
1125. 379
1135. 401
1145. 389
1155. 409
1165. 485
1175. 550
1185. 577
1195. 528
1205. 640
1215. 754
1225. 766
1235. 871
1245. 920
1255. 1030
1265. 1080
1275. 1147
1285. 1237
1295. 1430
1305. 1468
1315. 1633
1325. 1709
1335. 1758
1345. 2049
1355. 2205
1365. 2278
1375. 2600
1385. 2673
1395. 2854
1405. 3043
1415. 3121
1425. 3394
1435. 3482
1445. 3553
1455. 3721
1465. 3959
1475. 3878
1485. 3842
1495. 3866
1505. 3611
1515. 3592
1525. 3299
1535. 2778
1545. 2497
1555. 2064
1565. 1703
1575. 1413
1585. 984
1595. 693
1605. 449
1615. 290
1625. 180
1635. 94
1645. 43
1655. 29
1665. 10
1675. 4
1685. 1
1695. 1
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
@@ -0,0 +1,233 @@
DEPTH PARTICLES
5. 0
15. 4
25. 1
35. 3
45. 3
55. 3
65. 2
75. 5
85. 4
95. 7
105. 6
115. 4
125. 5
135. 3
145. 4
155. 5
165. 3
175. 9
185. 6
195. 4
205. 4
215. 13
225. 4
235. 3
245. 10
255. 4
265. 9
275. 11
285. 6
295. 5
305. 10
315. 9
325. 13
335. 7
345. 8
355. 5
365. 7
375. 7
385. 7
395. 9
405. 10
415. 11
425. 5
435. 11
445. 12
455. 9
465. 12
475. 19
485. 9
495. 12
505. 16
515. 10
525. 15
535. 12
545. 14
555. 4
565. 17
575. 13
585. 12
595. 19
605. 19
615. 18
625. 16
635. 24
645. 24
655. 19
665. 31
675. 25
685. 21
695. 22
705. 40
715. 25
725. 24
735. 26
745. 28
755. 39
765. 23
775. 34
785. 34
795. 38
805. 27
815. 26
825. 37
835. 35
845. 49
855. 42
865. 49
875. 43
885. 48
895. 40
905. 43
915. 47
925. 58
935. 54
945. 54
955. 50
965. 58
975. 71
985. 59
995. 59
1005. 120
1015. 130
1025. 122
1035. 133
1045. 128
1055. 176
1065. 183
1075. 204
1085. 194
1095. 220
1105. 188
1115. 258
1125. 271
1135. 237
1145. 268
1155. 323
1165. 320
1175. 362
1185. 410
1195. 401
1205. 443
1215. 544
1225. 518
1235. 526
1245. 608
1255. 589
1265. 689
1275. 708
1285. 807
1295. 843
1305. 918
1315. 976
1325. 1077
1335. 1157
1345. 1284
1355. 1418
1365. 1491
1375. 1530
1385. 1649
1395. 1824
1405. 1953
1415. 2094
1425. 2268
1435. 2361
1445. 2522
1455. 2683
1465. 2878
1475. 3087
1485. 3272
1495. 3397
1505. 3520
1515. 3700
1525. 3630
1535. 3792
1545. 3889
1555. 3819
1565. 3629
1575. 3451
1585. 3224
1595. 2950
1605. 2581
1615. 2220
1625. 1843
1635. 1487
1645. 1117
1655. 812
1665. 547
1675. 364
1685. 225
1695. 124
1705. 82
1715. 32
1725. 17
1735. 5
1745. 1
1755. 2
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
2245. 0
2255. 0
2265. 0
2275. 0
2285. 0
2295. 0
2305. 0
2315. 0
@@ -0,0 +1,241 @@
DEPTH PARTICLES
5. 1
15. 4
25. 2
35. 3
45. 3
55. 2
65. 2
75. 3
85. 3
95. 9
105. 6
115. 3
125. 4
135. 4
145. 3
155. 8
165. 4
175. 6
185. 4
195. 1
205. 5
215. 8
225. 8
235. 5
245. 7
255. 8
265. 6
275. 4
285. 6
295. 5
305. 10
315. 11
325. 4
335. 7
345. 4
355. 9
365. 7
375. 11
385. 9
395. 6
405. 11
415. 7
425. 7
435. 9
445. 13
455. 9
465. 9
475. 13
485. 13
495. 13
505. 5
515. 15
525. 6
535. 20
545. 15
555. 14
565. 9
575. 13
585. 12
595. 17
605. 17
615. 18
625. 20
635. 19
645. 17
655. 14
665. 22
675. 22
685. 18
695. 20
705. 25
715. 19
725. 25
735. 11
745. 25
755. 31
765. 25
775. 15
785. 21
795. 25
805. 30
815. 28
825. 26
835. 27
845. 30
855. 30
865. 36
875. 31
885. 33
895. 36
905. 32
915. 22
925. 35
935. 33
945. 32
955. 27
965. 41
975. 38
985. 45
995. 51
1005. 90
1015. 104
1025. 101
1035. 120
1045. 89
1055. 116
1065. 102
1075. 107
1085. 113
1095. 129
1105. 162
1115. 170
1125. 189
1135. 186
1145. 167
1155. 187
1165. 230
1175. 247
1185. 234
1195. 258
1205. 328
1215. 345
1225. 322
1235. 356
1245. 362
1255. 406
1265. 462
1275. 465
1285. 537
1295. 490
1305. 580
1315. 588
1325. 642
1335. 698
1345. 785
1355. 835
1365. 929
1375. 917
1385. 1032
1395. 1146
1405. 1260
1415. 1295
1425. 1386
1435. 1553
1445. 1661
1455. 1725
1465. 1938
1475. 2080
1485. 2177
1495. 2244
1505. 2472
1515. 2513
1525. 2814
1535. 2976
1545. 3205
1555. 3321
1565. 3413
1575. 3455
1585. 3566
1595. 3788
1605. 3627
1615. 3705
1625. 3724
1635. 3500
1645. 3270
1655. 2979
1665. 2751
1675. 2481
1685. 2087
1695. 1689
1705. 1299
1715. 1050
1725. 724
1735. 461
1745. 319
1755. 219
1765. 108
1775. 75
1785. 23
1795. 22
1805. 4
1815. 2
1825. 0
1835. 0
1845. 1
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
2245. 0
2255. 0
2265. 0
2275. 0
2285. 0
2295. 0
2305. 0
2315. 0
2325. 0
2335. 0
2345. 0
2355. 0
2365. 0
2375. 0
2385. 0
2395. 0
@@ -0,0 +1,74 @@
DEPTH PARTICLES
5. 91
15. 231
25. 307
35. 380
45. 433
55. 559
65. 571
75. 666
85. 728
95. 886
105. 920
115. 1065
125. 1156
135. 1276
145. 1386
155. 1618
165. 1735
175. 1882
185. 2106
195. 2318
205. 2507
215. 2768
225. 2888
235. 3171
245. 3410
255. 3488
265. 3805
275. 3999
285. 4017
295. 4088
305. 4222
315. 4200
325. 4119
335. 4013
345. 3761
355. 3637
365. 3336
375. 3020
385. 2613
395. 2190
405. 1923
415. 1474
425. 1269
435. 871
445. 684
455. 499
465. 331
475. 207
485. 131
495. 88
505. 45
515. 26
525. 11
535. 7
545. 3
555. 0
565. 0
575. 0
585. 0
595. 0
605. 0
615. 0
625. 0
635. 0
645. 0
655. 0
665. 0
675. 0
685. 0
695. 0
705. 0
715. 0
725. 0
@@ -0,0 +1,82 @@
DEPTH PARTICLES
5. 53
15. 125
25. 165
35. 186
45. 228
55. 293
65. 335
75. 323
85. 353
95. 396
105. 493
115. 494
125. 564
135. 614
145. 708
155. 714
165. 855
175. 880
185. 953
195. 1139
205. 1213
215. 1415
225. 1444
235. 1639
245. 1719
255. 1882
265. 2091
275. 2249
285. 2493
295. 2568
305. 2897
315. 3020
325. 3065
335. 3373
345. 3435
355. 3782
365. 3844
375. 3909
385. 3950
395. 3968
405. 3944
415. 3861
425. 3723
435. 3490
445. 3258
455. 2875
465. 2556
475. 2219
485. 1957
495. 1616
505. 1279
515. 992
525. 812
535. 607
545. 399
555. 262
565. 148
575. 100
585. 47
595. 25
605. 13
615. 6
625. 4
635. 1
645. 0
655. 0
665. 0
675. 0
685. 0
695. 0
705. 0
715. 0
725. 0
735. 0
745. 0
755. 0
765. 0
775. 0
785. 0
795. 0
805. 0
@@ -0,0 +1,91 @@
DEPTH PARTICLES
5. 36
15. 86
25. 84
35. 131
45. 125
55. 157
65. 160
75. 202
85. 195
95. 239
105. 300
115. 301
125. 299
135. 332
145. 410
155. 392
165. 431
175. 511
185. 521
195. 612
205. 637
215. 679
225. 769
235. 831
245. 952
255. 997
265. 1116
275. 1175
285. 1338
295. 1376
305. 1504
315. 1713
325. 1836
335. 1944
345. 2157
355. 2275
365. 2436
375. 2643
385. 2784
395. 3001
405. 2979
415. 3258
425. 3329
435. 3471
445. 3662
455. 3627
465. 3838
475. 3756
485. 3792
495. 3620
505. 3403
515. 3270
525. 3305
535. 3004
545. 2598
555. 2334
565. 1892
575. 1534
585. 1229
595. 921
605. 663
615. 520
625. 292
635. 216
645. 118
655. 100
665. 45
675. 27
685. 13
695. 3
705. 2
715. 1
725. 0
735. 1
745. 0
755. 0
765. 0
775. 0
785. 0
795. 0
805. 0
815. 0
825. 0
835. 0
845. 0
855. 0
865. 0
875. 0
885. 0
895. 0
@@ -0,0 +1,99 @@
DEPTH PARTICLES
5. 28
15. 54
25. 72
35. 88
45. 79
55. 94
65. 117
75. 115
85. 150
95. 147
105. 161
115. 161
125. 199
135. 217
145. 209
155. 222
165. 257
175. 283
185. 329
195. 357
205. 385
215. 401
225. 483
235. 448
245. 536
255. 538
265. 637
275. 636
285. 667
295. 807
305. 815
315. 884
325. 1033
335. 1112
345. 1167
355. 1344
365. 1391
375. 1501
385. 1612
395. 1758
405. 1958
415. 2032
425. 2119
435. 2350
445. 2452
455. 2610
465. 2812
475. 2902
485. 3072
495. 3226
505. 3331
515. 3445
525. 3633
535. 3679
545. 3793
555. 3690
565. 3655
575. 3597
585. 3497
595. 3203
605. 2868
615. 2629
625. 2321
635. 1991
645. 1665
655. 1387
665. 1067
675. 755
685. 571
695. 409
705. 244
715. 179
725. 119
735. 55
745. 34
755. 15
765. 8
775. 4
785. 0
795. 3
805. 0
815. 0
825. 0
835. 1
845. 0
855. 0
865. 0
875. 0
885. 0
895. 0
905. 0
915. 0
925. 0
935. 0
945. 0
955. 0
965. 0
975. 0
@@ -0,0 +1,106 @@
DEPTH PARTICLES
5. 13
15. 29
25. 37
35. 50
45. 58
55. 86
65. 56
75. 80
85. 87
95. 96
105. 119
115. 111
125. 130
135. 133
145. 139
155. 161
165. 184
175. 190
185. 189
195. 213
205. 250
215. 247
225. 284
235. 285
245. 312
255. 313
265. 372
275. 348
285. 424
295. 497
305. 443
315. 539
325. 580
335. 614
345. 676
355. 697
365. 825
375. 905
385. 955
395. 1047
405. 1088
415. 1118
425. 1255
435. 1321
445. 1436
455. 1574
465. 1697
475. 1813
485. 1955
495. 2059
505. 2230
515. 2325
525. 2672
535. 2806
545. 2918
555. 2990
565. 3283
575. 3371
585. 3459
595. 3582
605. 3646
615. 3633
625. 3736
635. 3623
645. 3345
655. 3265
665. 3140
675. 2927
685. 2551
695. 2283
705. 2112
715. 1794
725. 1421
735. 1120
745. 867
755. 634
765. 465
775. 294
785. 168
795. 131
805. 79
815. 54
825. 22
835. 10
845. 3
855. 3
865. 0
875. 0
885. 1
895. 0
905. 0
915. 0
925. 0
935. 0
945. 0
955. 0
965. 0
975. 0
985. 0
995. 0
1005. 0
1015. 0
1025. 0
1035. 0
1045. 0
@@ -0,0 +1,113 @@
DEPTH PARTICLES
5. 10
15. 26
25. 43
35. 41
45. 43
55. 56
65. 47
75. 59
85. 71
95. 70
105. 84
115. 78
125. 74
135. 109
145. 92
155. 94
165. 119
175. 104
185. 137
195. 146
205. 162
215. 155
225. 176
235. 162
245. 193
255. 192
265. 189
275. 268
285. 226
295. 279
305. 309
315. 330
325. 370
335. 368
345. 446
355. 411
365. 491
375. 495
385. 499
395. 605
405. 605
415. 708
425. 744
435. 771
445. 909
455. 932
465. 1087
475. 1094
485. 1085
495. 1289
505. 1377
515. 1394
525. 1587
535. 1745
545. 1874
555. 2016
565. 2219
575. 2251
585. 2383
595. 2552
605. 2598
615. 2877
625. 2982
635. 3073
645. 3266
655. 3327
665. 3406
675. 3617
685. 3474
695. 3420
705. 3526
715. 3317
725. 3177
735. 3131
745. 2889
755. 2645
765. 2391
775. 2060
785. 1773
795. 1505
805. 1152
815. 875
825. 735
835. 522
845. 384
855. 233
865. 155
875. 130
885. 65
895. 27
905. 10
915. 14
925. 7
935. 2
945. 0
955. 1
965. 0
975. 0
985. 0
995. 0
1005. 0
1015. 0
1025. 0
1035. 0
1045. 0
1055. 0
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
@@ -0,0 +1,120 @@
DEPTH PARTICLES
5. 9
15. 14
25. 24
35. 22
45. 36
55. 35
65. 39
75. 43
85. 51
95. 51
105. 67
115. 55
125. 54
135. 62
145. 67
155. 73
165. 76
175. 93
185. 83
195. 100
205. 100
215. 108
225. 107
235. 141
245. 144
255. 127
265. 147
275. 139
285. 172
295. 201
305. 187
315. 230
325. 199
335. 267
345. 243
355. 273
365. 303
375. 323
385. 351
395. 385
405. 396
415. 383
425. 449
435. 480
445. 513
455. 574
465. 552
475. 618
485. 706
495. 804
505. 786
515. 833
525. 979
535. 1034
545. 1121
555. 1257
565. 1262
575. 1403
585. 1494
595. 1660
605. 1703
615. 1838
625. 1958
635. 2151
645. 2320
655. 2288
665. 2599
675. 2626
685. 2786
695. 2916
705. 3020
715. 3219
725. 3298
735. 3256
745. 3243
755. 3372
765. 3421
775. 3475
785. 3214
795. 3099
805. 3019
815. 2845
825. 2586
835. 2474
845. 2130
855. 1820
865. 1487
875. 1285
885. 987
895. 744
905. 564
915. 392
925. 277
935. 186
945. 129
955. 72
965. 29
975. 27
985. 10
995. 6
1005. 3
1015. 0
1025. 0
1035. 0
1045. 0
1055. 0
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
@@ -0,0 +1,16 @@
dataT dataTErr dataB dataE dataTr dataRALRAR dataRATRAB dataSpinRot Asym_Mu Asym_MuPosErr Asym_MuNegErr Lambda_Mu Lambda_MuPosErr Lambda_MuNegErr freq_Mu1 freq_Mu1PosErr freq_Mu1NegErr Asym_muon Asym_muonPosErr Asym_muonNegErr Sigma_muon Sigma_muonPosErr Sigma_muonNegErr field fieldPosErr fieldNegErr ph_LR ph_LRPosErr ph_LRNegErr Alpha_LR Alpha_LRPosErr Alpha_LRNegErr relph_TB relph_TBPosErr relph_TBNegErr relph_TB_Mu relph_TB_MuPosErr relph_TB_MuNegErr Alpha_TB Alpha_TBPosErr Alpha_TBNegErr Zero ZeroPosErr ZeroNegErr freqMu2 freqMu2PosErr freqMu2NegErr Asym_MuSiO2 Asym_MuSiO2PosErr Asym_MuSiO2NegErr Lambda_MuSiO2 Lambda_MuSiO2PosErr Lambda_MuSiO2NegErr freqMuSiO2 freqMuSiO2PosErr freqMuSiO2NegErr CHISQ NDF CHISQred RUN AsymCorrected AsymCorrectedErr AsymAg DiaFrac DiaFracErr
260.0000 0.0060 4.4400 6.9980 16.4946 -0.0100 -0.0090 -10.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 9.2100 0.0000 0.0000 0.0730 0.0012 0.0011 0.1359 0.0079 0.0080 7.0900 0.0270 0.0310 363.4600 0.8000 0.7800 1.0099 0.0019 0.0019 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9959 0.0017 0.0017 0.0000 0.0000 0.0000 10.8000 0.0000 0.0000 0.0813 0.0102 0.0090 2.1300 0.3700 0.3200 0.0000 0.0000 0.0000 2320.3999 2224.0000 1.0433 3817.0000 0.0565 0.0012 0.2019 0.2797 0.0059
260.0000 0.0050 4.4500 8.9961 16.4946 -0.0100 -0.0090 -10.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 9.2100 0.0000 0.0000 0.0608 0.0011 0.0011 0.1190 0.0097 0.0100 7.1670 0.0110 0.0120 359.4000 0.7900 0.7900 1.0072 0.0018 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9898 0.0016 0.0016 0.0000 0.0000 0.0000 10.8000 0.0000 0.0000 0.0765 0.0058 0.0055 1.1400 0.1400 0.1300 0.0000 0.0000 0.0000 2366.3999 2224.0000 1.0640 3818.0000 0.0462 0.0011 0.2110 0.2190 0.0052
260.0000 0.0060 4.4510 9.9949 16.4946 -0.0100 -0.0090 -10.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 9.2100 0.0000 0.0000 0.0586 0.0011 0.0011 0.1100 0.0110 0.0110 7.1628 0.0096 0.0101 358.3500 0.8000 0.8000 1.0097 0.0018 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9877 0.0016 0.0016 0.0000 0.0000 0.0000 10.8000 0.0000 0.0000 0.0781 0.0054 0.0051 1.1600 0.1200 0.1100 0.0000 0.0000 0.0000 2404.7000 2224.0000 1.0812 3819.0000 0.0445 0.0011 0.2139 0.2080 0.0051
260.0000 0.0050 4.4480 10.9940 16.4946 -0.0100 -0.0090 -10.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 9.2100 0.0000 0.0000 0.0565 0.0011 0.0011 0.1060 0.0110 0.0110 7.0730 0.0200 0.0210 358.7500 0.9000 0.9000 1.0121 0.0018 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9882 0.0016 0.0016 0.0000 0.0000 0.0000 10.8000 0.0000 0.0000 0.0910 0.0081 0.0075 1.9600 0.2400 0.2100 0.0000 0.0000 0.0000 2387.1001 2224.0000 1.0733 3820.0000 0.0427 0.0011 0.2161 0.1977 0.0051
260.0000 0.0050 4.4500 11.9930 16.4946 -0.0090 -0.0090 -10.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 9.2100 0.0000 0.0000 0.0548 0.0011 0.0011 0.1210 0.0100 0.0110 7.1610 0.0140 0.0160 358.4900 0.8800 0.8700 1.0151 0.0018 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9912 0.0016 0.0016 0.0000 0.0000 0.0000 10.8000 0.0000 0.0000 0.0470 0.0053 0.0048 1.0500 0.2000 0.1600 0.0000 0.0000 0.0000 2299.3000 2224.0000 1.0339 3821.0000 0.0412 0.0011 0.2178 0.1893 0.0051
260.0000 0.0060 4.4500 12.9921 16.4946 -0.0090 -0.0090 -10.0000 0.0237 0.0039 0.0037 0.7300 0.1600 0.1400 0.0000 0.0000 0.0000 0.0432 0.0013 0.0013 0.1090 0.0150 0.0160 6.6470 0.0520 0.0520 362.9000 1.5000 1.5000 1.0200 0.0022 0.0022 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9875 0.0018 0.0018 0.0000 0.0000 0.0000 9.9840 0.0260 0.0270 0.0650 0.0180 0.0140 3.5200 0.9800 0.7700 0.0000 0.0000 0.0000 2256.7000 2221.0000 1.0161 3822.0000 0.0298 0.0013 0.2191 0.1358 0.0059
260.0000 0.0050 4.4520 13.9909 16.4946 -0.0100 -0.0090 -10.0000 0.0320 0.0058 0.0049 2.0300 0.6100 0.4500 9.1330 0.0770 0.0820 0.0375 0.0011 0.0010 0.0950 0.0170 0.0190 7.5000 0.0000 0.0000 -5.9000 1.1000 1.1000 1.0125 0.0017 0.0017 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9840 0.0015 0.0015 0.0000 0.0000 0.0000 9.9900 0.0530 0.0610 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2252.0000 2223.0000 1.0130 3823.0000 0.0241 0.0011 0.2200 0.1097 0.0050
260.0000 0.0050 4.4500 14.9898 16.4946 -0.0100 -0.0090 -10.0000 0.0550 0.0160 0.0110 4.2000 1.6000 1.0000 9.1090 0.0940 0.1010 0.0329 0.0011 0.0011 0.1240 0.0170 0.0180 7.5000 0.0000 0.0000 -4.6000 1.4000 1.3000 1.0149 0.0017 0.0017 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9859 0.0015 0.0015 0.0000 0.0000 0.0000 10.1400 0.1000 0.1300 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2219.8000 2223.0000 0.9986 3824.0000 0.0196 0.0011 0.2208 0.0888 0.0050
260.0000 0.0060 4.4500 15.9972 16.4946 -0.0100 -0.0090 -10.0000 0.0240 0.0050 0.0040 1.6400 0.5900 0.3800 9.0870 0.0610 0.0620 0.0293 0.0011 0.0011 0.1460 0.0190 0.0200 7.5000 0.0000 0.0000 -8.4000 1.6000 1.6000 1.0168 0.0019 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9807 0.0015 0.0015 0.0000 0.0000 0.0000 10.0240 0.0520 0.0600 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2290.2000 2223.0000 1.0302 3825.0000 0.0160 0.0011 0.2214 0.0724 0.0050
260.0000 0.0060 4.4600 16.9959 16.4946 -0.0100 -0.0090 -10.0000 0.0455 0.0110 0.0081 2.8000 1.0000 0.7200 0.0000 0.0000 0.0000 0.0212 0.0011 0.0011 0.0770 0.0320 0.0500 7.5000 0.0000 0.0000 -12.3000 2.2000 2.2000 1.0182 0.0019 0.0018 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9827 0.0014 0.0014 0.0000 0.0000 0.0000 9.2480 0.0670 0.0590 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2312.0000 2224.0000 1.0396 3826.0000 0.0080 0.0011 0.2218 0.0359 0.0050
260.0000 0.0060 4.4590 17.9950 16.4946 -0.0090 -0.0090 -10.0000 0.0850 0.0250 0.0190 7.0000 1.7000 1.4000 0.0000 0.0000 0.0000 0.0194 0.0013 0.0012 0.0950 0.0320 0.0420 6.9900 0.3200 0.3400 355.5000 5.2000 5.0000 1.0173 0.0019 0.0019 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9846 0.0023 0.0021 0.0000 0.0000 0.0000 9.5800 0.1700 0.1700 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2096.3999 2223.0000 0.9431 3827.0000 0.0062 0.0013 0.2221 0.0278 0.0059
260.0000 0.0060 4.4600 18.9939 16.4946 -0.0100 -0.0090 -10.0000 0.0540 0.0250 0.0160 5.3000 2.4000 1.7000 0.0000 0.0000 0.0000 0.0205 0.0020 0.0017 0.1080 0.0400 0.0490 6.6700 0.4100 0.4500 358.4000 6.6000 6.3000 1.0209 0.0027 0.0025 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9832 0.0033 0.0028 0.0000 0.0000 0.0000 9.1400 0.2100 0.1900 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2133.8000 2223.0000 0.9599 3828.0000 0.0073 0.0020 0.2224 0.0327 0.0090
260.0000 0.0040 4.4500 19.9932 16.4946 -0.0100 -0.0090 -10.0000 0.0920 0.0550 0.0330 8.7000 3.5000 2.9000 0.0000 0.0000 0.0000 0.0173 0.0014 0.0014 0.1050 0.0420 0.0570 7.1600 0.0000 0.0000 -9.5000 3.4000 3.4000 1.0189 0.0024 0.0023 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9887 0.0018 0.0018 0.0000 0.0000 0.0000 9.3800 0.2100 0.2000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2261.3999 2224.0000 1.0168 3829.0000 0.0041 0.0014 0.2226 0.0184 0.0063
260.0000 0.0040 4.4500 20.9920 16.4946 -0.0090 -0.0090 -10.0000 0.0292 0.0101 0.0076 2.0900 0.9000 0.6500 9.0670 0.0830 0.0790 0.0199 0.0015 0.0014 0.1640 0.0380 0.0370 7.1600 0.0000 0.0000 -12.2000 2.7000 2.7000 1.0147 0.0024 0.0022 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9891 0.0018 0.0018 0.0000 0.0000 0.0000 10.8640 0.0700 0.0610 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2157.5000 2223.0000 0.9705 3830.0000 0.0067 0.0015 0.2228 0.0300 0.0067
260.0000 0.0060 4.4490 21.9912 16.4946 -0.0090 -0.0090 -10.0000 0.0364 0.0094 0.0090 2.7000 0.8300 0.8000 9.1320 0.0840 0.0800 0.0193 0.0014 0.0013 0.1550 0.0350 0.0350 7.1600 0.0000 0.0000 -7.6000 2.7000 2.7000 1.0140 0.0022 0.0021 -90.0000 0.0000 0.0000 90.0000 0.0000 0.0000 0.9907 0.0017 0.0017 0.0000 0.0000 0.0000 10.8540 0.0830 0.1010 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 2162.2000 2223.0000 0.9726 3831.0000 0.0061 0.0014 0.2229 0.0273 0.0063
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
<comment>
TrimSp information
</comment>
<trim_sp>
<data_path>./TRIMSP/</data_path>
<rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
<energy_vect start="1000" stop="22000" step="1000"/>
</trim_sp>
</depthProf>
@@ -0,0 +1,57 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.4157 0.0029 none 0 1
2 f2 0.22821 0.00058 none 0 1
3 f3 0.02658 0.00045 none 0 1
4 x1 42.3 1.0 none
5 x2 99.5008 0.0029 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3 4 5
###############################################################
RUN data/1300x_PECVD_Escan_260K_100G_withDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE DiaFrac
fit 1 22
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 2.5 22
###############################################################
STATISTIC --- 2023-01-31 11:22:41
chisq = 122.1, NDF = 14, chisq/NDF = 8.723769
@@ -0,0 +1,57 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.07038 0.00053 none
2 f2 0.03252 0.00055 none -0.5 1
3 x1 86.7 10.8 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3
###############################################################
RUN data/1300x_PECVD_Escan_260K_5G_noDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE Asym_muon
fit 1 22
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 0 22
###############################################################
STATISTIC --- 2023-02-16 15:29:27
chisq = 42.1, NDF = 6, chisq/NDF = 7.024748
Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

@@ -0,0 +1,55 @@
DEPTH PARTICLES
5. 1085
15. 2257
25. 2936
35. 3431
45. 3826
55. 4232
65. 4472
75. 4777
85. 4907
95. 5151
105. 5117
115. 5205
125. 5038
135. 4803
145. 4568
155. 4366
165. 3973
175. 3570
185. 3174
195. 2766
205. 2294
215. 1932
225. 1520
235. 1279
245. 950
255. 737
265. 503
275. 374
285. 243
295. 181
305. 126
315. 75
325. 45
335. 27
345. 15
355. 8
365. 2
375. 2
385. 0
395. 0
405. 0
415. 0
425. 0
435. 0
445. 0
455. 0
465. 0
475. 0
485. 0
495. 0
505. 0
515. 0
525. 0
535. 0
@@ -0,0 +1,128 @@
DEPTH PARTICLES
5. 7
15. 12
25. 20
35. 19
45. 23
55. 38
65. 23
75. 29
85. 33
95. 34
105. 33
115. 48
125. 38
135. 64
145. 47
155. 60
165. 48
175. 58
185. 65
195. 83
205. 80
215. 72
225. 74
235. 84
245. 87
255. 108
265. 90
275. 115
285. 126
295. 104
305. 163
315. 153
325. 150
335. 158
345. 142
355. 195
365. 204
375. 183
385. 208
395. 211
405. 251
415. 245
425. 291
435. 294
445. 340
455. 338
465. 382
475. 398
485. 420
495. 475
505. 480
515. 505
525. 578
535. 637
545. 677
555. 752
565. 746
575. 816
585. 879
595. 1020
605. 1000
615. 1153
625. 1192
635. 1417
645. 1402
655. 1478
665. 1644
675. 1717
685. 1749
695. 1958
705. 2029
715. 2156
725. 2277
735. 2460
745. 2549
755. 2666
765. 2914
775. 2952
785. 3034
795. 3217
805. 3201
815. 3337
825. 3326
835. 3339
845. 3243
855. 3202
865. 3113
875. 3013
885. 2849
895. 2628
905. 2448
915. 2155
925. 1858
935. 1584
945. 1306
955. 1036
965. 854
975. 626
985. 437
995. 324
1005. 307
1015. 165
1025. 77
1035. 27
1045. 5
1055. 2
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
@@ -0,0 +1,137 @@
DEPTH PARTICLES
5. 5
15. 5
25. 15
35. 15
45. 28
55. 23
65. 23
75. 27
85. 21
95. 37
105. 24
115. 29
125. 28
135. 44
145. 48
155. 46
165. 44
175. 45
185. 50
195. 53
205. 48
215. 59
225. 67
235. 51
245. 73
255. 85
265. 67
275. 79
285. 73
295. 95
305. 84
315. 88
325. 101
335. 107
345. 100
355. 126
365. 144
375. 120
385. 171
395. 146
405. 147
415. 175
425. 184
435. 205
445. 232
455. 238
465. 218
475. 237
485. 265
495. 279
505. 322
515. 334
525. 380
535. 426
545. 443
555. 424
565. 497
575. 544
585. 561
595. 561
605. 693
615. 714
625. 740
635. 832
645. 864
655. 924
665. 1018
675. 1108
685. 1094
695. 1197
705. 1264
715. 1357
725. 1570
735. 1600
745. 1650
755. 1817
765. 1924
775. 1936
785. 2128
795. 2243
805. 2346
815. 2541
825. 2609
835. 2766
845. 2827
855. 2990
865. 2999
875. 3090
885. 3040
895. 3146
905. 3202
915. 3192
925. 3114
935. 3080
945. 2964
955. 2814
965. 2629
975. 2340
985. 2091
995. 1843
1005. 2635
1015. 1996
1025. 1345
1035. 931
1045. 577
1055. 310
1065. 155
1075. 74
1085. 22
1095. 15
1105. 3
1115. 1
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
@@ -0,0 +1,144 @@
DEPTH PARTICLES
5. 1
15. 13
25. 11
35. 8
45. 18
55. 13
65. 12
75. 14
85. 16
95. 24
105. 23
115. 24
125. 28
135. 29
145. 29
155. 35
165. 25
175. 33
185. 37
195. 37
205. 30
215. 40
225. 52
235. 47
245. 49
255. 60
265. 59
275. 54
285. 51
295. 64
305. 60
315. 69
325. 62
335. 71
345. 48
355. 98
365. 97
375. 105
385. 91
395. 112
405. 130
415. 112
425. 134
435. 137
445. 155
455. 132
465. 165
475. 170
485. 192
495. 213
505. 228
515. 174
525. 229
535. 262
545. 286
555. 320
565. 319
575. 352
585. 378
595. 373
605. 396
615. 419
625. 466
635. 476
645. 560
655. 582
665. 605
675. 651
685. 675
695. 797
705. 796
715. 823
725. 942
735. 958
745. 1037
755. 1140
765. 1195
775. 1213
785. 1281
795. 1426
805. 1510
815. 1668
825. 1782
835. 1778
845. 1945
855. 2077
865. 2153
875. 2311
885. 2403
895. 2502
905. 2556
915. 2782
925. 2869
935. 2994
945. 2953
955. 3105
965. 2947
975. 3057
985. 2977
995. 2806
1005. 4704
1015. 4484
1025. 4038
1035. 3583
1045. 3104
1055. 2517
1065. 1902
1075. 1395
1085. 927
1095. 540
1105. 307
1115. 154
1125. 65
1135. 20
1145. 6
1155. 0
1165. 2
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
@@ -0,0 +1,151 @@
DEPTH PARTICLES
5. 3
15. 5
25. 10
35. 9
45. 14
55. 10
65. 5
75. 15
85. 18
95. 15
105. 30
115. 21
125. 15
135. 19
145. 28
155. 32
165. 30
175. 19
185. 27
195. 35
205. 25
215. 27
225. 32
235. 32
245. 27
255. 36
265. 34
275. 37
285. 32
295. 42
305. 43
315. 53
325. 55
335. 43
345. 62
355. 62
365. 60
375. 78
385. 66
395. 69
405. 81
415. 79
425. 84
435. 99
445. 83
455. 79
465. 108
475. 108
485. 112
495. 122
505. 146
515. 142
525. 163
535. 154
545. 149
555. 179
565. 199
575. 219
585. 211
595. 243
605. 305
615. 293
625. 320
635. 298
645. 299
655. 323
665. 383
675. 410
685. 423
695. 494
705. 531
715. 504
725. 578
735. 614
745. 610
755. 688
765. 709
775. 809
785. 848
795. 888
805. 1009
815. 1027
825. 1091
835. 1228
845. 1288
855. 1275
865. 1435
875. 1466
885. 1535
895. 1725
905. 1754
915. 1868
925. 1920
935. 2067
945. 2168
955. 2280
965. 2337
975. 2390
985. 2442
995. 2404
1005. 4622
1015. 4594
1025. 4645
1035. 4742
1045. 4683
1055. 4587
1065. 4305
1075. 4175
1085. 3515
1095. 3009
1105. 2458
1115. 1837
1125. 1301
1135. 909
1145. 573
1155. 290
1165. 179
1175. 79
1185. 30
1195. 12
1205. 3
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
@@ -0,0 +1,160 @@
DEPTH PARTICLES
5. 4
15. 0
25. 13
35. 12
45. 3
55. 13
65. 12
75. 13
85. 16
95. 19
105. 8
115. 16
125. 9
135. 8
145. 21
155. 22
165. 20
175. 16
185. 23
195. 23
205. 23
215. 26
225. 25
235. 28
245. 37
255. 26
265. 27
275. 39
285. 51
295. 38
305. 31
315. 32
325. 28
335. 48
345. 42
355. 57
365. 55
375. 56
385. 62
395. 57
405. 60
415. 60
425. 60
435. 74
445. 81
455. 77
465. 83
475. 72
485. 86
495. 110
505. 86
515. 104
525. 106
535. 108
545. 122
555. 145
565. 167
575. 145
585. 142
595. 161
605. 177
615. 186
625. 207
635. 213
645. 239
655. 237
665. 266
675. 306
685. 304
695. 315
705. 314
715. 362
725. 354
735. 372
745. 392
755. 438
765. 493
775. 472
785. 530
795. 557
805. 545
815. 649
825. 730
835. 656
845. 727
855. 841
865. 861
875. 895
885. 940
895. 988
905. 1116
915. 1141
925. 1188
935. 1309
945. 1335
955. 1446
965. 1534
975. 1560
985. 1651
995. 1722
1005. 3264
1015. 3379
1025. 3688
1035. 3695
1045. 4036
1055. 4218
1065. 4500
1075. 4620
1085. 4648
1095. 4579
1105. 4502
1115. 4213
1125. 3958
1135. 3524
1145. 3046
1155. 2451
1165. 2001
1175. 1364
1185. 1009
1195. 619
1205. 316
1215. 189
1225. 89
1235. 42
1245. 13
1255. 5
1265. 3
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
@@ -0,0 +1,171 @@
DEPTH PARTICLES
5. 1
15. 4
25. 10
35. 11
45. 16
55. 11
65. 6
75. 13
85. 6
95. 18
105. 15
115. 16
125. 14
135. 14
145. 11
155. 15
165. 15
175. 17
185. 15
195. 18
205. 21
215. 18
225. 23
235. 17
245. 17
255. 27
265. 24
275. 23
285. 38
295. 21
305. 23
315. 22
325. 26
335. 29
345. 28
355. 40
365. 44
375. 30
385. 40
395. 37
405. 57
415. 43
425. 24
435. 41
445. 47
455. 55
465. 54
475. 64
485. 67
495. 64
505. 69
515. 72
525. 72
535. 94
545. 92
555. 85
565. 100
575. 101
585. 99
595. 118
605. 104
615. 140
625. 120
635. 132
645. 159
655. 139
665. 181
675. 178
685. 174
695. 202
705. 218
715. 254
725. 229
735. 234
745. 254
755. 308
765. 273
775. 297
785. 347
795. 370
805. 409
815. 385
825. 451
835. 470
845. 477
855. 458
865. 568
875. 619
885. 605
895. 650
905. 690
915. 746
925. 784
935. 815
945. 876
955. 874
965. 989
975. 1010
985. 1113
995. 1146
1005. 2027
1015. 2185
1025. 2309
1035. 2646
1045. 2743
1055. 3051
1065. 3262
1075. 3511
1085. 3716
1095. 3893
1105. 4147
1115. 4266
1125. 4356
1135. 4592
1145. 4520
1155. 4354
1165. 4075
1175. 3994
1185. 3577
1195. 3044
1205. 2582
1215. 2073
1225. 1482
1235. 1061
1245. 679
1255. 430
1265. 227
1275. 124
1285. 65
1295. 22
1305. 6
1315. 3
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
@@ -0,0 +1,178 @@
DEPTH PARTICLES
5. 0
15. 3
25. 8
35. 5
45. 4
55. 10
65. 6
75. 9
85. 8
95. 9
105. 10
115. 7
125. 11
135. 13
145. 19
155. 14
165. 10
175. 16
185. 16
195. 23
205. 14
215. 22
225. 17
235. 22
245. 19
255. 18
265. 16
275. 21
285. 23
295. 22
305. 19
315. 28
325. 36
335. 18
345. 23
355. 32
365. 32
375. 31
385. 28
395. 38
405. 37
415. 33
425. 33
435. 33
445. 44
455. 40
465. 49
475. 39
485. 43
495. 57
505. 46
515. 47
525. 61
535. 63
545. 66
555. 72
565. 77
575. 83
585. 78
595. 87
605. 80
615. 98
625. 102
635. 106
645. 103
655. 116
665. 118
675. 149
685. 141
695. 137
705. 150
715. 165
725. 130
735. 154
745. 175
755. 194
765. 179
775. 201
785. 223
795. 246
805. 229
815. 239
825. 250
835. 301
845. 320
855. 326
865. 355
875. 362
885. 374
895. 411
905. 437
915. 436
925. 451
935. 513
945. 541
955. 563
965. 589
975. 600
985. 643
995. 673
1005. 1320
1015. 1335
1025. 1475
1035. 1612
1045. 1760
1055. 1976
1065. 2166
1075. 2333
1085. 2472
1095. 2763
1105. 2836
1115. 3142
1125. 3328
1135. 3592
1145. 3795
1155. 4133
1165. 4215
1175. 4289
1185. 4387
1195. 4246
1205. 4430
1215. 4063
1225. 4026
1235. 3637
1245. 3269
1255. 2724
1265. 2188
1275. 1656
1285. 1178
1295. 867
1305. 508
1315. 335
1325. 163
1335. 89
1345. 37
1355. 9
1365. 6
1375. 0
1385. 0
1395. 1
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
@@ -0,0 +1,185 @@
DEPTH PARTICLES
5. 3
15. 3
25. 8
35. 6
45. 10
55. 8
65. 8
75. 6
85. 7
95. 7
105. 11
115. 7
125. 5
135. 8
145. 12
155. 18
165. 8
175. 12
185. 11
195. 17
205. 11
215. 18
225. 10
235. 10
245. 13
255. 12
265. 15
275. 22
285. 17
295. 11
305. 15
315. 27
325. 27
335. 22
345. 21
355. 24
365. 22
375. 32
385. 23
395. 13
405. 31
415. 24
425. 28
435. 33
445. 32
455. 33
465. 26
475. 27
485. 34
495. 35
505. 35
515. 38
525. 41
535. 51
545. 36
555. 48
565. 55
575. 63
585. 72
595. 58
605. 71
615. 67
625. 74
635. 69
645. 73
655. 73
665. 99
675. 89
685. 95
695. 83
705. 91
715. 103
725. 128
735. 109
745. 119
755. 118
765. 123
775. 128
785. 155
795. 156
805. 171
815. 192
825. 221
835. 224
845. 175
855. 225
865. 231
875. 223
885. 255
895. 234
905. 276
915. 325
925. 284
935. 321
945. 351
955. 365
965. 393
975. 397
985. 442
995. 442
1005. 804
1015. 870
1025. 973
1035. 980
1045. 1093
1055. 1255
1065. 1314
1075. 1492
1085. 1552
1095. 1700
1105. 1845
1115. 2058
1125. 2218
1135. 2442
1145. 2541
1155. 2768
1165. 3028
1175. 3267
1185. 3480
1195. 3737
1205. 3937
1215. 4003
1225. 4200
1235. 4187
1245. 4320
1255. 4206
1265. 4140
1275. 3963
1285. 3653
1295. 3389
1305. 2748
1315. 2467
1325. 1935
1335. 1425
1345. 1047
1355. 655
1365. 411
1375. 235
1385. 158
1395. 69
1405. 36
1415. 7
1425. 7
1435. 1
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
@@ -0,0 +1,197 @@
DEPTH PARTICLES
5. 2
15. 1
25. 1
35. 4
45. 3
55. 9
65. 9
75. 2
85. 10
95. 10
105. 6
115. 3
125. 5
135. 14
145. 9
155. 15
165. 10
175. 9
185. 4
195. 8
205. 10
215. 10
225. 12
235. 12
245. 7
255. 12
265. 17
275. 12
285. 15
295. 12
305. 20
315. 18
325. 14
335. 15
345. 19
355. 5
365. 21
375. 21
385. 20
395. 23
405. 12
415. 19
425. 24
435. 34
445. 25
455. 21
465. 20
475. 26
485. 29
495. 30
505. 18
515. 39
525. 43
535. 32
545. 33
555. 35
565. 42
575. 28
585. 41
595. 35
605. 47
615. 43
625. 46
635. 69
645. 34
655. 63
665. 60
675. 52
685. 59
695. 78
705. 63
715. 81
725. 79
735. 84
745. 91
755. 86
765. 87
775. 104
785. 110
795. 121
805. 108
815. 114
825. 122
835. 117
845. 130
855. 157
865. 141
875. 160
885. 165
895. 179
905. 201
915. 200
925. 203
935. 205
945. 212
955. 231
965. 245
975. 280
985. 296
995. 260
1005. 531
1015. 536
1025. 591
1035. 651
1045. 689
1055. 756
1065. 870
1075. 935
1085. 966
1095. 1111
1105. 1177
1115. 1216
1125. 1388
1135. 1448
1145. 1572
1155. 1859
1165. 1996
1175. 2155
1185. 2277
1195. 2516
1205. 2680
1215. 2940
1225. 3063
1235. 3276
1245. 3471
1255. 3667
1265. 3803
1275. 3880
1285. 4168
1295. 4167
1305. 4319
1315. 3979
1325. 4171
1335. 3878
1345. 3426
1355. 3159
1365. 2706
1375. 2207
1385. 1691
1395. 1260
1405. 926
1415. 626
1425. 379
1435. 229
1445. 110
1455. 60
1465. 27
1475. 11
1485. 5
1495. 2
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
@@ -0,0 +1,203 @@
DEPTH PARTICLES
5. 1
15. 5
25. 2
35. 8
45. 5
55. 5
65. 4
75. 6
85. 6
95. 9
105. 11
115. 5
125. 5
135. 8
145. 5
155. 7
165. 4
175. 12
185. 8
195. 12
205. 11
215. 12
225. 11
235. 8
245. 7
255. 8
265. 8
275. 11
285. 14
295. 11
305. 8
315. 17
325. 17
335. 5
345. 12
355. 23
365. 19
375. 19
385. 9
395. 13
405. 15
415. 13
425. 16
435. 13
445. 15
455. 16
465. 14
475. 21
485. 28
495. 15
505. 23
515. 17
525. 29
535. 20
545. 29
555. 27
565. 31
575. 34
585. 42
595. 37
605. 39
615. 29
625. 41
635. 57
645. 41
655. 31
665. 44
675. 50
685. 51
695. 52
705. 52
715. 54
725. 56
735. 51
745. 66
755. 59
765. 71
775. 59
785. 67
795. 88
805. 75
815. 78
825. 102
835. 91
845. 97
855. 102
865. 124
875. 112
885. 122
895. 119
905. 141
915. 136
925. 127
935. 125
945. 166
955. 158
965. 188
975. 165
985. 177
995. 192
1005. 345
1015. 367
1025. 405
1035. 439
1045. 450
1055. 448
1065. 528
1075. 652
1085. 614
1095. 687
1105. 717
1115. 840
1125. 902
1135. 992
1145. 1025
1155. 1115
1165. 1267
1175. 1318
1185. 1427
1195. 1578
1205. 1764
1215. 1762
1225. 2022
1235. 2187
1245. 2270
1255. 2518
1265. 2696
1275. 2911
1285. 3090
1295. 3202
1305. 3494
1315. 3725
1325. 3828
1335. 3881
1345. 3990
1355. 4101
1365. 4127
1375. 4030
1385. 3921
1395. 3674
1405. 3282
1415. 2889
1425. 2549
1435. 2105
1445. 1637
1455. 1230
1465. 873
1475. 606
1485. 358
1495. 205
1505. 124
1515. 66
1525. 30
1535. 17
1545. 9
1555. 0
1565. 1
1575. 0
1585. 0
1595. 0
1605. 0
1615. 0
1625. 0
1635. 0
1645. 0
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
@@ -0,0 +1,66 @@
DEPTH PARTICLES
5. 232
15. 535
25. 712
35. 913
45. 1012
55. 1271
65. 1431
75. 1604
85. 1828
95. 2037
105. 2178
115. 2547
125. 2861
135. 3030
145. 3383
155. 3769
165. 3942
175. 4109
185. 4356
195. 4519
205. 4366
215. 4539
225. 4489
235. 4474
245. 4256
255. 4081
265. 3849
275. 3453
285. 3098
295. 2620
305. 2335
315. 1837
325. 1513
335. 1216
345. 917
355. 712
365. 467
375. 327
385. 251
395. 133
405. 92
415. 59
425. 37
435. 12
445. 9
455. 3
465. 2
475. 2
485. 1
495. 0
505. 0
515. 0
525. 0
535. 0
545. 0
555. 0
565. 0
575. 0
585. 0
595. 0
605. 0
615. 0
625. 0
635. 0
645. 0
@@ -0,0 +1,215 @@
DEPTH PARTICLES
5. 1
15. 1
25. 1
35. 2
45. 2
55. 6
65. 5
75. 6
85. 8
95. 7
105. 12
115. 5
125. 4
135. 4
145. 9
155. 3
165. 7
175. 9
185. 4
195. 13
205. 6
215. 12
225. 8
235. 13
245. 7
255. 6
265. 10
275. 5
285. 12
295. 8
305. 12
315. 8
325. 9
335. 6
345. 19
355. 11
365. 12
375. 21
385. 17
395. 13
405. 19
415. 16
425. 22
435. 21
445. 20
455. 13
465. 21
475. 22
485. 16
495. 22
505. 25
515. 17
525. 21
535. 14
545. 22
555. 33
565. 26
575. 30
585. 21
595. 23
605. 26
615. 21
625. 30
635. 28
645. 30
655. 34
665. 32
675. 44
685. 47
695. 36
705. 48
715. 37
725. 37
735. 59
745. 52
755. 50
765. 48
775. 49
785. 45
795. 68
805. 51
815. 63
825. 68
835. 51
845. 72
855. 60
865. 71
875. 72
885. 89
895. 98
905. 86
915. 94
925. 113
935. 110
945. 95
955. 109
965. 110
975. 124
985. 112
995. 133
1005. 251
1015. 256
1025. 252
1035. 298
1045. 313
1055. 340
1065. 335
1075. 391
1085. 423
1095. 461
1105. 492
1115. 517
1125. 589
1135. 638
1145. 639
1155. 736
1165. 808
1175. 813
1185. 937
1195. 1011
1205. 1067
1215. 1176
1225. 1264
1235. 1302
1245. 1486
1255. 1578
1265. 1741
1275. 1855
1285. 1979
1295. 2103
1305. 2377
1315. 2546
1325. 2636
1335. 2834
1345. 3077
1355. 3227
1365. 3420
1375. 3650
1385. 3655
1395. 3809
1405. 3927
1415. 4062
1425. 3909
1435. 3911
1445. 3718
1455. 3544
1465. 3202
1475. 2855
1485. 2480
1495. 2132
1505. 1654
1515. 1274
1525. 911
1535. 621
1545. 401
1555. 270
1565. 145
1575. 71
1585. 34
1595. 16
1605. 3
1615. 1
1625. 0
1635. 0
1645. 1
1655. 0
1665. 0
1675. 0
1685. 0
1695. 0
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
@@ -0,0 +1,225 @@
DEPTH PARTICLES
5. 0
15. 4
25. 5
35. 1
45. 10
55. 7
65. 2
75. 2
85. 7
95. 6
105. 5
115. 0
125. 4
135. 4
145. 4
155. 7
165. 8
175. 5
185. 3
195. 10
205. 6
215. 12
225. 4
235. 4
245. 9
255. 6
265. 8
275. 4
285. 6
295. 8
305. 8
315. 11
325. 7
335. 7
345. 5
355. 4
365. 11
375. 13
385. 6
395. 9
405. 17
415. 18
425. 13
435. 11
445. 12
455. 12
465. 13
475. 10
485. 18
495. 20
505. 13
515. 18
525. 11
535. 16
545. 12
555. 19
565. 20
575. 19
585. 20
595. 26
605. 28
615. 21
625. 25
635. 28
645. 40
655. 16
665. 28
675. 27
685. 31
695. 37
705. 29
715. 38
725. 25
735. 35
745. 31
755. 35
765. 43
775. 36
785. 39
795. 51
805. 42
815. 40
825. 44
835. 49
845. 56
855. 61
865. 40
875. 62
885. 61
895. 54
905. 67
915. 75
925. 73
935. 89
945. 67
955. 91
965. 78
975. 79
985. 89
995. 95
1005. 162
1015. 170
1025. 173
1035. 190
1045. 205
1055. 236
1065. 219
1075. 266
1085. 255
1095. 297
1105. 318
1115. 327
1125. 379
1135. 401
1145. 389
1155. 409
1165. 485
1175. 550
1185. 577
1195. 528
1205. 640
1215. 754
1225. 766
1235. 871
1245. 920
1255. 1030
1265. 1080
1275. 1147
1285. 1237
1295. 1430
1305. 1468
1315. 1633
1325. 1709
1335. 1758
1345. 2049
1355. 2205
1365. 2278
1375. 2600
1385. 2673
1395. 2854
1405. 3043
1415. 3121
1425. 3394
1435. 3482
1445. 3553
1455. 3721
1465. 3959
1475. 3878
1485. 3842
1495. 3866
1505. 3611
1515. 3592
1525. 3299
1535. 2778
1545. 2497
1555. 2064
1565. 1703
1575. 1413
1585. 984
1595. 693
1605. 449
1615. 290
1625. 180
1635. 94
1645. 43
1655. 29
1665. 10
1675. 4
1685. 1
1695. 1
1705. 0
1715. 0
1725. 0
1735. 0
1745. 0
1755. 0
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
@@ -0,0 +1,233 @@
DEPTH PARTICLES
5. 0
15. 4
25. 1
35. 3
45. 3
55. 3
65. 2
75. 5
85. 4
95. 7
105. 6
115. 4
125. 5
135. 3
145. 4
155. 5
165. 3
175. 9
185. 6
195. 4
205. 4
215. 13
225. 4
235. 3
245. 10
255. 4
265. 9
275. 11
285. 6
295. 5
305. 10
315. 9
325. 13
335. 7
345. 8
355. 5
365. 7
375. 7
385. 7
395. 9
405. 10
415. 11
425. 5
435. 11
445. 12
455. 9
465. 12
475. 19
485. 9
495. 12
505. 16
515. 10
525. 15
535. 12
545. 14
555. 4
565. 17
575. 13
585. 12
595. 19
605. 19
615. 18
625. 16
635. 24
645. 24
655. 19
665. 31
675. 25
685. 21
695. 22
705. 40
715. 25
725. 24
735. 26
745. 28
755. 39
765. 23
775. 34
785. 34
795. 38
805. 27
815. 26
825. 37
835. 35
845. 49
855. 42
865. 49
875. 43
885. 48
895. 40
905. 43
915. 47
925. 58
935. 54
945. 54
955. 50
965. 58
975. 71
985. 59
995. 59
1005. 120
1015. 130
1025. 122
1035. 133
1045. 128
1055. 176
1065. 183
1075. 204
1085. 194
1095. 220
1105. 188
1115. 258
1125. 271
1135. 237
1145. 268
1155. 323
1165. 320
1175. 362
1185. 410
1195. 401
1205. 443
1215. 544
1225. 518
1235. 526
1245. 608
1255. 589
1265. 689
1275. 708
1285. 807
1295. 843
1305. 918
1315. 976
1325. 1077
1335. 1157
1345. 1284
1355. 1418
1365. 1491
1375. 1530
1385. 1649
1395. 1824
1405. 1953
1415. 2094
1425. 2268
1435. 2361
1445. 2522
1455. 2683
1465. 2878
1475. 3087
1485. 3272
1495. 3397
1505. 3520
1515. 3700
1525. 3630
1535. 3792
1545. 3889
1555. 3819
1565. 3629
1575. 3451
1585. 3224
1595. 2950
1605. 2581
1615. 2220
1625. 1843
1635. 1487
1645. 1117
1655. 812
1665. 547
1675. 364
1685. 225
1695. 124
1705. 82
1715. 32
1725. 17
1735. 5
1745. 1
1755. 2
1765. 0
1775. 0
1785. 0
1795. 0
1805. 0
1815. 0
1825. 0
1835. 0
1845. 0
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
2245. 0
2255. 0
2265. 0
2275. 0
2285. 0
2295. 0
2305. 0
2315. 0
@@ -0,0 +1,241 @@
DEPTH PARTICLES
5. 1
15. 4
25. 2
35. 3
45. 3
55. 2
65. 2
75. 3
85. 3
95. 9
105. 6
115. 3
125. 4
135. 4
145. 3
155. 8
165. 4
175. 6
185. 4
195. 1
205. 5
215. 8
225. 8
235. 5
245. 7
255. 8
265. 6
275. 4
285. 6
295. 5
305. 10
315. 11
325. 4
335. 7
345. 4
355. 9
365. 7
375. 11
385. 9
395. 6
405. 11
415. 7
425. 7
435. 9
445. 13
455. 9
465. 9
475. 13
485. 13
495. 13
505. 5
515. 15
525. 6
535. 20
545. 15
555. 14
565. 9
575. 13
585. 12
595. 17
605. 17
615. 18
625. 20
635. 19
645. 17
655. 14
665. 22
675. 22
685. 18
695. 20
705. 25
715. 19
725. 25
735. 11
745. 25
755. 31
765. 25
775. 15
785. 21
795. 25
805. 30
815. 28
825. 26
835. 27
845. 30
855. 30
865. 36
875. 31
885. 33
895. 36
905. 32
915. 22
925. 35
935. 33
945. 32
955. 27
965. 41
975. 38
985. 45
995. 51
1005. 90
1015. 104
1025. 101
1035. 120
1045. 89
1055. 116
1065. 102
1075. 107
1085. 113
1095. 129
1105. 162
1115. 170
1125. 189
1135. 186
1145. 167
1155. 187
1165. 230
1175. 247
1185. 234
1195. 258
1205. 328
1215. 345
1225. 322
1235. 356
1245. 362
1255. 406
1265. 462
1275. 465
1285. 537
1295. 490
1305. 580
1315. 588
1325. 642
1335. 698
1345. 785
1355. 835
1365. 929
1375. 917
1385. 1032
1395. 1146
1405. 1260
1415. 1295
1425. 1386
1435. 1553
1445. 1661
1455. 1725
1465. 1938
1475. 2080
1485. 2177
1495. 2244
1505. 2472
1515. 2513
1525. 2814
1535. 2976
1545. 3205
1555. 3321
1565. 3413
1575. 3455
1585. 3566
1595. 3788
1605. 3627
1615. 3705
1625. 3724
1635. 3500
1645. 3270
1655. 2979
1665. 2751
1675. 2481
1685. 2087
1695. 1689
1705. 1299
1715. 1050
1725. 724
1735. 461
1745. 319
1755. 219
1765. 108
1775. 75
1785. 23
1795. 22
1805. 4
1815. 2
1825. 0
1835. 0
1845. 1
1855. 0
1865. 0
1875. 0
1885. 0
1895. 0
1905. 0
1915. 0
1925. 0
1935. 0
1945. 0
1955. 0
1965. 0
1975. 0
1985. 0
1995. 0
2005. 0
2015. 0
2025. 0
2035. 0
2045. 0
2055. 0
2065. 0
2075. 0
2085. 0
2095. 0
2105. 0
2115. 0
2125. 0
2135. 0
2145. 0
2155. 0
2165. 0
2175. 0
2185. 0
2195. 0
2205. 0
2215. 0
2225. 0
2235. 0
2245. 0
2255. 0
2265. 0
2275. 0
2285. 0
2295. 0
2305. 0
2315. 0
2325. 0
2335. 0
2345. 0
2355. 0
2365. 0
2375. 0
2385. 0
2395. 0
@@ -0,0 +1,74 @@
DEPTH PARTICLES
5. 91
15. 231
25. 307
35. 380
45. 433
55. 559
65. 571
75. 666
85. 728
95. 886
105. 920
115. 1065
125. 1156
135. 1276
145. 1386
155. 1618
165. 1735
175. 1882
185. 2106
195. 2318
205. 2507
215. 2768
225. 2888
235. 3171
245. 3410
255. 3488
265. 3805
275. 3999
285. 4017
295. 4088
305. 4222
315. 4200
325. 4119
335. 4013
345. 3761
355. 3637
365. 3336
375. 3020
385. 2613
395. 2190
405. 1923
415. 1474
425. 1269
435. 871
445. 684
455. 499
465. 331
475. 207
485. 131
495. 88
505. 45
515. 26
525. 11
535. 7
545. 3
555. 0
565. 0
575. 0
585. 0
595. 0
605. 0
615. 0
625. 0
635. 0
645. 0
655. 0
665. 0
675. 0
685. 0
695. 0
705. 0
715. 0
725. 0
@@ -0,0 +1,82 @@
DEPTH PARTICLES
5. 53
15. 125
25. 165
35. 186
45. 228
55. 293
65. 335
75. 323
85. 353
95. 396
105. 493
115. 494
125. 564
135. 614
145. 708
155. 714
165. 855
175. 880
185. 953
195. 1139
205. 1213
215. 1415
225. 1444
235. 1639
245. 1719
255. 1882
265. 2091
275. 2249
285. 2493
295. 2568
305. 2897
315. 3020
325. 3065
335. 3373
345. 3435
355. 3782
365. 3844
375. 3909
385. 3950
395. 3968
405. 3944
415. 3861
425. 3723
435. 3490
445. 3258
455. 2875
465. 2556
475. 2219
485. 1957
495. 1616
505. 1279
515. 992
525. 812
535. 607
545. 399
555. 262
565. 148
575. 100
585. 47
595. 25
605. 13
615. 6
625. 4
635. 1
645. 0
655. 0
665. 0
675. 0
685. 0
695. 0
705. 0
715. 0
725. 0
735. 0
745. 0
755. 0
765. 0
775. 0
785. 0
795. 0
805. 0
@@ -0,0 +1,91 @@
DEPTH PARTICLES
5. 36
15. 86
25. 84
35. 131
45. 125
55. 157
65. 160
75. 202
85. 195
95. 239
105. 300
115. 301
125. 299
135. 332
145. 410
155. 392
165. 431
175. 511
185. 521
195. 612
205. 637
215. 679
225. 769
235. 831
245. 952
255. 997
265. 1116
275. 1175
285. 1338
295. 1376
305. 1504
315. 1713
325. 1836
335. 1944
345. 2157
355. 2275
365. 2436
375. 2643
385. 2784
395. 3001
405. 2979
415. 3258
425. 3329
435. 3471
445. 3662
455. 3627
465. 3838
475. 3756
485. 3792
495. 3620
505. 3403
515. 3270
525. 3305
535. 3004
545. 2598
555. 2334
565. 1892
575. 1534
585. 1229
595. 921
605. 663
615. 520
625. 292
635. 216
645. 118
655. 100
665. 45
675. 27
685. 13
695. 3
705. 2
715. 1
725. 0
735. 1
745. 0
755. 0
765. 0
775. 0
785. 0
795. 0
805. 0
815. 0
825. 0
835. 0
845. 0
855. 0
865. 0
875. 0
885. 0
895. 0
@@ -0,0 +1,99 @@
DEPTH PARTICLES
5. 28
15. 54
25. 72
35. 88
45. 79
55. 94
65. 117
75. 115
85. 150
95. 147
105. 161
115. 161
125. 199
135. 217
145. 209
155. 222
165. 257
175. 283
185. 329
195. 357
205. 385
215. 401
225. 483
235. 448
245. 536
255. 538
265. 637
275. 636
285. 667
295. 807
305. 815
315. 884
325. 1033
335. 1112
345. 1167
355. 1344
365. 1391
375. 1501
385. 1612
395. 1758
405. 1958
415. 2032
425. 2119
435. 2350
445. 2452
455. 2610
465. 2812
475. 2902
485. 3072
495. 3226
505. 3331
515. 3445
525. 3633
535. 3679
545. 3793
555. 3690
565. 3655
575. 3597
585. 3497
595. 3203
605. 2868
615. 2629
625. 2321
635. 1991
645. 1665
655. 1387
665. 1067
675. 755
685. 571
695. 409
705. 244
715. 179
725. 119
735. 55
745. 34
755. 15
765. 8
775. 4
785. 0
795. 3
805. 0
815. 0
825. 0
835. 1
845. 0
855. 0
865. 0
875. 0
885. 0
895. 0
905. 0
915. 0
925. 0
935. 0
945. 0
955. 0
965. 0
975. 0
@@ -0,0 +1,106 @@
DEPTH PARTICLES
5. 13
15. 29
25. 37
35. 50
45. 58
55. 86
65. 56
75. 80
85. 87
95. 96
105. 119
115. 111
125. 130
135. 133
145. 139
155. 161
165. 184
175. 190
185. 189
195. 213
205. 250
215. 247
225. 284
235. 285
245. 312
255. 313
265. 372
275. 348
285. 424
295. 497
305. 443
315. 539
325. 580
335. 614
345. 676
355. 697
365. 825
375. 905
385. 955
395. 1047
405. 1088
415. 1118
425. 1255
435. 1321
445. 1436
455. 1574
465. 1697
475. 1813
485. 1955
495. 2059
505. 2230
515. 2325
525. 2672
535. 2806
545. 2918
555. 2990
565. 3283
575. 3371
585. 3459
595. 3582
605. 3646
615. 3633
625. 3736
635. 3623
645. 3345
655. 3265
665. 3140
675. 2927
685. 2551
695. 2283
705. 2112
715. 1794
725. 1421
735. 1120
745. 867
755. 634
765. 465
775. 294
785. 168
795. 131
805. 79
815. 54
825. 22
835. 10
845. 3
855. 3
865. 0
875. 0
885. 1
895. 0
905. 0
915. 0
925. 0
935. 0
945. 0
955. 0
965. 0
975. 0
985. 0
995. 0
1005. 0
1015. 0
1025. 0
1035. 0
1045. 0
@@ -0,0 +1,113 @@
DEPTH PARTICLES
5. 10
15. 26
25. 43
35. 41
45. 43
55. 56
65. 47
75. 59
85. 71
95. 70
105. 84
115. 78
125. 74
135. 109
145. 92
155. 94
165. 119
175. 104
185. 137
195. 146
205. 162
215. 155
225. 176
235. 162
245. 193
255. 192
265. 189
275. 268
285. 226
295. 279
305. 309
315. 330
325. 370
335. 368
345. 446
355. 411
365. 491
375. 495
385. 499
395. 605
405. 605
415. 708
425. 744
435. 771
445. 909
455. 932
465. 1087
475. 1094
485. 1085
495. 1289
505. 1377
515. 1394
525. 1587
535. 1745
545. 1874
555. 2016
565. 2219
575. 2251
585. 2383
595. 2552
605. 2598
615. 2877
625. 2982
635. 3073
645. 3266
655. 3327
665. 3406
675. 3617
685. 3474
695. 3420
705. 3526
715. 3317
725. 3177
735. 3131
745. 2889
755. 2645
765. 2391
775. 2060
785. 1773
795. 1505
805. 1152
815. 875
825. 735
835. 522
845. 384
855. 233
865. 155
875. 130
885. 65
895. 27
905. 10
915. 14
925. 7
935. 2
945. 0
955. 1
965. 0
975. 0
985. 0
995. 0
1005. 0
1015. 0
1025. 0
1035. 0
1045. 0
1055. 0
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
@@ -0,0 +1,120 @@
DEPTH PARTICLES
5. 9
15. 14
25. 24
35. 22
45. 36
55. 35
65. 39
75. 43
85. 51
95. 51
105. 67
115. 55
125. 54
135. 62
145. 67
155. 73
165. 76
175. 93
185. 83
195. 100
205. 100
215. 108
225. 107
235. 141
245. 144
255. 127
265. 147
275. 139
285. 172
295. 201
305. 187
315. 230
325. 199
335. 267
345. 243
355. 273
365. 303
375. 323
385. 351
395. 385
405. 396
415. 383
425. 449
435. 480
445. 513
455. 574
465. 552
475. 618
485. 706
495. 804
505. 786
515. 833
525. 979
535. 1034
545. 1121
555. 1257
565. 1262
575. 1403
585. 1494
595. 1660
605. 1703
615. 1838
625. 1958
635. 2151
645. 2320
655. 2288
665. 2599
675. 2626
685. 2786
695. 2916
705. 3020
715. 3219
725. 3298
735. 3256
745. 3243
755. 3372
765. 3421
775. 3475
785. 3214
795. 3099
805. 3019
815. 2845
825. 2586
835. 2474
845. 2130
855. 1820
865. 1487
875. 1285
885. 987
895. 744
905. 564
915. 392
925. 277
935. 186
945. 129
955. 72
965. 29
975. 27
985. 10
995. 6
1005. 3
1015. 0
1025. 0
1035. 0
1045. 0
1055. 0
1065. 0
1075. 0
1085. 0
1095. 0
1105. 0
1115. 0
1125. 0
1135. 0
1145. 0
1155. 0
1165. 0
1175. 0
1185. 0
@@ -0,0 +1,20 @@
dataT dataTErr dataB dataE dataTr dataRALRAR dataRATRAB dataSpinRot Asy AsyPosErr AsyNegErr Sigma SigmaPosErr SigmaNegErr Ph PhPosErr PhNegErr Field FieldPosErr FieldNegErr RelPh_L RelPh_LPosErr RelPh_LNegErr N0_L N0_LPosErr N0_LNegErr N_bkg_L N_bkg_LPosErr N_bkg_LNegErr RelPh_T RelPh_TPosErr RelPh_TNegErr N0_T N0_TPosErr N0_TNegErr N_bkg_T N_bkg_TPosErr N_bkg_TNegErr RelPh_R RelPh_RPosErr RelPh_RNegErr alpha_LR alpha_LRPosErr alpha_LRNegErr N_bkg_R N_bkg_RPosErr N_bkg_RNegErr RelPh_B RelPh_BPosErr RelPh_BNegErr alpha_TB alpha_TBPosErr alpha_TBNegErr N_bkg_B N_bkg_BPosErr N_bkg_BNegErr maxLH NDF maxLHred RUN AsymCorrected AsymCorrectedErr AsymAg DiaFrac DiaFracErr
259.9980 0.0050 99.4870 21.9908 16.4943 -0.0090 -0.0090 -10.0000 0.0189 0.0009 0.0009 0.2110 0.0370 0.0380 6.9000 3.3000 3.3000 102.0700 0.3500 0.3600 0.0000 0.0000 0.0000 307.1100 0.3400 0.3500 6.4110 0.0520 0.0520 -90.0000 0.0000 0.0000 318.1600 0.3500 0.3400 6.6130 0.0520 0.0530 180.0000 0.0000 0.0000 0.9960 0.0016 0.0016 6.6640 0.0530 0.0520 90.0000 0.0000 0.0000 0.9709 0.0015 0.0015 6.4340 0.0520 0.0520 3626.0000 3648.0000 0.9940 1768.0000 0.0056 0.0009 0.2229 0.0253 0.0041
260.0010 0.0050 99.4860 20.9917 16.4944 -0.0100 -0.0090 -10.0000 0.0173 0.0008 0.0008 0.1150 0.0380 0.0480 14.6000 3.3000 3.3000 101.5700 0.2900 0.2900 0.0000 0.0000 0.0000 307.7100 0.3400 0.3400 6.2450 0.0520 0.0520 -90.0000 0.0000 0.0000 319.7600 0.3500 0.3500 6.4440 0.0530 0.0530 180.0000 0.0000 0.0000 0.9888 0.0016 0.0016 6.6200 0.0520 0.0520 90.0000 0.0000 0.0000 0.9675 0.0015 0.0015 6.2600 0.0520 0.0520 3534.0000 3648.0000 0.9688 1769.0000 0.0041 0.0008 0.2228 0.0186 0.0036
259.9990 0.0040 99.4850 19.9929 16.4944 -0.0090 -0.0090 -10.0000 0.0189 0.0008 0.0008 0.1850 0.0310 0.0320 12.8000 3.2000 3.2000 101.5500 0.3300 0.3300 0.0000 0.0000 0.0000 307.4900 0.3400 0.3400 6.1700 0.0520 0.0510 -90.0000 0.0000 0.0000 318.8100 0.3500 0.3500 6.4530 0.0520 0.0530 180.0000 0.0000 0.0000 0.9956 0.0016 0.0016 6.5020 0.0520 0.0520 90.0000 0.0000 0.0000 0.9658 0.0015 0.0015 6.3610 0.0520 0.0520 3714.3000 3648.0000 1.0182 1770.0000 0.0057 0.0008 0.2226 0.0257 0.0038
260.0000 0.0040 99.4800 18.9936 16.4944 -0.0090 -0.0090 -10.0000 0.0224 0.0009 0.0009 0.1440 0.0310 0.0350 11.3000 2.5000 2.5000 101.4700 0.2400 0.2400 0.0000 0.0000 0.0000 309.8000 0.3400 0.3400 6.1220 0.0520 0.0520 -90.0000 0.0000 0.0000 320.2200 0.3500 0.3500 6.4730 0.0530 0.0530 180.0000 0.0000 0.0000 0.9840 0.0016 0.0015 6.5210 0.0520 0.0520 90.0000 0.0000 0.0000 0.9671 0.0015 0.0015 6.3290 0.0520 0.0520 3693.7000 3648.0000 1.0125 1771.0000 0.0091 0.0009 0.2224 0.0411 0.0038
260.0000 0.0040 99.4840 17.9948 16.4944 -0.0090 -0.0090 -10.0000 0.0227 0.0008 0.0008 0.1160 0.0280 0.0330 7.8000 2.6000 2.6000 101.5600 0.2300 0.2300 0.0000 0.0000 0.0000 309.8600 0.3400 0.3400 6.2460 0.0520 0.0520 -90.0000 0.0000 0.0000 318.6400 0.3500 0.3500 6.5590 0.0530 0.0530 180.0000 0.0000 0.0000 0.9908 0.0016 0.0016 6.5410 0.0520 0.0520 90.0000 0.0000 0.0000 0.9674 0.0015 0.0015 6.2850 0.0520 0.0520 3799.8999 3648.0000 1.0416 1772.0000 0.0094 0.0008 0.2221 0.0425 0.0036
259.9990 0.0030 99.4800 16.9956 16.4944 -0.0090 -0.0090 -10.0000 0.0245 0.0008 0.0008 0.0550 0.0350 0.0550 9.7000 2.3000 2.3000 101.5300 0.1900 0.1900 0.0000 0.0000 0.0000 310.9500 0.3400 0.3400 6.1020 0.0520 0.0520 -90.0000 0.0000 0.0000 319.5300 0.3500 0.3500 6.3210 0.0530 0.0520 180.0000 0.0000 0.0000 0.9998 0.0016 0.0016 6.5870 0.0530 0.0520 90.0000 0.0000 0.0000 0.9641 0.0015 0.0015 6.2840 0.0520 0.0520 3579.0000 3648.0000 0.9811 1773.0000 0.0112 0.0008 0.2218 0.0507 0.0034
260.0010 0.0050 99.4830 15.9969 16.4944 -0.0090 -0.0100 -10.0000 0.0270 0.0008 0.0008 0.0940 0.0250 0.0310 18.5000 2.1000 2.1000 101.0900 0.1800 0.1800 0.0000 0.0000 0.0000 310.8400 0.3400 0.3400 6.1600 0.0520 0.0520 -90.0000 0.0000 0.0000 319.8000 0.3500 0.3500 6.4640 0.0530 0.0530 180.0000 0.0000 0.0000 0.9856 0.0016 0.0015 6.6430 0.0520 0.0520 90.0000 0.0000 0.0000 0.9620 0.0015 0.0015 6.2280 0.0520 0.0520 3668.1001 3648.0000 1.0055 1774.0000 0.0138 0.0008 0.2214 0.0622 0.0035
260.0000 0.0050 99.4800 14.9896 16.4944 -0.0090 -0.0100 -10.0000 0.0321 0.0008 0.0008 0.1090 0.0210 0.0240 21.3000 1.8000 1.8000 100.6400 0.1500 0.1600 0.0000 0.0000 0.0000 310.5100 0.3400 0.3400 6.0220 0.0520 0.0510 -90.0000 0.0000 0.0000 320.0000 0.3500 0.3500 6.3740 0.0520 0.0530 180.0000 0.0000 0.0000 0.9995 0.0016 0.0016 6.5310 0.0520 0.0520 90.0000 0.0000 0.0000 0.9638 0.0015 0.0015 6.2240 0.0520 0.0520 3688.7000 3648.0000 1.0112 1775.0000 0.0188 0.0008 0.2208 0.0852 0.0036
259.9990 0.0070 99.4840 13.9908 16.4944 -0.0100 -0.0100 -10.0000 0.0378 0.0008 0.0008 0.1390 0.0160 0.0170 13.9000 1.6000 1.6000 101.2900 0.1500 0.1500 0.0000 0.0000 0.0000 309.9200 0.3400 0.3500 6.2450 0.0520 0.0520 -90.0000 0.0000 0.0000 319.7900 0.3500 0.3500 6.3790 0.0520 0.0530 180.0000 0.0000 0.0000 1.0024 0.0016 0.0016 6.5540 0.0520 0.0520 90.0000 0.0000 0.0000 0.9592 0.0015 0.0015 6.2040 0.0520 0.0510 3584.0000 3648.0000 0.9825 1776.0000 0.0244 0.0008 0.2200 0.1109 0.0036
260.0010 0.0070 99.4800 12.9921 16.4944 -0.0090 -0.0100 -10.0000 0.0438 0.0008 0.0008 0.1140 0.0140 0.0150 11.7000 1.3000 1.3000 101.6000 0.1200 0.1200 0.0000 0.0000 0.0000 312.5200 0.3400 0.3500 6.1510 0.0520 0.0520 -90.0000 0.0000 0.0000 320.1200 0.3500 0.3400 6.3970 0.0520 0.0530 180.0000 0.0000 0.0000 0.9942 0.0016 0.0015 6.4640 0.0520 0.0520 90.0000 0.0000 0.0000 0.9622 0.0015 0.0015 6.1950 0.0520 0.0520 3427.6001 3648.0000 0.9396 1777.0000 0.0303 0.0008 0.2191 0.1385 0.0036
259.9980 0.0050 99.4800 11.9928 16.4945 -0.0090 -0.0090 -10.0000 0.0517 0.0008 0.0008 0.0930 0.0140 0.0160 14.3000 1.1000 1.1000 101.3650 0.0930 0.0930 0.0000 0.0000 0.0000 311.7100 0.3400 0.3500 6.0330 0.0520 0.0510 -90.0000 0.0000 0.0000 318.4700 0.3500 0.3400 6.3530 0.0520 0.0530 180.0000 0.0000 0.0000 0.9945 0.0016 0.0015 6.6250 0.0530 0.0520 90.0000 0.0000 0.0000 0.9632 0.0015 0.0015 6.0950 0.0520 0.0510 3576.7000 3648.0000 0.9805 1778.0000 0.0381 0.0008 0.2178 0.1751 0.0036
260.0020 0.0070 99.4760 10.9941 16.4945 -0.0100 -0.0090 -10.0000 0.0588 0.0008 0.0008 0.1200 0.0110 0.0110 15.0300 0.9900 0.9900 101.3480 0.0880 0.0880 0.0000 0.0000 0.0000 310.9300 0.3400 0.3400 6.2370 0.0520 0.0520 -90.0000 0.0000 0.0000 318.9400 0.3500 0.3400 6.3220 0.0520 0.0530 180.0000 0.0000 0.0000 0.9972 0.0016 0.0016 6.5920 0.0520 0.0520 90.0000 0.0000 0.0000 0.9630 0.0015 0.0015 6.1340 0.0520 0.0520 3697.3999 3648.0000 1.0135 1779.0000 0.0451 0.0008 0.2161 0.2085 0.0037
259.9990 0.0040 99.4780 9.9949 16.4944 -0.0090 -0.0090 -10.0000 0.0637 0.0008 0.0008 0.0840 0.0120 0.0130 18.0300 0.9000 0.8900 101.1790 0.0750 0.0760 0.0000 0.0000 0.0000 309.4700 0.3400 0.3400 6.1330 0.0520 0.0510 -90.0000 0.0000 0.0000 319.3200 0.3500 0.3500 6.2810 0.0520 0.0530 180.0000 0.0000 0.0000 1.0038 0.0016 0.0016 6.6150 0.0520 0.0530 90.0000 0.0000 0.0000 0.9603 0.0015 0.0015 6.0590 0.0520 0.0510 3728.6001 3648.0000 1.0221 1780.0000 0.0497 0.0008 0.2139 0.2321 0.0036
260.0010 0.0060 99.4820 8.9960 16.4945 -0.0090 -0.0090 -10.0000 0.0665 0.0008 0.0008 0.1030 0.0100 0.0110 18.6200 0.8600 0.8600 101.2670 0.0740 0.0740 0.0000 0.0000 0.0000 310.4800 0.3400 0.3500 5.9660 0.0520 0.0510 -90.0000 0.0000 0.0000 318.5100 0.3500 0.3400 6.3040 0.0520 0.0530 180.0000 0.0000 0.0000 0.9986 0.0016 0.0015 6.6620 0.0520 0.0530 90.0000 0.0000 0.0000 0.9627 0.0015 0.0015 6.1230 0.0520 0.0510 3587.3000 3648.0000 0.9834 1781.0000 0.0519 0.0008 0.2110 0.2462 0.0037
259.9990 0.0090 99.4800 6.9982 16.4945 -0.0090 -0.0090 -10.0000 0.0715 0.0008 0.0008 0.1211 0.0086 0.0091 17.1600 0.8200 0.8200 101.1230 0.0720 0.0730 0.0000 0.0000 0.0000 313.3200 0.3400 0.3500 5.9760 0.0520 0.0520 -90.0000 0.0000 0.0000 320.7800 0.3500 0.3500 6.2370 0.0520 0.0530 180.0000 0.0000 0.0000 0.9914 0.0016 0.0015 6.5660 0.0520 0.0520 90.0000 0.0000 0.0000 0.9568 0.0015 0.0015 6.0440 0.0520 0.0510 3532.3000 3648.0000 0.9683 1782.0000 0.0549 0.0008 0.2019 0.2721 0.0039
260.0010 0.0070 99.4800 5.0084 11.9989 -0.0080 -0.0080 -10.0000 0.0687 0.0008 0.0008 0.1333 0.0090 0.0093 19.4000 0.8400 0.8400 101.1300 0.0760 0.0760 0.0000 0.0000 0.0000 312.8000 0.3400 0.3500 5.6030 0.0510 0.0510 -90.0000 0.0000 0.0000 315.9700 0.3500 0.3400 5.8100 0.0510 0.0520 180.0000 0.0000 0.0000 1.0046 0.0016 0.0015 6.1330 0.0520 0.0520 90.0000 0.0000 0.0000 0.9559 0.0015 0.0015 5.5120 0.0510 0.0500 3703.7000 3648.0000 1.0153 1786.0000 0.0564 0.0008 0.1714 0.3291 0.0047
259.9990 0.0040 99.4800 4.0095 11.9989 -0.0080 -0.0080 -10.0000 0.0726 0.0008 0.0008 0.1520 0.0079 0.0080 18.6900 0.8300 0.8300 101.2350 0.0780 0.0780 0.0000 0.0000 0.0000 305.7300 0.3400 0.3400 5.5080 0.0510 0.0500 -90.0000 0.0000 0.0000 317.1300 0.3500 0.3400 5.8440 0.0520 0.0520 180.0000 0.0000 0.0000 1.0351 0.0016 0.0016 6.3320 0.0520 0.0520 90.0000 0.0000 0.0000 0.9532 0.0015 0.0015 5.7120 0.0510 0.0510 3675.3999 3648.0000 1.0075 1785.0000 0.0582 0.0008 0.1632 0.3564 0.0049
260.0000 0.0060 99.4800 3.0103 11.9989 -0.0080 -0.0080 -10.0000 0.0790 0.0008 0.0008 0.1489 0.0072 0.0073 18.9800 0.7500 0.7500 101.2100 0.0700 0.0700 0.0000 0.0000 0.0000 305.8800 0.3300 0.3400 4.7740 0.0500 0.0490 -90.0000 0.0000 0.0000 321.4400 0.3500 0.3400 5.1770 0.0510 0.0510 180.0000 0.0000 0.0000 1.0492 0.0016 0.0016 5.5870 0.0520 0.0510 90.0000 0.0000 0.0000 0.9542 0.0015 0.0015 4.9270 0.0500 0.0500 3820.3000 3648.0000 1.0472 1784.0000 0.0596 0.0008 0.1505 0.3960 0.0052
260.0010 0.0050 99.4800 2.0117 11.9990 -0.0080 -0.0080 -10.0000 0.0876 0.0008 0.0008 0.1596 0.0066 0.0068 20.6200 0.6800 0.6800 100.8890 0.0650 0.0650 0.0000 0.0000 0.0000 303.6100 0.3400 0.3400 5.4660 0.0510 0.0500 -90.0000 0.0000 0.0000 318.3500 0.3500 0.3400 5.7660 0.0510 0.0520 180.0000 0.0000 0.0000 1.0639 0.0017 0.0016 6.2660 0.0530 0.0530 90.0000 0.0000 0.0000 0.9477 0.0015 0.0015 5.6210 0.0510 0.0500 3815.1001 3648.0000 1.0458 1783.0000 0.0568 0.0008 0.1291 0.4397 0.0063
@@ -0,0 +1,10 @@
dataT dataTErr dataB dataE dataTr dataRALRAR dataRATRAB dataSpinRot Asym_Mu Asym_MuPosErr Asym_MuNegErr Lambda_Mu Lambda_MuPosErr Lambda_MuNegErr freq_Mu1 freq_Mu1PosErr freq_Mu1NegErr Asym_muon Asym_muonPosErr Asym_muonNegErr Sigma_muon Sigma_muonPosErr Sigma_muonNegErr field fieldPosErr fieldNegErr ph_LR ph_LRPosErr ph_LRNegErr Alpha_LR Alpha_LRPosErr Alpha_LRNegErr relph_TB relph_TBPosErr relph_TBNegErr relph_TB_Mu relph_TB_MuPosErr relph_TB_MuNegErr Alpha_TB Alpha_TBPosErr Alpha_TBNegErr Zero ZeroPosErr ZeroNegErr freqMu2 freqMu2PosErr freqMu2NegErr Asym_MuSiO2 Asym_MuSiO2PosErr Asym_MuSiO2NegErr Lambda_MuSiO2 Lambda_MuSiO2PosErr Lambda_MuSiO2NegErr freqMuSiO2 freqMuSiO2PosErr freqMuSiO2NegErr CHISQ NDF CHISQred RUN
259.999 0.006 4.48 21.9909 16.4945 -0.009 -0.009 -10 0.055 0.064 -0.021 7.2 5.8 -2.7 8.858 0.075 0.084 0.0282 0.0016 -0.0015 0.108 0.025 -0.028 6.03 0.17 0.18 -11.5 2.9 -2.9 0.9996 0.0026 -0.0025 -90 0 0 90 0 0 1.0013 0.0024 -0.0023 0 0 0 10.314 0.094 0.11 0 0 0 0 0 0 0 0 0 8745.7 8897 0.982994 1793
260 0.009 4.48 19.9929 16.4945 -0.009 -0.009 -10 0.037 0.02 -0.011 4.7 2.9 -1.5 8.858 0.075 0.084 0.0306 0.0019 -0.0017 0.137 0.027 -0.028 6.03 0.17 0.18 -11 3 -2.9 1.0026 0.0033 -0.003 -90 0 0 90 0 0 1.0027 0.0025 -0.0024 0 0 0 10.314 0.094 0.11 0 0 0 0 0 0 0 0 0 8745.7 8897 0.982994 1794
260 0.006 4.473 17.9949 16.4945 -0.009 -0.01 -10 0.046 0.017 -0.01 4.7 2 -1.2 8.858 0.075 0.084 0.0341 0.0018 -0.0017 0.212 0.022 -0.02 6.03 0.17 0.18 -13.3 2.4 -2.4 1.0115 0.0031 -0.0029 -90 0 0 90 0 0 0.9954 0.0021 -0.0021 0 0 0 10.314 0.094 0.11 0 0 0 0 0 0 0 0 0 8745.7 8897 0.982994 1795
260 0.007 4.475 15.997 16.4945 -0.009 -0.01 -10 0.0455 0.0104 -0.0083 3.7 1 -0.76 8.858 0.075 0.084 0.036 0.0019 -0.0018 0.21 0.023 -0.022 6.03 0.17 0.18 -6.1 2.4 -2.3 1.0039 0.0033 -0.0031 -90 0 0 90 0 0 1.0009 0.0022 -0.0021 0 0 0 10.314 0.094 0.11 0 0 0 0 0 0 0 0 0 8745.7 8897 0.982994 1796
260 0.007 4.476 13.9907 16.4945 -0.01 -0.01 -10 0.0258 0.0126 0.0087 2 1.4 0.87 10.16 0.12 0.1 0.0404 0.0039 0.0032 0.181 0.032 0.03 6.05 0.41 0.46 -0.6 4.5 4.4 0.9992 0.0061 0.0047 -90 0 0 90 0 0 1.0043 0.0052 0.0047 0 0 0 8.91 0.1 0.165 0 0 0 0 0 0 0 0 0 2038.1 2222 0.9172 1797
260 0.007 4.479 11.9929 16.4945 -0.009 -0.009 -10 0 0 0 0 0 0 9.2 9.9 9.9 0.0499 0.0008 0.0008 0.1606 0.0092 0.0092 7.0309 0.0077 0.0077 -7.81 0.57 0.57 0.995 0.0015 0.0015 -90 0 0 90 0 0 0.9879 0.0009 0.0009 0 0 0 -77.1 33.7 33.7 0.053 0.013 0.013 1.63 0.53 0.53 0 0 0 2197.2 2222 0.9888 1798
260 0.008 4.477 9.995 16.4945 -0.009 -0.009 -10 0 0 0 0 0 0 8.4 2.1 8.4 0.0589 0.0011 0.0011 0.119 0.01 0.01 7.004 0.013 0.014 -5 0.83 0.83 0.989 0.0018 0.0018 -90 0 0 90 0 0 0.9878 0.0016 0.0016 0 0 0 9.2 1.4 1.4 0.0855 0.0073 0.0067 1.53 0.2 0.17 0 0 0 2299.1001 2222 1.0347 1799
260 0.006 4.472 8.9961 16.4945 -0.01 -0.009 -10 0 0 0 0 0 0 10.214 0 0 0.0701 0.0011 0.001 0.0972 0.0091 0.0097 7.327 0.011 0.011 -3.59 0.67 0.67 0.9619 0.0017 0.0017 -90 0 0 90 0 0 0.988 0.0016 0.0016 0 0 0 6.764 0 0 0.0732 0.0055 0.0052 1.25 0.14 0.13 0 0 0 2343.2 2224 1.0536 1788
260 0.006 4.468 6.9983 16.4945 -0.01 -0.009 -10 0 0 0 0 0 0 10.214 0 0 0.0708 0.0011 0.0011 0.106 0.0086 0.009 7.295 0.016 0.017 -0.84 0.69 0.69 0.9535 0.0017 0.0017 -90 0 0 90 0 0 0.9884 0.0016 0.0016 0 0 0 6.764 0 0 0.0681 0.0064 0.0059 1.6 0.2 0.18 0 0 0 2271.8 2224 1.0215 1787
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
<comment>
TrimSp information
</comment>
<trim_sp>
<data_path>./TRIMSP/</data_path>
<rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
<energy_vect start="1000" stop="22000" step="1000"/>
</trim_sp>
</depthProf>
@@ -0,0 +1,55 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.11295 -0.00071 0.00071 0 1
2 f2 0.06790 -0.00078 0.00078
3 x1 107.83 0.17 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3
###############################################################
RUN data/Si10_260K_Escan_100GTF_withDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE Asy
fit 5 22
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 5 25
###############################################################
STATISTIC --- 2023-02-16 15:35:37
chisq = 18.8, NDF = 8, chisq/NDF = 2.354740
@@ -0,0 +1,55 @@
n/a
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 f1 0.49635 0.00035 none 0 1
2 f2 0.26714 0.00057 none
3 x1 107.4 3.3 none
###############################################################
THEORY
userFcn libPDepthProfile PDepthProfile 1 2 3
###############################################################
RUN data/Si10_260K_Escan_100GTF_withDiaFrac MUE4 PSI DAT (name beamline institute data-file-format)
fittype 8 (non muSR fit)
map 0 0 0 0 0 0 0 0 0 0
xy-data dataE DiaFrac
fit 5 22
packing 1
###############################################################
COMMANDS
MINIMIZE
#HESSE
MINOS
SAVE
###############################################################
PLOT 8 (non muSR plot)
runs 1
range 0 25
###############################################################
STATISTIC --- 2023-02-16 15:47:33
chisq = 13.2, NDF = 8, chisq/NDF = 1.645757
@@ -0,0 +1,54 @@
DEPTH PARTICLES
5. 99
15. 225
25. 275
35. 306
45. 345
55. 396
65. 419
75. 480
85. 478
95. 478
105. 510
115. 501
125. 505
135. 487
145. 456
155. 425
165. 389
175. 400
185. 330
195. 299
205. 252
215. 218
225. 191
235. 144
245. 112
255. 84
265. 76
275. 53
285. 36
295. 25
305. 24
315. 11
325. 6
335. 4
345. 3
355. 0
365. 0
375. 1
385. 0
395. 0
405. 0
415. 0
425. 0
435. 0
445. 0
455. 0
465. 0
475. 0
485. 0
495. 0
505. 0
515. 0
525. 0
@@ -0,0 +1,135 @@
DEPTH PARTICLES
5. 1
15. 2
25. 2
35. 0
45. 1
55. 0
65. 3
75. 3
85. 4
95. 7
105. 5
115. 4
125. 2
135. 3
145. 3
155. 7
165. 9
175. 4
185. 7
195. 4
205. 5
215. 9
225. 5
235. 8
245. 6
255. 6
265. 7
275. 13
285. 11
295. 12
305. 15
315. 10
325. 11
335. 13
345. 18
355. 16
365. 13
375. 21
385. 21
395. 21
405. 18
415. 18
425. 20
435. 18
445. 25
455. 25
465. 28
475. 38
485. 32
495. 38
505. 33
515. 47
525. 33
535. 36
545. 67
555. 52
565. 49
575. 59
585. 69
595. 88
605. 73
615. 85
625. 84
635. 92
645. 81
655. 102
665. 129
675. 132
685. 131
695. 137
705. 143
715. 153
725. 166
735. 157
745. 193
755. 210
765. 203
775. 205
785. 208
795. 241
805. 249
815. 227
825. 255
835. 278
845. 277
855. 267
865. 303
875. 297
885. 267
895. 316
905. 325
915. 303
925. 283
935. 257
945. 296
955. 254
965. 212
975. 221
985. 167
995. 178
1005. 145
1015. 145
1025. 98
1035. 71
1045. 76
1055. 45
1065. 37
1075. 26
1085. 12
1095. 12
1105. 3
1115. 4
1125. 1
1135. 1
1145. 0
1155. 1
1165. 0
1175. 0
1185. 0
1195. 0
1205. 0
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
@@ -0,0 +1,144 @@
DEPTH PARTICLES
5. 1
15. 4
25. 1
35. 2
45. 3
55. 2
65. 2
75. 5
85. 3
95. 4
105. 1
115. 1
125. 1
135. 3
145. 3
155. 3
165. 4
175. 6
185. 5
195. 4
205. 3
215. 1
225. 3
235. 7
245. 6
255. 8
265. 7
275. 7
285. 5
295. 3
305. 11
315. 11
325. 6
335. 8
345. 15
355. 15
365. 13
375. 10
385. 11
395. 17
405. 18
415. 17
425. 14
435. 19
445. 15
455. 17
465. 17
475. 22
485. 18
495. 31
505. 27
515. 33
525. 30
535. 33
545. 21
555. 31
565. 43
575. 38
585. 36
595. 26
605. 56
615. 46
625. 55
635. 63
645. 66
655. 68
665. 72
675. 68
685. 89
695. 99
705. 93
715. 99
725. 105
735. 113
745. 116
755. 117
765. 126
775. 130
785. 135
795. 163
805. 133
815. 179
825. 183
835. 187
845. 172
855. 224
865. 227
875. 245
885. 277
895. 268
905. 266
915. 269
925. 285
935. 249
945. 294
955. 241
965. 310
975. 279
985. 298
995. 297
1005. 245
1015. 283
1025. 222
1035. 247
1045. 204
1055. 214
1065. 235
1075. 189
1085. 146
1095. 128
1105. 96
1115. 77
1125. 56
1135. 57
1145. 27
1155. 17
1165. 12
1175. 5
1185. 5
1195. 3
1205. 1
1215. 0
1225. 0
1235. 0
1245. 0
1255. 0
1265. 0
1275. 0
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
@@ -0,0 +1,151 @@
DEPTH PARTICLES
5. 0
15. 1
25. 1
35. 1
45. 1
55. 2
65. 2
75. 3
85. 0
95. 1
105. 0
115. 1
125. 4
135. 1
145. 3
155. 4
165. 2
175. 3
185. 5
195. 2
205. 0
215. 2
225. 4
235. 6
245. 3
255. 9
265. 5
275. 7
285. 7
295. 3
305. 7
315. 7
325. 6
335. 9
345. 5
355. 8
365. 9
375. 7
385. 8
395. 8
405. 10
415. 11
425. 9
435. 14
445. 20
455. 9
465. 17
475. 14
485. 18
495. 15
505. 15
515. 22
525. 16
535. 19
545. 21
555. 20
565. 25
575. 29
585. 24
595. 25
605. 35
615. 35
625. 40
635. 30
645. 35
655. 41
665. 35
675. 51
685. 41
695. 49
705. 44
715. 50
725. 61
735. 58
745. 68
755. 89
765. 91
775. 103
785. 83
795. 103
805. 88
815. 101
825. 136
835. 117
845. 127
855. 168
865. 167
875. 147
885. 162
895. 192
905. 195
915. 196
925. 187
935. 190
945. 216
955. 215
965. 241
975. 237
985. 228
995. 242
1005. 266
1015. 288
1025. 274
1035. 276
1045. 266
1055. 325
1065. 314
1075. 314
1085. 301
1095. 300
1105. 267
1115. 263
1125. 241
1135. 208
1145. 183
1155. 167
1165. 139
1175. 109
1185. 70
1195. 56
1205. 44
1215. 27
1225. 22
1235. 21
1245. 6
1255. 4
1265. 2
1275. 3
1285. 0
1295. 0
1305. 0
1315. 0
1325. 0
1335. 0
1345. 0
1355. 0
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
@@ -0,0 +1,159 @@
DEPTH PARTICLES
5. 1
15. 0
25. 0
35. 0
45. 0
55. 1
65. 2
75. 1
85. 1
95. 1
105. 1
115. 2
125. 2
135. 5
145. 2
155. 5
165. 2
175. 5
185. 2
195. 5
205. 1
215. 5
225. 4
235. 3
245. 5
255. 7
265. 5
275. 3
285. 6
295. 3
305. 4
315. 5
325. 3
335. 7
345. 4
355. 1
365. 4
375. 6
385. 7
395. 2
405. 2
415. 10
425. 8
435. 4
445. 8
455. 13
465. 12
475. 8
485. 11
495. 12
505. 16
515. 15
525. 12
535. 15
545. 15
555. 14
565. 16
575. 13
585. 22
595. 21
605. 23
615. 18
625. 14
635. 27
645. 25
655. 23
665. 28
675. 27
685. 34
695. 36
705. 29
715. 41
725. 45
735. 39
745. 44
755. 47
765. 47
775. 35
785. 69
795. 64
805. 59
815. 75
825. 59
835. 73
845. 83
855. 81
865. 92
875. 96
885. 97
895. 113
905. 124
915. 107
925. 135
935. 159
945. 147
955. 156
965. 166
975. 161
985. 169
995. 172
1005. 198
1015. 201
1025. 190
1035. 206
1045. 234
1055. 272
1065. 279
1075. 286
1085. 321
1095. 301
1105. 306
1115. 314
1125. 345
1135. 326
1145. 314
1155. 316
1165. 315
1175. 295
1185. 254
1195. 219
1205. 208
1215. 187
1225. 171
1235. 112
1245. 130
1255. 73
1265. 59
1275. 34
1285. 34
1295. 25
1305. 18
1315. 5
1325. 7
1335. 2
1345. 0
1355. 2
1365. 0
1375. 0
1385. 0
1395. 0
1405. 0
1415. 0
1425. 0
1435. 0
1445. 0
1455. 0
1465. 0
1475. 0
1485. 0
1495. 0
1505. 0
1515. 0
1525. 0
1535. 0
1545. 0
1555. 0
1565. 0
1575. 0

Some files were not shown because too many files have changed in this diff Show More