.gitignore

-*.patch
 *~
+*.patch
+*.swp
+*.bak
+*.tmp
 *.o
 *_lex.cpp
 *_yacc.cpp
 *_yacc.h
-src/Makefile
-src/src.pro
 *.Plo
 *.Po
 *.lo
@@ -14,17 +15,33 @@ src/src.pro
 *.a
 *.so
 *.so.*
+*.pyc
+*.aux
+*.bbl
+*.blg
+*.idx
+*.ilg
+*.ind
+*.log
+*.nlo
+*.out
+*.toc
+a.out
+html/
 frida2-*/
-pub/src/frida2
-pub/config.h
-pub/stamp*
-Makefile
-*/Makefile
-autom4te.cache/*
-autom4te.cache
-config.log
-config.status
-pub/*/.deps
-pub/*/.libs
+frida
+external_ci
+gcc
+clang
+build
+mybuild
+qbuild
+podstyle.css
+pub/src/xax_yacc.hpp
 demo/lm_test
-libtool
+pub/py-binding/output
+pub/py-binding/cache.xml
+*.pypp.*
+pub/PyAPI/PythonModule.cpp
+doxygen_sqlite3.db
+CMakeLists.txt.user*

.gitlab-ci.yml

+stages:
+  - build
+
+mac_x64:
+  tags:
+  - mac_x64_cloud
+  stage: build
+  before_script:
+  # Homebrew packages are installed in a non-standard path
+  - BREWDIR="/opt/homebrew-x86/"
+  - PATH="$BREWDIR:$BREWDIR/opt/flex/bin:$BREWDIR/opt/bison/bin:$PATH"
+  - PYPLAT="/Users/qtisas/.pyenv/versions/3.11.6/"
+  - cmake --version
+  script:
+  - OPTDIR=/Users/Shared/Software/scg
+  - mkdir pub/build
+  - cd pub/build
+  - cmake -DCMAKE_PREFIX_PATH="$BREWDIR;$OPTDIR;$PYPLAT" -DCMAKE_BUILD_TYPE=Release -S ..
+  - make -j4
+  - ctest --output-on-failure --timeout 120
+  artifacts:
+    paths:
+    - build/*zip
+    expire_in: 10 days
+
+# windows:
+#   tags:
+#   - Windows
+#   stage: build
+#   script:
+#     - New-Item -ItemType "directory" -Confirm:$false -Force:$true -Name "build"
+#     - cd build
+#     - cmd.exe "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+#     - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DLIB_INSTALL=OFF -B. ..
+#     - cmake --build . --config Release
+#     - Get-Location
+#     - dir
+#     - dir Release
+#     - ctest -C Release --output-on-failure
+
+native_Debian_clang:
+  tags: &native
+  - Debian
+  before_script: &debian_clang
+  - export CC=clang; export CXX=clang++
+  - cmake --version
+  - clang --version
+  stage: build
+  script: &native_scr
+  - pwd && ls
+  - mkdir pub/build
+  - cd pub/build
+  - cmake ..
+  - make -j6
+  - ctest -j6 --output-on-failure
+
+# ## Dockerized:
+#
+# debS_clang:
+#   tags: &unix
+#   - Linux
+#   image: debian:stable
+#   before_script: &debian_clang
+#     - apt-get -y update
+#     - apt-get -y upgrade
+#     - apt-get -y install cmake perl pkgconf bison flex gnuplot-x11 git
+#     - apt-get -y install libreadline-dev libgsl-dev libfftw3-dev
+#     - apt-get -y install libboost-filesystem-dev libboost-dev libyaml-dev
+#     - apt-get -y install clang
+#     - git clone https://jugit.fz-juelich.de/mlz/kww.git
+#     - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+#     - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+#   stage: build
+#   script: &scr
+#     - pwd && ls
+#     - cd kww && mkdir build && cd build
+#     - cmake -DWERROR=ON .. && make -j3 && ctest && make install && cd ../..
+#     - cd lmfit && mkdir build && cd build
+#     - cmake -DWERROR=ON .. && make -j3 && ctest && make install && cd ../..
+#     - cd libcerf && mkdir build && cd build
+#     - cmake -DWERROR=ON .. && make -j3 && ctest && make install && cd ../..
+#     - cd pub
+#     - mkdir build
+#     - cd build
+#     - cmake -DWERROR=ON ..
+#     - make -j8
+#     - ctest --output-on-failure
+#
+# debS_gcc:
+#   tags: *unix
+#   image: debian:stable
+#   before_script: &debian_gcc
+#     - apt-get -y update
+#     - apt-get -y upgrade
+#     - apt-get -y install cmake perl pkgconf bison flex gnuplot-x11 git
+#     - apt-get -y install libreadline-dev libgsl-dev libfftw3-dev
+#     - apt-get -y install libboost-filesystem-dev libboost-dev libyaml-dev
+#     - apt-get -y install g++
+#     - git clone https://jugit.fz-juelich.de/mlz/kww.git
+#     - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+#     - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+#   stage: build
+#   script: *scr
+#
+# debT_clang:
+#   tags: *unix
+#   image: debian:testing
+#   before_script: *debian_clang
+#   stage: build
+#   script: *scr
+#
+# debT_gcc:
+#   tags: *unix
+#   image: debian:testing
+#   before_script: *debian_gcc
+#   stage: build
+#   script: *scr
+#
+# debU_clang:
+#   tags: *unix
+#   image: debian:unstable
+#   before_script: *debian_clang
+#   stage: build
+#   script: *scr
+#
+# debU_gcc:
+#   tags: *unix
+#   image: debian:unstable
+#   before_script: *debian_gcc
+#   stage: build
+#   script: *scr
+#
+# suse_clang:
+#   tags: *unix
+#   image: opensuse/tumbleweed
+#   # rolling release with infinite life time
+#   before_script:
+#     - zypper -n patch || echo "do it again"
+#     - zypper -n patch
+#     - zypper -n ref
+#     - zypper -n up
+#     - zypper -n dup
+#     - zypper -n in cmake perl pkgconf bison flex gnuplot git
+#     - zypper -n in readline-devel gsl-devel fftw3-devel libyaml-devel
+#     - zypper -n in boost-devel libboost_filesystem-devel
+#     - zypper -n in clang gcc glibc-devel libstdc++-devel
+#     - export CC=/usr/bin/clang
+#     - export CXX=/usr/bin/clang++
+#     - git clone https://jugit.fz-juelich.de/mlz/kww.git
+#     - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+#     - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+#   stage: build
+#   script: *scr
+#
+# suse_gcc:
+#   tags: *unix
+#   image: opensuse/tumbleweed
+#   # rolling release with infinite life time
+#   before_script:
+#     - zypper -n patch || echo "do it again"
+#     - zypper -n patch
+#     - zypper -n ref
+#     - zypper -n up
+#     - zypper -n dup
+#     - zypper -n in cmake perl pkgconf bison flex gnuplot git
+#     - zypper -n in readline-devel gsl-devel fftw3-devel libyaml-devel
+#     - zypper -n in boost-devel libboost_filesystem-devel
+#     - zypper -n in gcc-c++
+#     - git clone https://jugit.fz-juelich.de/mlz/kww.git
+#     - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+#     - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+#   stage: build
+#   script: *scr
+#
+# # suse_stable:
+# #  opensuse:leap, unsupported here because it is at cmake 3.5, while libcerf requires 3.6
+#
+# ## Centos7 permanently disabled because it does not fully support C++11
+# ##
+# ##centos7_clang:
+# ##  tags: *unix
+# ##  image: centos:centos7
+# ##  before_script:
+# ##    - yum -y update
+# ##    - yum -y install epel-release
+# ##    - yum repolist
+# ##    - yum -y install make cmake3 pkgconf perl bison flex gnuplot git
+# ##    - yum -y install readline-devel gsl-devel fftw3-devel libboost-filesystem boost-devel libyaml-devel
+# ##    - yum -y install clang gcc glibc-devel libstdc++-devel
+# ##    - export CC=/usr/bin/clang
+# ##    - export CXX=/usr/bin/clang++
+# ##    - git clone https://jugit.fz-juelich.de/mlz/kww.git
+# ##    - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+# ##    - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+# ##    - cmake3 --version
+# ##    - ctest3 --version
+# ##    - cpack3 --version
+# ##    - ln -s /usr/bin/cmake3 /usr/bin/cmake
+# ##    - ln -s /usr/bin/ctest3 /usr/bin/ctest
+# ##    - ln -s /usr/bin/cpack3 /usr/bin/cpack
+# ##  stage: build
+# ##  script: *scr
+# ##
+# ##centos7_gcc:
+# ##  tags: *unix
+# ##  image: centos:centos7
+# ##  before_script:
+# ##    - yum -y update
+# ##    - yum -y install epel-release
+# ##    - yum repolist
+# ##    - yum -y install make cmake3 pkgconf perl bison flex gnuplot git
+# ##    - yum -y install readline-devel gsl-devel fftw3-devel libboost-filesystem boost-devel libyaml-devel
+# ##    - yum -y install gcc-c++
+# ##    - git clone https://jugit.fz-juelich.de/mlz/kww.git
+# ##    - git clone https://jugit.fz-juelich.de/mlz/lmfit.git
+# ##    - git clone https://jugit.fz-juelich.de/mlz/libcerf.git
+# ##    - cmake3 --version
+# ##    - ctest3 --version
+# ##    - cpack3 --version
+# ##    - ln -s /usr/bin/cmake3 /usr/bin/cmake
+# ##    - ln -s /usr/bin/ctest3 /usr/bin/ctest
+# ##    - ln -s /usr/bin/cpack3 /usr/bin/cpack
+# ##  stage: build
+# ##  script: *scr

CHECKS

+run regularly under: valgrind --leak-check=full frida
\ No newline at end of file

CREATE_TGZ

-# resynchronize
-upgit
-dngit
-rm *~
-rm */*~
-rm */*/*~
-# copy everything
-export A=frida2-#<yymmdd>
-mkdir $A
-cp -r pub $A
-# cleanup and package
-cd $A/pub; make maintainer-clean;
-ls src # => check that .o have disappeared
-up; up
-tar czv -h -f /io/$A.tgz $A/*

PERF_LOG

+best-of-three real times
+
+               fit1a fit1b fit2b fit2c oyd1a
+
+
+v2.3.2g   o2   1.32  0.83  0.96  1.02  0.96
+b7ce45d   o2   1.31  0.75  0.92  1.03  0.96
+681796f   o2   1.32  0.83  0.88  1.03  0.96
+15ee5f8   o2   1.31  0.90  0.87  1.03  1.12
+cdcbbc4   o2   1.31  0.82  0.86  1.03  1.14
+0ae0a82   o2   1.32  0.71  0.87  1.02  1.12
+-unused   o2   1.32  0.72  0.86  1.02  1.01
+v2.3.3a   o2   1.31  0.85  0.86  1.02  0.92
+
+v2.3.3a   h5   1.92  1.32  1.32  5.58  1.14
+b59c787   h5   1.84  1.15  1.33  5.48  1.12
+
+1170cda   o2   1.31  0.86  0.86  1.03  0.91
+          o2   1.31  0.74  0.87  1.03  0.93
\ No newline at end of file

README.md

+Frida
+=====
+
+**Frida** (\"Fast reliable interactive data analysis\") is a versatile
+data analysis program with special routines for inelastic neutron
+scattering. It is actively maintained by [Joachim
+Wuttke](http://www.fz-juelich.de/SharedDocs/Personen/JCNS/EN/Wuttke_J.html).
+
+News
+----
+
+12may20: Bug fix release 2.4.3b.
+
+See the
+[changelog](https://jugit.fz-juelich.de/mlz/frida/-/blob/master/pub/CHANGELOG)
+for details.
+
+Documentation
+-------------
+
+-   [Introduction](wiki/introduction.md)
+-   [Installation](wiki/installation.md)
+    -   [frida.ini](wiki/frida.ini.md) (the configure file)
+-   [Tutorial](wiki/tutorial/start.md)
+    -   [Session 1](wiki/tutorial/basic_usage.md): Command-line basics, load
+        file, inspect, plot
+    -   [Session 2](wiki/tutorial/simple_manipulations.md): Select, Bin,
+        reorganize data.
+    -   [Session 3](wiki/tutorial/elementary_fitting.md): Fit.
+    -   [Session 4](wiki/tutorial/fitting_with_convolution.md): Convolute
+        theory with experimental resolution.
+-   Online manual
+    -   [Data model](wiki/data_model.md)
+    -   [Commands](wiki/commands.md)
+    -   [Overwrite or Duplicate](wiki/Overwrite or Duplicate.md)
+    -   [Expressions](wiki/expressions.md)
+    -   [Built-in functions](wiki/built-in_functions.md)
+    -   [Curves](wiki/curves.md)
+    -   [External curves](wiki/external_curves.md)
+-   Implementation notes (for developers)
+    -   [Design principles](wiki/principles.md)
+    -   [technologies and libraries used](wiki/technologies.md)
+    -   [coding conventions](wiki/coding_conventions.md)
+-   Old Versions
+    -   [historic data formats](wiki/historic_data_formats.md)
+    -   [frida1](wiki/frida1/start.md)
+-   Offline manual:
+    -   ![UserManual.pdf](doc/UserManual.pdf) (work in progress, mostly about graphics)
+
+Resources
+---------
+
+Download location:
+
+-   <https://jugit.fz-juelich.de/mlz/frida/-/tags>: latest release, file
+    frida\<version\>.tgz
+
+Or clone from
+
+-   <https://jugit.fz-juelich.de/mlz/frida/-/tree/master>: \"Clone\"
+    button on the upper right of the main window
+
+Contact
+-------
+
+### Bug reports
+
+Please send bug reports to Joachim. The git development snapshot
+contains a bug list (\~/TODO).
+
+### School on Data Analysis
+
+The first JCNS School on Data Analysis for Quasielastic Neutron
+Scattering with Frida took place on 28-29 April 2010. The next school
+will be organized as soon as a sufficient number of potential
+participants have indicated their interest.

TODO

+==== BUGS ====
+
+or+ should ask for name(unit) AND value
+
+"uninitialized variable" should also mention "unknown command"
+
+==== IMPROVE EXTANT FUNCTIONALITY ====
+
+fit does not yet use improved lmmin API (done?)
+
+'ep0', ...
+
+merge registries; prevent creation of variable with name already used by function
+
+coord name algebra
+
+handling of inf, nan
+
+dp: output for #spec>1 is obfuscated
+
+fs: for curve-calling-external-program (cc ecr or similar)
+
+mfj: remove redundant doc lines
+
+oi: wenn mehrere Files mit rank=2, automatisch in einen File packen
+
+"update plot" to replot after change of axes
+
+fn key binding: fn3-4 to scan k
+
+ft: ignore "#.."
+
+multi-oixy ?
+
+fit functions that depend on y_i (consistent? needed? how?)
+
+==== REQUESTED FUNCTIONALITY ====
+
+one-sided Fourier transform (Zach)
+
+
+==== DOCUMENTATION ====
+
+Terminology: "file" -> "workspace"
+  (surprisingly, this concerns almost only the documentation; in the code, only a few
+   output commands contain "file" in the sense of "workspace". To find them, use
+     grep -n [Ff]ile  `fs` | grep -v "\\file" | grep -v FileIter | grep -v [a-zA-Z]File
+  )
+
+Universal help/doc associated with
+  - environment variables like psdir
+  - operators and functions (now hf; separate operators and functions, reconsider sorting)
+
+refer to external documentation
+
+explain resol, conv, pconv
+
+more info on commands (in command shell and in manual?)
+
+
+==== REFACTORING ====
+
+Register all commands;
+transform within-command dialogs into command options
+
+(this replaces the following "dialog generics":)
+  - restore ask callback help for lists (prompt for list, not for string)
+  - restore help on "?" (e.g. expression help for 'md')
+  - default for plot range
+
+refactor func+op registration so that registered object can be const
+(assemble typed function list prior to registration)
+
+lmfit call-back within class, thanks to std::functional
+
+When commands have become programmable:
+- review history
+  - latest action on pX should be part of history
+  - history replay must not stop for error
+  - show commands while playing history
+  - fnc keys not in history
+
+Default file selection:
+- inform user about new file selection as result of an operation
+- inform user about renumbering after deletion?
+- keep curve references intact
+
+history:
+  -  for replaying:
+    - RETURN not stored
+  - during interactive session:
+    - store repeated commands only once
+- save every input at once (from history to logging ...)
+
+
+==== WISHLIST ====
+
+splines (e.g. to approximate measured resolution)
+
+convolution with function
+- with spline
+- with TOFTOF model
+
+
+==== WAITING FOR CLUE ====
+
+How to treat blanks in user input:
+- operators "mod", "div" suggest to allow blanks in expressions
+- "op* 1 .3 99" suggeststo split at blanks
+
+should operations have a return value?
+- code for user interrupt
+- numeric result?
+- pointer to files (replace sel_collect_begin/end mechanism)??
+
+Ctrl+C to abort fit
+
+residual plot
+
+Graphics: simplify; allow LaTeX labels -> Asymptote ? gnuplot ?
+
+distribution: do not overwrite user modifications of ini file
+
+in graph file: doc lines should be formatted such that they can be easily
+  read in as command lines
+
+script language integration
+- testing
+- support for Excel-like tables
+- towards LAMP