changes from Nov. 2023

testing wf behaviour thru ca gateway
cafe-1.19.0-py38-gcc-7.5.0
2024-02-08 14:23:15 +01:00 · 2023-07-06 10:01:36 +02:00 · 2023-06-19 10:24:07 +02:00 · 2023-01-26 11:51:15 +01:00
41 changed files with 171012 additions and 1793 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 # Temporary (build) files #
 ###########################
 *.bak
+*.*-*
+*.*+*
 aclocal.m4
 autom4te.cache
 config.in
@@ -32,7 +34,8 @@ src/*.o
 src/*.lo
 src/*.la
 src/.deps/*
+src/bitshuffle/.deps/*
 src/.libs/*
 examples/cafeTest/*.*-
 doc
-
+compile
--- a/318
+++ b/318
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************

-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.

   Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
 Basic Installation
 ==================

-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+   Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.

-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').

-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.

   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.

-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.

   The simplest way to compile this package is:

-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.

-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
     some messages telling which features it is checking for.

-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.

-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
     the package, generally using the just-built uninstalled binaries.

-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
     documentation.  When installing into a prefix owned by root, it is
     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
     privileges.

-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
     this time using the binaries in their final installed location.
     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
     root privileges, verifies that the installation completed
     correctly.

  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
     for the package's developers.  If you use it, you may have to get
     all sorts of other programs in order to regenerate files that came
     with the distribution.

-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
     files again.  In practice, not all packages have tested that
     uninstallation works correctly, even though it is required by the
     GNU Coding Standards.

-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
     This target is generally not run by end users.

 Compilers and Options
 =====================

   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.

-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:

     ./configure CC=c99 CFLAGS=-g LIBS=-lposix

@@ -113,21 +112,21 @@ Compiling For Multiple Architectures

   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.

-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.

   On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:

     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:

   This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.

 Installation Names
 ==================

-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.

   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.

   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
 specifications that were not explicitly provided.

   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
 having to reconfigure or recompile.

   The first method involves providing an override variable for each
-affected directory.  For example, `make install
+affected directory.  For example, 'make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.

-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.

 Optional Features
 =================

   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.

-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.

-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.

   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
+execution of 'make' will be.  For these packages, running './configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.

 Particular systems
 ==================

-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:

     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"

 and if that doesn't work, install pre-built binaries of GCC for HP-UX.

-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
+   HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.

   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try

     ./configure CC="cc"

@@ -242,26 +240,26 @@ and if that doesn't work, try

     ./configure CC="cc -nodtk"

-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.

-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:

     ./configure --prefix=/boot/common

 Specifying the System Type
 ==========================

-   There may be some features `configure' cannot figure out
+   There may be some features 'configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:

     CPU-COMPANY-SYSTEM

@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
     OS
     KERNEL-OS

-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.

   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.

   If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.

 Sharing Defaults
 ================

-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.

 Defining Variables
 ==================

   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+environment passed to 'configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:

     ./configure CC=/usr/local2/bin/gcc

-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).

-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:

     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash

-`configure' Invocation
+'configure' Invocation
 ======================

-   `configure' recognizes the following options to control how it
+   'configure' recognizes the following options to control how it
 operates.

-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.

-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.

-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
     script, and exit.

-`--cache-file=FILE'
+'--cache-file=FILE'
     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
     disable caching.

-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.

-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
     messages will still be shown).

-`--srcdir=DIR'
+'--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     'configure' can determine that directory automatically.

-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.

-`--no-create'
-`-n'
+'--no-create'
+'-n'
     Run the configure checks, but stop before creating any output
     files.

-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.
--- a/MakefileWin/Makefile_noqt
+++ b/MakefileWin/Makefile_noqt
@@ -1,39 +1,38 @@
-INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost  \
-IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32 
+INCLUDES = -IC:\EPICS\CAFE\cpp\include -IC:\EPICS\CAFE\cpp -IC:\EPICS\boost_1_81_0\boost  \
+-IC:\EPICS\boost_1_81_0 -IC:\epics\epics-base\include -IC:\epics\epics-base\include\os\WIN32 \
+-Ic:\EPICS\epics-base\include\compiler\msvc \
 #-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
-#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml 
+#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml \
 #-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
-
-LIB_DEST=lib\cafe-noqt
-
 CXX=cl
-CXXFLAGS = /W4 /EHsc /c /MT
-OUTPUT_OPTION = /o "$@"
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
-C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib 
+CXXFLAGS = -DUSE_TYPED_RSET  -EHsc   -nologo -FC -D__STDC__=0 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE    -Ox -GL -Oy-   -W3        -MD -DEPICS_BUILD_DLL -DEPICS_CALL_DLL -c
+
+#OUTPUT_OPTION = /o "$@"
+OUTPUT_OPTION = /Fo"$@"
+LIB_LOCAL = C:\epics\epics-base\lib\win32-x86\Com.lib C:\epics\epics-base\lib\win32-x86\ca.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_thread-vc142-mt-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_system-vc142-mt-gd-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_date_time-vc142-mt-gd-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_chrono-vc142-mt-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_exception-vc142-mt-gd-x32-1_81.lib \
 #C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
-#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib 
+#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib \

+OBJS= src\cafeCache.obj src\cafeGroup.obj src\cafe.obj src\cafeVectors.obj \
+			 src\callbackHandlerCreate.obj src\callbackHandlerMonitor.obj src\conduitGroup.obj src\conduit.obj \
+			 src\connectCallbacks.obj src\connectGroup.obj \
+			 src\connect.obj src\exceptionsHelper.obj src\granules.obj src\handleHelper.obj src\helper.obj \
+			 src\methodCallbacks.obj src\policyHelper.obj src\transpose.obj  \
+			 src\cafeXML.obj src\loadCollectionXMLParser.obj src\loadGroupXMLParser.obj \
+			 src\restorePVGroupXMLParser.obj $(LIB_LOCAL)

-OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
-			 callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
-			 connectCallbacks.obj connectGroup.obj \
-			 connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
-			 methodCallbacks.obj policyHelper.obj transpose.obj  \
-			 cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
-			 restorePVGroupXMLParser.obj $(LIB_LOCAL)
+cafe.lib: $(OBJS)
+	LIB $(OBJS) /out:cafe.lib

-
-
-$(LIB_DEST)\cafe.lib: $(OBJS)
-	LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
-
-
-%.obj: src\%.cpp
+%.obj: %.cpp
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $< 
-		
+	
 clean:
-	del *.obj 
+	del src\*.obj 


--- a/MakefileWin/Makefile_noqt_windows7
+++ b/MakefileWin/Makefile_noqt_windows7
@@ -0,0 +1,39 @@
+INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost  \
+-IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32 
+#-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
+#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml 
+#-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
+
+LIB_DEST=lib\cafe-noqt
+
+CXX=cl
+CXXFLAGS = /W4 /EHsc /c /MT
+OUTPUT_OPTION = /o "$@"
+LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
+C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
+C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib 
+#C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
+#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib 
+
+
+OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
+			 callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
+			 connectCallbacks.obj connectGroup.obj \
+			 connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
+			 methodCallbacks.obj policyHelper.obj transpose.obj  \
+			 cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
+			 restorePVGroupXMLParser.obj $(LIB_LOCAL)
+
+
+
+$(LIB_DEST)\cafe.lib: $(OBJS)
+	LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
+
+
+%.obj: src\%.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $< 
+		
+clean:
+	del *.obj 
+
+
--- a/MakefileWin/config.h
+++ b/MakefileWin/config.h
@@ -1,15 +1,15 @@

 /* epics major release */
-#define EPICS_MAJOR 3
+#define EPICS_MAJOR 7

 /* epics minor release */
-#define EPICS_MINOR 14
+#define EPICS_MINOR 0

 /* epics patch release */
-#define EPICS_PATCH 12
+#define EPICS_PATCH 6

 /* epics version */
-#define HAVE_EPICS 3.14.12
+#define HAVE_EPICS 7.0.6

 /* Define to 1 if you have the <epicsTypes.h> header file. */
 #define HAVE_EPICSTYPES_H 1
@@ -23,3 +23,6 @@
 /* Define to 1 if you have the <Python.h> header file. */
 /*#define HAVE_PYTHON_H 1 */

+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
--- a/autogen_sfbd.sh
+++ b/autogen_sfbd.sh
@@ -3,7 +3,8 @@
 #<facility = sls sls2 sf>  default is sf
 #<target_language = cpp matlab python> 
 module unload gcc
-module load gcc/7.3.0 #7.5.0 for py38
+module load gcc/7.5.0 #7.5.0 for py38 py310 7.3.0 py37
+#module load gcc/8.5.0  #rhel8
 ### psi specific - end

 rm -f configure.ac
@@ -12,7 +13,7 @@ ln -s configurePSI.ac configure.ac
 rm -f ./aclocal.m4
 rm -rf ./autom4te.cache
 aclocal  --force -I m4
-/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
+libtoolize --force --copy #select libtools 2.4.6
 #libtoolize --force --copy
 autoconf --force  #interprets configure.ac
 autoheader --force
@@ -23,7 +24,9 @@ automake --force --add-missing --copy
 #Used by ./configure
 #Assumes format ${EPICS}/base-3.14.12
 #source cafeVersion-gcc-7.3.0
-CAFE_V="cafe-1.18.0"
+CAFE_V="cafe-1.19.3"
+EPICS_BASE='base-7.0.7' #
+
 #For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
 #Assume Linux but check if Darwin
 CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin") 
@@ -32,13 +35,16 @@ export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
 RETURN_ON_WRONG_INPUT=true
 RETURN_FLAG=false

-EPICS_BASE=$(readlink ${EPICS}/base)
+##EPICS_BASE=$(readlink ${EPICS_BASE})   #$(readlink ${EPICS}/base)
+
+_EPICS_HOST_ARCH=${RHREL}-x86_64
+
 #EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
 echo $EPICS_BASE
-if [ -z "$EPICS_BASE" ]
-then
-    EPICS_BASE='base-7' #7.0 = 7+0 = 7 for major release
-fi
+#if [ -z "$EPICS_BASE_VERSION" ]
+#then
+#    EPICS_BASE='base-7.0.7' #7.0 = 7+0 = 7 for major release
+#fi

 echo 'input' "$0" "$1" "$2"
 echo $EPICS_BASE
@@ -57,7 +63,8 @@ echo 'input arg. facility/target' $FACILITY $CACLIENT
 if [ -n "$FACILITY" ]
 then
    if [ "$FACILITY" = "matlab" ] || [ "$FACILITY" = "python" ] || \
-       [ "$FACILITY" = "py310" ] || [ "$FACILITY" = "py38" ] || \
+       [ "$FACILITY" = "py310" ] || [ "$FACILITY" = "py39" ] || \
+       [ "$FACILITY" = "py38" ] || \
       [ "$FACILITY" = "py37" ] || [ "$FACILITY" = "py35" ] || \
       [ "$FACILITY" = "julia" ] || [ "$FACILITY" = "cpp" ] || \
       [ "$FACILITY" = "cc" ] || [ "$FACILITY" = "py34" ]
@@ -126,7 +133,8 @@ fi
 if [ -n "$CACLIENT" ]
 then
    if [ "$CACLIENT" = "matlab" ] || [ "$CACLIENT" = "python" ] || \
-       [ "$CACLIENT" = "py310" ] ||  [ "$CACLIENT" = "py38" ] || \
+       [ "$CACLIENT" = "py310" ] ||  [ "$CACLIENT" = "py39" ] || \
+       [ "$CACLIENT" = "py38" ] || \
       [ "$CACLIENT" = "py37" ] || [ "$CACLIENT" = "py35" ] || \
       [ "$CACLIENT" = "julia" ] || [ "$CACLIENT" = "cpp" ] || \
       [ "$CACLIENT" = "cc" ] || [ "$CACLIENT" = "py34" ]
@@ -136,7 +144,8 @@ then
 	if [ -n "$CACLIENT_TEMP" ]
 	then    
 	    if [ "$CACLIENT_TEMP" = "matlab" ] || [ "$CACLIENT_TEMP" = "python" ] || \
-	       [ "$CACLIENT_TEMP" = "py310" ] ||  [ "$CACLIENT_TEMP" = "py38" ] || \	
+	       [ "$CACLIENT_TEMP" = "py310" ] ||  [ "$CACLIENT_TEMP" = "py39" ] || \
+	       [ "$CACLIENT_TEMP" = "py38" ] || \
 	       [ "$CACLIENT_TEMP" = "py37" ] || [ "$CACLIENT_TEMP" = "py35" ] || \
 	       [ "$CACLIENT_TEMP" = "julia" ] || [ "$CACLIENT_TEMP" = "cpp" ] || \
 	       [ "$CACLIENT_TEMP" = "cc" ] || [ "$CACLIENT_TEMP" = "py34" ]
@@ -191,7 +200,7 @@ then
    ENABLE_OPTIONS+=" --enable-epics7"
    #CAFE_V+="-sls2"
 else
-    ENABLE_OPTIONS+=" --enable-epics3"
+    ENABLE_OPTIONS+=" --enable-epics7"
    if [ "$FACILITY" = "sf" ]  && [ "$CACLIENT" != "matlab" ]
    then
 	CAFE_V+="-sf"
@@ -223,12 +232,18 @@ then
    ENABLE_OPTIONS+=" --enable-python38"
    ENABLE_OPTIONS+=" --enable-qt5py38"
    CAFE_V+="-py38"
+elif  [ "$CACLIENT" = "py39" ]
+then
+    ENABLE_OPTIONS+=" --enable-python39"
+    ENABLE_OPTIONS+=" --enable-qt5py39"
+    CAFE_V+="-py39" 
 elif  [ "$CACLIENT" = "py310" ]
 then
    ENABLE_OPTIONS+=" --enable-python310"
    #ENABLE_OPTIONS+=" --enable-qt5py310"
    CAFE_V+="-py310"
-else
+elif  [ "$CACLIENT" = "cpp" ]
+then
    ENABLE_OPTIONS+=" --enable-qt5" 
 fi

@@ -277,18 +292,19 @@ export CAFE_EPICS_V_PATCH=$EBPAT

 echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS

+
 ./configure \
    --prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
-    --libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${EPICS_HOST_ARCH} \
+    --libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${_EPICS_HOST_ARCH} \
    ${ENABLE_OPTIONS} \
    --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
    --with-epics3=${EPICS}/base \
-    --with-python310=/ioc/python/latest \
+    --with-python310=/opt/gfa/python-3.10/latest \
    --with-python38=/opt/gfa/python-3.8/latest \
    --with-python37=/opt/gfa/python-3.7/latest \
    --with-python35=/opt/gfa/python-3.5/latest \
    --with-python34=/opt/psi/Programming/psi-python34/2.1.0 \
-    --with-qt5py310=/ioc/python/latest \
+    --with-qt5py310=/opt/gfa/python-3.10/latest \
    --with-qt5py38=/opt/gfa/python-3.8/latest \
    --with-qt5=/opt/gfa/python-3.7/latest \
    --with-qt4=/opt/gfa/python-3.5/latest \
@@ -297,7 +313,7 @@ echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS
    --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
    --with-curl=/sf/bd/deps/zmq/curl-7.55.1 \
    --with-lz4=/sf/bd/deps/zmq/lz4/lib \
-    --with-epics7=${EPICS}/base-7.0.6  
+    --with-epics7=/usr/local/epics/${EPICS_BASE} 
 unset  CAFE_EPICS_V_PATCH
 unset  CAFE_EPICS_V_MINOR
 unset  CAFE_EPICS_V_MAJOR 
--- a/autogen_sfbd_RHEL7.sh
+++ b/autogen_sfbd_RHEL7.sh
@@ -0,0 +1,321 @@
+### psi specific - select compiler
+#source <this_autogen_file> <facility> <target_language>
+#<facility = sls sls2 sf>  default is sf
+#<target_language = cpp matlab python> 
+module unload gcc
+module load gcc/7.5.0 #7.5.0 for py38 AND PY310 7.3.0 py37
+#module load gcc/8.5.0  #rhel8
+### psi specific - end
+
+rm -f configure.ac
+ln -s configurePSI.ac configure.ac
+
+rm -f ./aclocal.m4
+rm -rf ./autom4te.cache
+aclocal  --force -I m4
+/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
+#libtoolize --force --copy
+autoconf --force  #interprets configure.ac
+autoheader --force
+automake --force --add-missing --copy
+#autoreconf not wanted
+
+#Check what the EPICS RELEASE IS from ${EPICS}/base
+#Used by ./configure
+#Assumes format ${EPICS}/base-3.14.12
+#source cafeVersion-gcc-7.3.0
+CAFE_V="cafe-1.19.3"
+EPICS_BASE='base-7.0.7'
+#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
+#Assume Linux but check if Darwin
+CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin") 
+export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
+
+RETURN_ON_WRONG_INPUT=true
+RETURN_FLAG=false
+
+###EPICS_BASE=$(readlink ${EPICS_BASE})   #$(readlink ${EPICS}/base)
+
+_EPICS_HOST_ARCH=${RHREL}-x86_64
+
+#EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
+echo $EPICS_BASE
+#if [ -z "$EPICS_BASE_VERSION" ]
+#then
+#    EPICS_BASE='base-7.0.7' #7.0 = 7+0 = 7 for major release
+#fi
+
+echo 'input' "$0" "$1" "$2"
+echo $EPICS_BASE
+
+FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]')
+
+FACILITY_DEFAULT="sls2"
+CACLIENT_DEFAULT="py37"
+
+FACILITY_TEMP=""
+CACLIENT_TEMP=""
+
+echo 'input arg. facility/target' $FACILITY $CACLIENT
+
+if [ -n "$FACILITY" ]
+then
+    if [ "$FACILITY" = "matlab" ] || [ "$FACILITY" = "python" ] || \
+       [ "$FACILITY" = "py310" ] || [ "$FACILITY" = "py39" ] || \
+       [ "$FACILITY" = "py38" ] || \
+       [ "$FACILITY" = "py37" ] || [ "$FACILITY" = "py35" ] || \
+       [ "$FACILITY" = "julia" ] || [ "$FACILITY" = "cpp" ] || \
+       [ "$FACILITY" = "cc" ] || [ "$FACILITY" = "py34" ]
+    then
+	   CACLIENT_TEMP=$FACILITY
+	   FACILITY_TEMP=$2
+    fi
+fi
+
+if [ -n "$CACLIENT" ]
+then
+    if [ "$CACLIENT" = "sls" ] || [ "$CACLIENT" = "sls2" ] || \
+     [ "$CACLIENT" = "sf" ] || [ "$CACLIENT" = "swissfel" ] || \
+     [ "$CACLIENT" = "sfel" ] || [ "$CACLIENT" = "hipa" ]
+    then	
+	if [ -z $FACILITY_TEMP ]
+	then
+	    FACILITY_TEMP=$CACLIENT
+	    CACLIENT_TEMP=$1
+	fi
+    fi
+fi
+
+
+
+if [ -z "$FACILITY" ]
+then
+    FACILITY="sf"     
+    echo "FACILITY = " $FACILITY
+    if [ -z $CACLIENT ]
+    then
+	CACLIENT=$CACLIENT_DEFAULT
+    fi
+elif [ "$FACILITY" = "sls" ] || [ "$FACILITY" = "sls2" ] || \
+     [ "$FACILITY" = "sf" ] || [ "$FACILITY" = "swissfel" ] || \
+     [ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "hipa" ]
+then
+    echo "FACILITY = " $FACILITY
+elif [ -n "$FACILITY_TEMP" ]
+then    
+    if [ "$FACILITY_TEMP" = "sls" ]  || [ "$FACILITY_TEMP" = "sls2" ] || \
+       [ "$FACILITY_TEMP" = "sf" ]   || [ "$FACILITY_TEMP" = "swissfel" ] || \
+       [ "$FACILITY_TEMP" = "sfel" ] || [ "$FACILITY_TEMP" = "hipa" ]
+    then
+
+	
+	FACILITY=$FACILITY_TEMP
+    else
+	if [ -n "$2" ] 
+	then
+	    echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
+	    echo "***VALID VALUES ARE: sls sls2 sf hipa"
+	    RETURN_FLAG=true
+	fi
+	echo "***OTHERWISE THE DEFAULT FACILITY IS:" $FACILITY_DEFAULT	
+	FACILITY=$FACILITY_DEFAULT
+    fi
+else
+    echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
+    echo "***VALID VALUES ARE: sls sls2 sf hipa"
+    RETURN_FLAG=true
+    echo "***OTHERWISE THE DEFAULT FACILITY IS: " $FACILITY_DEFAULT	
+    FACILITY=$FACILITY_DEFAULT    
+fi
+
+if [ -n "$CACLIENT" ]
+then
+    if [ "$CACLIENT" = "matlab" ] || [ "$CACLIENT" = "python" ] || \
+       [ "$CACLIENT" = "py310" ] ||  [ "$CACLIENT" = "py39" ] || \
+       [ "$CACLIENT" = "py38" ] || \
+       [ "$CACLIENT" = "py37" ] || [ "$CACLIENT" = "py35" ] || \
+       [ "$CACLIENT" = "julia" ] || [ "$CACLIENT" = "cpp" ] || \
+       [ "$CACLIENT" = "cc" ] || [ "$CACLIENT" = "py34" ]
+    then 	  
+	echo "CA TARGET = " $CACLIENT
+    else
+	if [ -n "$CACLIENT_TEMP" ]
+	then    
+	    if [ "$CACLIENT_TEMP" = "matlab" ] || [ "$CACLIENT_TEMP" = "python" ] || \
+	       [ "$CACLIENT_TEMP" = "py310" ] ||  [ "$CACLIENT_TEMP" = "py39" ] || \
+	       [ "$CACLIENT_TEMP" = "py38" ] || \
+	       [ "$CACLIENT_TEMP" = "py37" ] || [ "$CACLIENT_TEMP" = "py35" ] || \
+	       [ "$CACLIENT_TEMP" = "julia" ] || [ "$CACLIENT_TEMP" = "cpp" ] || \
+	       [ "$CACLIENT_TEMP" = "cc" ] || [ "$CACLIENT_TEMP" = "py34" ]
+	    then
+		CACLIENT=$CACLIENT_TEMP	
+	    else
+		echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT 
+		echo "***VALID VALUES ARE: cpp matlab python"
+		RETURN_FLAG=true
+		echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT
+		CACLIENT=$CACLIENT_DEFAULT
+	    fi
+	else
+	    echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT 
+	    echo "***VALID VALUES ARE: cpp matlab python"
+	    RETURN_FLAG=true
+	    echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT 
+	    CACLIENT=$CACLIENT_DEFAULT	
+	fi
+    fi
+else
+    CACLIENT=$CACLIENT_DEFAULT
+fi
+
+
+
+if [ $RETURN_ON_WRONG_INPUT = true ] ; then
+    if [ $RETURN_FLAG = true ] ; then 
+	return 1 2>/dev/null
+	exit 1
+    fi
+fi
+
+echo "FACILITY SELECTED = " $FACILITY 
+echo "CA TARGET  SELECTED = "  $CACLIENT
+
+ENABLE_OPTIONS="--enable-boost-inc"
+
+if [ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "swissfel" ] 
+then
+    FACILITY="sf"
+fi
+
+if [ "$CACLIENT" = "python" ] || [ "$CACLIENT" = "julia" ]
+then
+    CACLIENT="py37"
+fi
+
+
+if [ "$FACILITY" = "sls2" ]
+then
+    ENABLE_OPTIONS+=" --enable-epics7"
+    #CAFE_V+="-sls2"
+else
+    ENABLE_OPTIONS+=" --enable-epics7"
+    if [ "$FACILITY" = "sf" ]  && [ "$CACLIENT" != "matlab" ]
+    then
+	CAFE_V+="-sf"
+    elif [ "$FACILITY" = "sls" ]  && [ "$CACLIENT" != "matlab" ]
+    then
+	CAFE_V+="-epics3"	
+    fi
+
+fi
+
+
+if [ "$CACLIENT" = "py34" ]
+then
+    ENABLE_OPTIONS+=" --enable-python34"
+    ENABLE_OPTIONS+=" --enable-qt4py34"
+    CAFE_V+="-py34"
+elif [ "$CACLIENT" = "py35" ]
+then
+    ENABLE_OPTIONS+=" --enable-python35"
+    ENABLE_OPTIONS+=" --enable-qt4"
+    CAFE_V+="-py35"
+elif  [ "$CACLIENT" = "py37" ]
+then
+    ENABLE_OPTIONS+=" --enable-python37"
+    ENABLE_OPTIONS+=" --enable-qt5"
+    CAFE_V+="-py37" 
+elif  [ "$CACLIENT" = "py38" ]
+then
+    ENABLE_OPTIONS+=" --enable-python38"
+    ENABLE_OPTIONS+=" --enable-qt5py38"
+    CAFE_V+="-py38"
+elif  [ "$CACLIENT" = "py39" ]
+then
+    ENABLE_OPTIONS+=" --enable-python39"
+    ENABLE_OPTIONS+=" --enable-qt5py39"
+    CAFE_V+="-py39" 
+elif  [ "$CACLIENT" = "py310" ]
+then
+    ENABLE_OPTIONS+=" --enable-python310"
+    #ENABLE_OPTIONS+=" --enable-qt5py310"
+    CAFE_V+="-py310"
+elif  [ "$CACLIENT" = "cpp" ]
+then
+    ENABLE_OPTIONS+=" --enable-qt5" 
+fi
+
+if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
+then
+    #rm -f src/PyCafe.cpp
+    #ln -s PyCafe3.cpp src/PyCafe.cpp
+    ENABLE_OPTIONS+=" --enable-json"
+    ENABLE_OPTIONS+=" --enable-zeromq"
+    ENABLE_OPTIONS+=" --enable-curl"
+    ENABLE_OPTIONS+=" --enable-lz4"
+#else
+    #rm -f src/PyCafe.cpp
+    #ln -s PyCafe_sls.cpp src/PyCafe.cpp 
+fi
+
+CAFE_V+="-gcc-"$GCC_VERSION
+
+echo "$CAFE_V"
+
+echo 'EPICS BASE IS='$EPICS_BASE
+#echo 'EPICS BASE DIR='${EPICS}/base-7.0.4.1
+
+EB1=$(echo $EPICS_BASE | sed -e "s/[a-zA-Z]*-//g")
+EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
+EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
+EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
+EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
+echo EPICS_MAJOR=$EBMAJ 
+echo EPICS_MINOR=$EBMIN 
+echo EPICS_PATCH=$EBPAT
+#echo $EBMIN1
+
+export CAFE_EPICS_V_MAJOR=$EBMAJ
+export CAFE_EPICS_V_MINOR=$EBMIN
+export CAFE_EPICS_V_PATCH=$EBPAT
+
+#ENABLE_OPTIONS+=" --enable-qt5"
+##ENABLE_OPTIONS+=" --enable-qt4"
+#ENABLE_OPTIONS+=" --enable-python37"
+##ENABLE_OPTIONS+=" --enable-python35"
+#ENABLE_OPTIONS+=" --enable-json"
+#ENABLE_OPTIONS+=" --enable-zeromq"
+#ENABLE_OPTIONS+=" --enable-curl"
+#ENABLE_OPTIONS+=" --enable-lz4"
+
+echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS
+
+
+./configure \
+    --prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
+    --libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${_EPICS_HOST_ARCH} \
+    ${ENABLE_OPTIONS} \
+    --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
+    --with-epics3=${EPICS}/base \
+    --with-python310=/opt/gfa/python-3.10/latest \
+    --with-python38=/opt/gfa/python-3.8/latest \
+    --with-python37=/opt/gfa/python-3.7/latest \
+    --with-python35=/opt/gfa/python-3.5/latest \
+    --with-python34=/opt/psi/Programming/psi-python34/2.1.0 \
+    --with-qt5py310=/opt/gfa/python-3.10/latest \
+    --with-qt5py38=/opt/gfa/python-3.8/latest \
+    --with-qt5=/opt/gfa/python-3.7/latest \
+    --with-qt4=/opt/gfa/python-3.5/latest \
+    --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 \
+    --with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
+    --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
+    --with-curl=/sf/bd/deps/zmq/curl-7.55.1 \
+    --with-lz4=/sf/bd/deps/zmq/lz4/lib \
+    --with-epics7=/usr/local/epics/${EPICS_BASE}   
+unset  CAFE_EPICS_V_PATCH
+unset  CAFE_EPICS_V_MINOR
+unset  CAFE_EPICS_V_MAJOR 
+
+unset  CAFE_HOST_FLAG_DARWIN
+
--- a/config.guess
+++ b/config.guess
--- a/config.log
+++ b/config.log
--- a/config.status
+++ b/config.status
@@ -380,7 +380,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CAFE $as_me 1.18.0, which was
+This file was extended by CAFE $as_me 1.19.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -427,9 +427,9 @@ $config_commands

 Report bugs to <Bug reports to: jan.chrin@psi.ch>."

-ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/ioc/python/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/ioc/python/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.6' 'CXX=/opt/psi/Programming/gcc/7.3.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.3.0/bin/gcc'"
+ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc'"
 ac_cs_version="\
-CAFE config.status 1.18.0
+CAFE config.status 1.19.3
 configured by ./configure, generated by GNU Autoconf 2.69,
  with options \"$ac_cs_config\"

@@ -519,7 +519,7 @@ if $ac_cs_silent; then
 fi

 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/ioc/python/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/ioc/python/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.6' 'CXX=/opt/psi/Programming/gcc/7.3.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.3.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
  shift
  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
  CONFIG_SHELL='/bin/sh'
@@ -539,7 +539,7 @@ _ASBOX
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="" ac_aux_dir="./"
+AMDEP_TRUE="" MAKE="make"


 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -560,10 +560,10 @@ SHELL='/bin/sh'
 ECHO='printf %s\n'
 PATH_SEPARATOR=':'
 host_alias=''
-host='x86_64-unknown-linux-gnu'
+host='x86_64-pc-linux-gnu'
 host_os='linux-gnu'
 build_alias=''
-build='x86_64-unknown-linux-gnu'
+build='x86_64-pc-linux-gnu'
 build_os='linux-gnu'
 SED='/usr/bin/sed'
 Xsed='/usr/bin/sed -e 1s/^X//'
@@ -599,9 +599,9 @@ old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib'
 old_postuninstall_cmds=''
 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
 lock_old_archive_extraction='no'
-CC='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+CC='/opt/psi/Programming/gcc/7.5.0/bin/gcc'
 CFLAGS='-g -O2'
-compiler='/opt/psi/Programming/gcc/7.3.0/bin/g++'
+compiler='/opt/psi/Programming/gcc/7.5.0/bin/g++'
 GCC='yes'
 lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
 lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
@@ -678,8 +678,8 @@ postuninstall_cmds=''
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 finish_eval=''
 hardcode_into_libs='yes'
-sys_lib_search_path_spec='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib /lib /usr/lib '
-configure_time_dlsearch_path='/lib /usr/lib /usr/lib64/atlas /usr/lib64//bind9-export/ /usr/lib64/dyninst /usr/lib64/llvm /usr/lib64/mysql /usr/lib/oracle/12.2/client64/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/wine/ '
+sys_lib_search_path_spec='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib '
+configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst                /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
 configure_time_lt_sys_library_path=''
 hardcode_action='immediate'
 enable_dlopen='unknown'
@@ -697,7 +697,7 @@ LD_CXX='/usr/bin/ld -m elf_x86_64'
 reload_flag_CXX=' -r'
 reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
 old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
-compiler_CXX='/opt/psi/Programming/gcc/7.3.0/bin/g++'
+compiler_CXX='/opt/psi/Programming/gcc/7.5.0/bin/g++'
 GCC_CXX='yes'
 lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
 lt_prog_compiler_pic_CXX=' -fPIC -DPIC'
@@ -735,16 +735,16 @@ prelink_cmds_CXX=''
 postlink_cmds_CXX=''
 file_list_spec_CXX=''
 hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64/../lib64 /opt/psi/Programming/gcc/7.3.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.3.0/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../..'
-predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtbeginS.o'
-postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtendS.o /lib/../lib64/crtn.o'
+compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..'
+predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o'
+postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o'
 predeps_CXX=''
 postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
-compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.3.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib64 -L/opt/psi/Programming/gcc/7.3.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../..'
+compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..'

-LTCC='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+LTCC='/opt/psi/Programming/gcc/7.5.0/bin/gcc'
 LTCFLAGS='-g -O2'
-compiler='/opt/psi/Programming/gcc/7.3.0/bin/gcc'
+compiler='/opt/psi/Programming/gcc/7.5.0/bin/gcc'

 # A function that is used when there is no print builtin or printf.
 func_fallback_echo ()
@@ -788,7 +788,7 @@ fi


    PACKAGE='cafe'
-    VERSION='1.18.0'
+    VERSION='1.19.3'
    RM='rm -f'
    ofile='libtool'

@@ -879,18 +879,18 @@ S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
 S["HAVE_ZEROMQ__FALSE"]=""
 S["HAVE_ZEROMQ__TRUE"]="#"
-S["HAVE_PYCAFE_EXT__FALSE"]=""
-S["HAVE_PYCAFE_EXT__TRUE"]="#"
-S["HAVE_PYTHON__FALSE"]=""
-S["HAVE_PYTHON__TRUE"]="#"
-S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
-"h,/opt/gfa/python-3.7/latest/lib "
-S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/i"\
-"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/includ"\
-"e/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
+S["HAVE_PYCAFE_EXT__FALSE"]="#"
+S["HAVE_PYCAFE_EXT__TRUE"]=""
+S["HAVE_PYTHON__FALSE"]="#"
+S["HAVE_PYTHON__TRUE"]=""
+S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpat"\
+"h,/opt/gfa/python-3.10/latest/lib"
+S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/i"\
+"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/includ"\
+"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include"
 S["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include "
-S["CXXCPP"]="/opt/psi/Programming/gcc/7.3.0/bin/g++ -E"
-S["CPP"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc -E"
+S["CXXCPP"]="/opt/psi/Programming/gcc/7.5.0/bin/g++ -E"
+S["CPP"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc -E"
 S["LT_SYS_LIBRARY_PATH"]=""
 S["OTOOL64"]=""
 S["OTOOL"]=""
@@ -915,17 +915,17 @@ S["SED"]="/usr/bin/sed"
 S["am__fastdepCC_FALSE"]="#"
 S["am__fastdepCC_TRUE"]=""
 S["CCDEPMODE"]="depmode=gcc3"
-S["ac_ct_CC"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+S["ac_ct_CC"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc"
 S["CFLAGS"]="-g -O2"
-S["CC"]="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+S["CC"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc"
 S["host_os"]="linux-gnu"
-S["host_vendor"]="unknown"
+S["host_vendor"]="pc"
 S["host_cpu"]="x86_64"
-S["host"]="x86_64-unknown-linux-gnu"
+S["host"]="x86_64-pc-linux-gnu"
 S["build_os"]="linux-gnu"
-S["build_vendor"]="unknown"
+S["build_vendor"]="pc"
 S["build_cpu"]="x86_64"
-S["build"]="x86_64-unknown-linux-gnu"
+S["build"]="x86_64-pc-linux-gnu"
 S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool"
 S["am__fastdepCXX_FALSE"]="#"
 S["am__fastdepCXX_TRUE"]=""
@@ -934,19 +934,18 @@ S["am__nodep"]="_no"
 S["AMDEPBACKSLASH"]="\\"
 S["AMDEP_FALSE"]="#"
 S["AMDEP_TRUE"]=""
-S["am__quote"]=""
 S["am__include"]="include"
 S["DEPDIR"]=".deps"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CXX"]=""
-S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/i"\
-"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/includ"\
-"e/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
-S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
-"h,/opt/gfa/python-3.7/latest/lib "
+S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/i"\
+"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/includ"\
+"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include"
+S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpat"\
+"h,/opt/gfa/python-3.10/latest/lib"
 S["CXXFLAGS"]="-g -O2"
-S["CXX"]="/opt/psi/Programming/gcc/7.3.0/bin/g++"
+S["CXX"]="/opt/psi/Programming/gcc/7.5.0/bin/g++"
 S["AM_BACKSLASH"]="\\"
 S["AM_DEFAULT_VERBOSITY"]="1"
 S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
@@ -964,10 +963,10 @@ S["STRIP"]="strip"
 S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh"
 S["MAKEINFO"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo"
 S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader"
-S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.13"
+S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16"
 S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf"
-S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.13"
-S["VERSION"]="1.18.0"
+S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16"
+S["VERSION"]="1.19.3"
 S["PACKAGE"]="cafe"
 S["CYGPATH_W"]="echo"
 S["am__isrc"]=""
@@ -977,14 +976,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lQt5Xml -lQt5Core "
+S["LIBS"]="-lpython3.10 "
 S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DHAVE_CONFIG_H"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
-S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64"
+S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -1002,16 +1001,17 @@ S["libexecdir"]="${exec_prefix}/libexec"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0"
+S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch"
-S["PACKAGE_STRING"]="CAFE 1.18.0"
-S["PACKAGE_VERSION"]="1.18.0"
+S["PACKAGE_STRING"]="CAFE 1.19.3"
+S["PACKAGE_VERSION"]="1.19.3"
 S["PACKAGE_TARNAME"]="cafe"
 S["PACKAGE_NAME"]="CAFE"
 S["PATH_SEPARATOR"]=":"
 S["SHELL"]="/bin/sh"
+S["am__quote"]=""
 _ACAWK
 cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
  for (key in S) S_is_set[key] = 1
@@ -1055,12 +1055,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 D["PACKAGE_NAME"]=" \"CAFE\""
 D["PACKAGE_TARNAME"]=" \"cafe\""
-D["PACKAGE_VERSION"]=" \"1.18.0\""
-D["PACKAGE_STRING"]=" \"CAFE 1.18.0\""
+D["PACKAGE_VERSION"]=" \"1.19.3\""
+D["PACKAGE_STRING"]=" \"CAFE 1.19.3\""
 D["PACKAGE_BUGREPORT"]=" \"Bug reports to: jan.chrin@psi.ch\""
 D["PACKAGE_URL"]=" \"\""
 D["PACKAGE"]=" \"cafe\""
-D["VERSION"]=" \"1.18.0\""
+D["VERSION"]=" \"1.19.3\""
 D["STDC_HEADERS"]=" 1"
 D["HAVE_SYS_TYPES_H"]=" 1"
 D["HAVE_SYS_STAT_H"]=" 1"
@@ -1076,18 +1076,16 @@ D["LT_OBJDIR"]=" \".libs/\""
 D["HAVE_LINUX"]=" 1"
 D["HAVE_CADEF_H"]=" 1"
 D["HAVE_EPICSTYPES_H"]=" 1"
-D["HAVE_EPICS"]=" 3.14.12"
-D["EPICS_MAJOR"]=" 3"
-D["EPICS_MINOR"]=" 14"
-D["EPICS_PATCH"]=" 12"
+D["HAVE_EPICS"]=" 7.0.7"
+D["EPICS_MAJOR"]=" 7"
+D["EPICS_MINOR"]=" 0"
+D["EPICS_PATCH"]=" 7"
 D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
 D["HAVE_BOOST"]=" 1"
-D["HAVE_QXML_H"]=" 1"
-D["HAVE_LIBQT5CORE"]=" 1"
-D["HAVE_LIBQT5XML"]=" 1"
-D["HAVE_QT"]=" 1"
-D["HAVE_LIBQTXML"]=" 1"
-D["QT_NO_VERSION_TAGGING"]=" 1"
+D["HAVE_PYTHON_H"]=" 1"
+D["HAVE_LIBPYTHON3_10"]=" 1"
+D["HAVE_PYTHON"]=" 1"
+D["HAVE_PYCAFE_EXT"]=" 1"
  for (key in D) D_is_set[key] = 1
  FS = ""
 }
@@ -1415,29 +1413,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
  shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1455,53 +1459,48 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)[^/].*/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
  done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
 ;;
    "libtool":C)
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.

-timestamp='2013-04-24'
+timestamp='2018-05-05'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2013-04-24'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -25,7 +25,7 @@ timestamp='2013-04-24'
 # of the GNU General Public License, version 3 ("GPLv3").


-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@ timestamp='2013-04-24'
 # Otherwise, we print the canonical config type on stdout and succeed.

 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub

 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,12 +53,11 @@ timestamp='2013-04-24'
 me=`echo "$0" | sed -e 's,.*/,,'`

 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

 Canonicalize a configuration name.

-Operation modes:
+Options:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -95,7 +94,7 @@ while test $# -gt 0 ; do

    *local*)
       # First pass through any local machine types.
-       echo $1
+       echo "$1"
       exit ;;

    * )
@@ -111,28 +110,48 @@ case $# in
    exit 1;;
 esac

-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
+# Spilt fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <<EOF
+$1
+EOF
+
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		os=-$field3-$field4
+		;;
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				os=-$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				os=-linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				os=-$field3
+				;;
+		esac
+		;;
+	*-*)
+		basic_machine=$field1
+		os=-$field2
+		;;
+	*)
+		basic_machine=$1
+		os=
+		;;
 esac

 ### Let's recognize common machines as not being operating systems so
@@ -179,44 +198,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@@ -228,10 +247,7 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-psos*)
 		os=-psos
@@ -253,18 +269,20 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper | csky \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +300,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -293,16 +313,18 @@ case $basic_machine in
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
+	| nfp \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
-	| pdp10 | pdp11 | pj | pjl \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -310,7 +332,8 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
+	| visium \
+	| wasm32 \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@@ -324,11 +347,18 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+		;;
+	m9s12z | m68hcs12z | hcs12z | s12z)
+		basic_machine=s12z-unknown
+		os=-none
 		;;
 	ms1)
 		basic_machine=mt-unknown
@@ -357,7 +387,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@@ -369,18 +399,20 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +432,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -410,19 +444,23 @@ case $basic_machine in
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
+	| nfp-* \
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -430,6 +468,8 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
+	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -443,7 +483,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -477,7 +517,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@@ -506,6 +546,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -519,7 +562,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@@ -527,13 +570,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@@ -622,10 +665,18 @@ case $basic_machine in
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2* | dpx2*-bull)
+	dpx2*)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -715,9 +766,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	hppa-next)
-		os=-nextstep3
-		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@@ -730,26 +778,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	i386-vsta | vsta)
+	vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@@ -767,17 +815,17 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@@ -794,7 +842,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -809,10 +857,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@@ -822,15 +870,19 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -869,7 +921,7 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next )
+	next | m*-next)
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
@@ -914,6 +966,12 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -946,7 +1004,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@@ -962,7 +1020,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@@ -977,16 +1035,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -996,23 +1054,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@@ -1066,17 +1124,10 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1095,7 +1146,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@@ -1217,6 +1268,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@@ -1225,20 +1279,12 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1267,10 +1313,6 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@@ -1280,9 +1322,6 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@@ -1302,7 +1341,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1310,10 +1349,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1321,11 +1360,11 @@ esac

 # Decode manufacturer-specific aliases for certain operating systems.

-if [ x"$os" != x"" ]
+if [ x$os != x ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+	# First match some system type aliases that might get confused
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@@ -1336,45 +1375,48 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-svr4*)
-		os=-sysv4
-		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# es1800 is here to avoid being matched by es* (a different OS)
+	-es1800*)
+		os=-ose
+		;;
+	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1391,12 +1433,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	-sim | -xray | -os68k* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@@ -1405,10 +1447,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@@ -1419,12 +1461,6 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
 	-utek*)
 		os=-bsd
 		;;
@@ -1449,7 +1485,7 @@ case $os in
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2 )
+	-ns2)
 		os=-nextstep2
 		;;
 	-nsk*)
@@ -1471,7 +1507,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4)
+	-svr4*)
 		os=-sysv4
 		;;
 	-svr3)
@@ -1486,32 +1522,44 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
+	-pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $basic_machine in
+		    arm*)
+			os=-eabi
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
+	-*-eabi)
+		case $basic_machine in
+		    arm*)
+			;;
+		esac
+		;;
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1546,6 +1594,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1589,9 +1640,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1601,12 +1649,12 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1646,7 +1694,7 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next )
+	*-next)
 		os=-nextstep
 		;;
 	*-sequent)
@@ -1661,9 +1709,6 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
-	*-next)
-		os=-nextstep3
-		;;
 	*-gould)
 		os=-sysv
 		;;
@@ -1773,15 +1818,15 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac

-echo $basic_machine$os
+echo "$basic_machine$os"
 exit

 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
--- a/configurePSI.ac
+++ b/configurePSI.ac
@@ -8,8 +8,8 @@

 #  Standard macros
 AC_PREREQ(2.63)
-AC_COPYRIGHT([CAFE,Jan Chrin, 2010-2021])
-AC_INIT([CAFE], [1.18.0], [Bug reports to: jan.chrin@psi.ch])
+AC_COPYRIGHT([CAFE, Jan Chrin, PSI, 2010-2023])
+AC_INIT([CAFE], [1.19.3], [Bug reports to: jan.chrin@psi.ch])

 AC_CONFIG_AUX_DIR(./)

@@ -93,7 +93,7 @@ if test x$HAVE_EPICS_3 == xtrue ; then
       EPICS_PREFIX=$withval
       EPICS_INCL_PATH="-I"${EPICS_PREFIX}"/include/ \
 -I"${EPICS_PREFIX}"/include/os/"${HOST_ARCH} 
-       EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${EPICS_HOST_ARCH}
+       EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${RHREL}"-x86_64"
       ## Add epics release  
       EPICS_MAJOR_DEFAULT="3"
       EPICS_MINOR_DEFAULT="14"
@@ -114,7 +114,7 @@ if test x$HAVE_EPICS_7 == xtrue ; then
 -I"${EPICS_PREFIX}"/include/os/"${HOST_ARCH} 
       EPICS_INCL_PATH=${EPICS_INCL_PATH}" \
 -I"${EPICS_PREFIX}"/include/compiler/gcc"
-       EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${EPICS_HOST_ARCH}    
+       EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${RHREL}"-x86_64"   
       ## Add epics release  
       EPICS_MAJOR_DEFAULT="7"
       EPICS_MINOR_DEFAULT="4"
--- a/examples/cafeTest/#makfile7#
+++ b/examples/cafeTest/#makfile7#
@@ -1,3 +0,0 @@
-
-
-
--- a/examples/cafeTest/cafeTest
+++ b/examples/cafeTest/cafeTest
--- a/examples/cafeTest/cafeTest.cc
+++ b/examples/cafeTest/cafeTest.cc
@@ -13,7 +13,7 @@

 #define PV_X1      "ARIDI-BPM-01LE:X-AVG"
 #define PV_Y1      "ARIDI-BPM-01LE:Y-AVG"
-#define PV_WF      "ARIDI-BPM-01LE:WF-INT-2"   //256 elements
+#define PV_WF      "ARIDI-BPM-01LE:WF-INT-1"   //256 elements
 #define PV_MBBI    "ARIDI-BPM-01LE:GET-ENABLE" //mmbi
 #define PV_X1_DESC "ARIDI-BPM-01LE:X-AVG.DESC" //dbr_string_t
 #define PV_JOKE    "PV:JOKE"
@@ -197,6 +197,35 @@ int main( int argc, char *argv[] )
    cout << "---------------------------------------------------------------------" << endl;


+    //reset Number of elements to native value for get operation
+    cafe->getHandleHelper().setNelem(hArray[2], cafe->getNelemNative(hArray[2]) );
+
+
+    //Allocate
+    double * dwf2 = new double[cafe->getNelemNative(hArray[2])];
+
+    status=cafe->get(PV_WF, dwf2);
+
+    if (status != ICAFE_NORMAL)
+    {
+        cout << "Status = " << status << "; indicates an error at " << __METHOD__ << "//" << __LINE__ << endl;
+        cafe->getCafeStatus().report(status);
+    }
+    else
+    {
+        cout << PV_WF << " successfully read out " << endl;
+        cout << "First five elements have values: " << endl;
+        for (int i=0; i<std::min(10,(int) cafe->getNelemRequest(hArray[2])); ++i)
+        {
+            cout << dwf2[i] << " [" << i << "] ";
+        }
+        cout << endl;
+    }
+
+
+    ;
+
+
    //------------------------------------------------------------
    //(2) Basic Single Channel Operations
    //------------------------------------------------------------
@@ -474,8 +503,10 @@ int main( int argc, char *argv[] )
    //------------------------------------------------------------
    //Data retrieval methods returning a waveform array
    //------------------------------------------------------------
-
-
+    ChannelRequestPolicy channelRequestPolicyGetWF;
+    channelRequestPolicyGetWF.setPolicy(CAFENUM::FLUSH_AFTER_EACH_MESSAGE,
+                                      CAFENUM::WAIT, CAFENUM::WITHOUT_CALLBACK); //Wait!!
+    status=cafe->getPolicyHelper().setChannelRequestPolicyGet(hArray[2], channelRequestPolicyGetWF);
    //inwf array of 20 doubles previous defined
    //copy to vector to illustrate other possibilities

@@ -546,6 +577,7 @@ int main( int argc, char *argv[] )
        cout << endl;
    }

+
    //reset offset for read and the nelemtonative
    cout << "Resetting nelem for wf to native value: " << cafe->getHandleHelper().setNelemToNative(hArray[2])
         << " and resetting offset to: " <<  cafe->getHandleHelper().setOffset(hArray[2], 0) << endl;
@@ -1124,7 +1156,7 @@ int main( int argc, char *argv[] )

    MonitorPolicy mp, mp2;
    mp.setUserArgs((void *) pvArray[0].c_str());
-    mp.setHandler(callbackHandlerMoqnitor);
+    mp.setHandler(callbackHandlerMonitor);
    mp.setCafeDbrType(CAFENUM::DBR_TIME);
    mp.setDataType(DBR_STS_FLOAT); //THis will overwrite DBR_TIME above
    mp.setMask(DBE_VALUE | DBE_LOG | DBE_ALARM);
--- a/examples/cafeTest/makefile7
+++ b/examples/cafeTest/makefile7
@@ -8,8 +8,8 @@
 #-py37- libcafe.so: undefined reference to `cy_event_handler_wrapper
 #CAFE version to link to
 #CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0
-#CAFE_VERSION=cafe-1.15.0-py37-gcc-10.3.0
-CAFE_VERSION=cafe-1.15.0-gcc-10.3.0
+CAFE_VERSION=cafe-1.19.1-gcc-7.3.0
+#CAFE_VERSION=cafe-1.15.0-gcc-10.3.0

 PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m
 PYTHON_LIB=/opt/gfa/python-3.7/latest/lib
--- a/examples/cafeTest/makefile_local_win
+++ b/examples/cafeTest/makefile_local_win
@@ -1,22 +1,26 @@
-INCLUDES = -Ic:\CAFE\CAFE\cpp\include -Ic:\CAFE\CAFE\cpp -Ic:\local\boost_1_62_0 \
-Ic:\local\boost_1_62_0\boost  -Ic:\epics\base-3.14.12.5\include -Ic:\epics\base-3.14.12.5\include\os\WIN32 \
-Ic:\Qt\4.8.4\include
+INCLUDES = -Ic:\EPICS\CAFE\cpp\include -Ic:\EPICS\CAFE\cpp -Ic:\EPICS\boost_1_81_0 \
+-Ic:\EPICS\boost_1_81_0\boost  -IC:\epics\epics-base\include -IC:\epics\epics-base\include\os\WIN32 \
+-Ic:\EPICS\epics-base\include\compiler\msvc \
+#-Ic:\Qt\4.8.4\include
 CXX=cl
-CXXFLAGS = /W4 /EHsc
-OUTPUT_OPTION = /o $@
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\CAFE\CAFE\cpp\cafe.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib \
-C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib
+CXXFLAGS = -DUSE_TYPED_RSET  -EHsc   -nologo -FC -D__STDC__=0 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE    -Ox -GL -Oy-   -W3        -MD -DEPICS_BUILD_DLL -DEPICS_CALL_DLL -c
+OUTPUT_OPTION = /Fo"$@"
+LIB_LOCAL = C:\epics\epics-base\lib\win32-x86\Com.lib C:\epics\epics-base\lib\win32-x86\ca.lib \
+C:\EPICS\CAFE\cpp\cafe.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_thread-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_system-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_date_time-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_chrono-vc142-mt-x32-1_81.lib \
+# C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib

 cafeTest: cafeTest.obj
-	$(CXX) cafeTest.obj $(LIB_LOCAL) 
+	link -nologo  -LTCG -incremental:no -opt:ref -release cafeTest.obj $(LIB_LOCAL)
 	
-cafeTest.obj: cafeTest.cpp
-	$(CXX) $(CXXFLAGS) $(INCLUDES) /c cafeTest.cpp
+cafeTest.obj: cafeTest.cc
+	$(CXX) $(CXXFLAGS) $(INCLUDES) cafeTest.cc
+
+clean:
+	del *.obj 
 	
 #"C:\Program Files (x86)\GnuWin32\bin\make" 

--- a/examples/cafeTest/makefile_local_windows7
+++ b/examples/cafeTest/makefile_local_windows7
@@ -0,0 +1,23 @@
+INCLUDES = -Ic:\CAFE\CAFE\cpp\include -Ic:\CAFE\CAFE\cpp -Ic:\local\boost_1_62_0 \
+-Ic:\local\boost_1_62_0\boost  -Ic:\epics\base-3.14.12.5\include -Ic:\epics\base-3.14.12.5\include\os\WIN32 \
+-Ic:\Qt\4.8.4\include
+CXX=cl
+CXXFLAGS = /W4 /EHsc
+OUTPUT_OPTION = /o $@
+LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
+C:\CAFE\CAFE\cpp\cafe.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib \
+C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib
+
+cafeTest: cafeTest.obj
+	$(CXX) cafeTest.obj $(LIB_LOCAL) 
+	
+cafeTest.obj: cafeTest.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) /c cafeTest.cpp
+	
+#"C:\Program Files (x86)\GnuWin32\bin\make" 
+
+
--- a/include/conduitEventHandlerArgs.h
+++ b/include/conduitEventHandlerArgs.h
@@ -263,6 +263,7 @@ struct change_eventHandlerArgs



+
        switch(dbrTypeClass)
        {
        case CAFENUM::DBR_PRIMITIVE:
@@ -340,6 +341,7 @@ struct change_eventHandlerArgs

            for (long i=0; i<new_eventHandlerArgs.count; ++i)
            {
+	     
                (*(&((c.dataBuffer)->fltval)+i))
                    =  (dbr_float_t) (*(&( ( (union db_access_val *)  new_eventHandlerArgs.dbr)->fltval)+i));
            }
@@ -504,6 +506,7 @@ struct change_eventHandlerArgs

            for (long i=0; i<new_eventHandlerArgs.count; ++i)
            {
+	      
                (*(&((c.dataBuffer)->tdblval.value)+i))
                    = (*(&( ((union db_access_val *)  new_eventHandlerArgs.dbr)->tdblval.value)+i));
            }
@@ -522,12 +525,15 @@ struct change_eventHandlerArgs
        case DBR_TIME_FLOAT: //16

            for (long i=0; i<new_eventHandlerArgs.count; ++i)
-            {
-
+            { 
+	     
+	      
                (*(&((c.dataBuffer)->tfltval.value)+i))
                    =  (dbr_float_t) (*(&( ( (union db_access_val *)  new_eventHandlerArgs.dbr)->tfltval.value)+i));

-
+		//if (i< 10) {
+		// std::cout << i << " // " << __METHOD__ << " " << (*(&((c.dataBuffer)->tfltval.value)+i)) << std::endl;
+		//}
            }

            (*(&((c.dataBuffer)->tfltval.status))) = ((struct dbr_time_float *) new_eventHandlerArgs.dbr)->status;
--- a/include/config.h
+++ b/include/config.h
@@ -2,13 +2,13 @@
 /* ./include/config.in.  Generated from configure.ac by autoheader.  */

 /* epics major release */
-#define EPICS_MAJOR 3
+#define EPICS_MAJOR 7

 /* epics minor release */
-#define EPICS_MINOR 14
+#define EPICS_MINOR 0

 /* epics patch release */
-#define EPICS_PATCH 12
+#define EPICS_PATCH 7

 /* Availability of boost */
 #define HAVE_BOOST 1
@@ -29,7 +29,7 @@
 #define HAVE_DLFCN_H 1

 /* epics version */
-#define HAVE_EPICS 3.14.12
+#define HAVE_EPICS 7.0.7

 /* Define to 1 if you have the <epicsTypes.h> header file. */
 #define HAVE_EPICSTYPES_H 1
@@ -57,7 +57,7 @@
 /* #undef HAVE_LIBLZ4 */

 /* Define to 1 if you have the `python3.10' library (-lpython3.10). */
-/* #undef HAVE_LIBPYTHON3_10 */
+#define HAVE_LIBPYTHON3_10 1

 /* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */
 /* #undef HAVE_LIBPYTHON3_4M */
@@ -72,16 +72,16 @@
 /* #undef HAVE_LIBPYTHON3_8 */

 /* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */
-#define HAVE_LIBQT5CORE 1
+/* #undef HAVE_LIBQT5CORE */

 /* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */
-#define HAVE_LIBQT5XML 1
+/* #undef HAVE_LIBQT5XML */

 /* Define to 1 if you have the `QtCore' library (-lQtCore). */
 /* #undef HAVE_LIBQTCORE */

 /* Availability of Qt version 5 confirmed */
-#define HAVE_LIBQTXML 1
+/* #undef HAVE_LIBQTXML */

 /* Define to 1 if you have the `zmq' library (-lzmq). */
 /* #undef HAVE_LIBZMQ */
@@ -102,19 +102,19 @@
 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1

 /* pycafe extern C */
-/* #undef HAVE_PYCAFE_EXT */
+#define HAVE_PYCAFE_EXT 1

 /* Availability of python */
-/* #undef HAVE_PYTHON */
+#define HAVE_PYTHON 1

 /* Define to 1 if you have the <Python.h> header file. */
-/* #undef HAVE_PYTHON_H */
+#define HAVE_PYTHON_H 1

 /* Availability of Qt version 5 confirmed */
-#define HAVE_QT 1
+/* #undef HAVE_QT */

 /* Define to 1 if you have the <qxml.h> header file. */
-#define HAVE_QXML_H 1
+/* #undef HAVE_QXML_H */

 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -156,7 +156,7 @@
 #define PACKAGE_NAME "CAFE"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "CAFE 1.18.0"
+#define PACKAGE_STRING "CAFE 1.19.3"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "cafe"
@@ -165,13 +165,13 @@
 #define PACKAGE_URL ""

 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.18.0"
+#define PACKAGE_VERSION "1.19.3"

 /* Availability of Qt version 5 confirmed */
-#define QT_NO_VERSION_TAGGING 1
+/* #undef QT_NO_VERSION_TAGGING */

 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

 /* Version number of package */
-#define VERSION "1.18.0"
+#define VERSION "1.19.3"
--- a/include/connect.h
+++ b/include/connect.h
@@ -33,6 +33,8 @@
 #endif

 #include <epicsVersion.h>
+//include <epicsMutex.h>
+

 class Connect
 {
@@ -44,16 +46,12 @@ protected:
    CAFEGlobalAlarmSeverity  epicsAlarmSeverity;
    CAFEGlobalAlarmCondition epicsAlarmStatus;

-
    cafeConduit_set::iterator itcs;
    cafeGroup_set::iterator itgs;

    CAFEDataTypeCode cafeDataTypeCode;
-
    ExceptionsHelper exceptionsHelper;

-
-
    PolicyHelper policyHelper;
    HandleHelper handleHelper;
    Helper helper;
@@ -65,7 +63,7 @@ protected:
    //connectCallbacks.cc
    static void callbackHandlerAccessRights(struct access_rights_handler_args args);

-    static void callbackHandlerException   (struct exception_handler_args     args);
+    static void callbackHandlerException   (struct exception_handler_args args);

    //connect.cpp
     //int  createHandle(const char * pv, ca_client_context * ccc, ChannelRequestPolicy channelRequestPolicyPut, unsigned int  &handle)
--- a/include/global.h
+++ b/include/global.h
@@ -9,6 +9,7 @@

 #ifndef GLOBAL_H
 #define GLOBAL_H
+#include <epicsTime.h>
 #include <epicsMutex.h>
 #include <cadef.h>
 #include <hashConduit.h>
--- a/include/instant.h
+++ b/include/instant.h
@@ -14,6 +14,7 @@
 //include <policyHelper.h>

 //extern cafeConduit_set cs;
+#include <epicsMutex.h>

 template <class CTYPE> class Instant
 {
@@ -27,7 +28,7 @@ private:
    Transpose<dbr_long_t>   renderLong;   // 5
    Transpose<dbr_double_t> renderDouble; // 6

-    CAFEStatus   cafeStatus;
+    CAFEStatus cafeStatus;
    Granules cafeGranules;

    PolicyHelper policyHelper;
--- a/include/makefile
+++ b/include/makefile
@@ -1,7 +1,7 @@
-# makefile.in generated by automake 1.13.4 from makefile.am.
+# makefile.in generated by automake 1.16.1 from makefile.am.
 # include/makefile.  Generated from makefile.in by configure.

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@



-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -76,8 +86,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
 #am__append_1 = zbsread.h zbsHash.h zbsdtHelper.h zbsDataHolders.h \
 #                   bitshuffle/bitshuffle_core.h bitshuffle/bitshuffle.h bitshuffle/iochain.h \
 #		   bitshuffle/bitshuffle_internals.h 									
@@ -86,11 +96,9 @@ host_triplet = x86_64-unknown-linux-gnu
 #if HAVE_PYTHON_
 #include_HEADERS += PyCafe_api.h
 #endif
-#am__append_2 = PyCafe.h 
-am__append_3 = PyCafe_api.h
+am__append_2 = PyCafe.h 
+#am__append_3 = PyCafe_api.h
 subdir = include
-DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/makefile.am \
-	$(am__include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -98,6 +106,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/makefile.am $(am__include_HEADERS_DIST) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/./include/config.h
 CONFIG_CLEAN_FILES =
@@ -185,25 +195,26 @@ am__define_uniq_tagged_files = \
  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.13
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.13
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
+CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -225,9 +236,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = -lpython3.10 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -245,23 +256,23 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.18.0
+PACKAGE_STRING = CAFE 1.19.3
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.18.0
+PACKAGE_VERSION = 1.19.3
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.18.0
+VERSION = 1.19.3
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -270,27 +281,27 @@ am__quote =
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = x86_64-pc-linux-gnu
 build_alias = 
 build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = x86_64-pc-linux-gnu
 host_alias = 
 host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -298,7 +309,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -337,14 +348,13 @@ $(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu include/makefile
-.PRECIOUS: makefile
 makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -435,7 +445,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -584,6 +597,8 @@ uninstall-am: uninstall-includeHEADERS
 	ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-includeHEADERS

+.PRECIOUS: makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/policies.h
+++ b/include/policies.h
@@ -120,7 +120,7 @@ public:
    }
    unsigned short setPriority(unsigned short p)
    {
-        priority=std::min(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
+        priority=(std::min)(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
        return priority;
    }

@@ -462,17 +462,17 @@ public:
    };
    double setTimeout(double t)
    {
-        timeout=std::max(t,TIMEOUT_PEND_IO_MIN);
-        return timeout=std::min(timeout,TIMEOUT_PEND_IO_MAX);
+        timeout=(std::max)(t,TIMEOUT_PEND_IO_MIN);
+        return timeout=(std::min)(timeout,TIMEOUT_PEND_IO_MAX);
    };
    double setDeltaTimeout(double dt)
    {
-        deltaTimeout=std::max(dt,PEND_IO_INCREMENT_TIME_MIN);
-        return deltaTimeout=std::min(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
+        deltaTimeout=(std::max)(dt,PEND_IO_INCREMENT_TIME_MIN);
+        return deltaTimeout=(std::min)(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
    };
    unsigned short setNtries(unsigned short nt)
    {
-        return ntries=std::min(nt, PEND_IO_MAX_TRIES);
+        return ntries=(std::min)(nt, PEND_IO_MAX_TRIES);
    };

    double setDefaultTimeout(double t)
--- a/include/policyHelper.h
+++ b/include/policyHelper.h
@@ -113,7 +113,7 @@ public:
        double g;
        int  st;
        st=getTimeout(_handle, p, g);
-        pg=std::min(p,g);
+        pg=(std::min)(p,g);
        return st;
    }
    int  getTimeoutPut(unsigned int  _handle, double &p)
@@ -192,7 +192,7 @@ public:
        double g;
        int  st;
        st=getSGTimeout(_handle, p, g);
-        pg=std::min(p,g);
+        pg=(std::min)(p,g);
        return st;
    }
    int  getSGTimeoutPut(unsigned int  _handle, double &p)
--- a/57
+++ b/57
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Generated automatically by config.status (cafe) 1.18.0
-# Libtool was configured on host sf-lc7.psi.ch:
+# Generated automatically by config.status (cafe) 1.19.3
+# Libtool was configured on host sf-lc8.psi.ch:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

 # Provide generalized library-building support services.
@@ -67,12 +67,12 @@ PATH_SEPARATOR=":"

 # The host system.
 host_alias=
-host=x86_64-unknown-linux-gnu
+host=x86_64-pc-linux-gnu
 host_os=linux-gnu

 # The build system.
 build_alias=
-build=x86_64-unknown-linux-gnu
+build=x86_64-pc-linux-gnu
 build_os=linux-gnu

 # A sed program that does not truncate output.
@@ -162,7 +162,7 @@ old_postuninstall_cmds=""
 lock_old_archive_extraction=no

 # A C compiler.
-LTCC="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+LTCC="/opt/psi/Programming/gcc/7.5.0/bin/gcc"

 # LTCC compiler flags.
 LTCFLAGS="-g -O2"
@@ -282,10 +282,10 @@ finish_eval=""
 hardcode_into_libs=yes

 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib /lib /usr/lib "
+sys_lib_search_path_spec="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib "

 # Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64/atlas /usr/lib64//bind9-export/ /usr/lib64/dyninst /usr/lib64/llvm /usr/lib64/mysql /usr/lib/oracle/12.2/client64/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/wine/ "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst                /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "

 # Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
 configure_time_lt_sys_library_path=""
@@ -315,7 +315,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"

 # A language specific compiler.
-CC="/opt/psi/Programming/gcc/7.3.0/bin/gcc"
+CC="/opt/psi/Programming/gcc/7.5.0/bin/gcc"

 # Is the compiler the GNU compiler?
 with_gcc=yes
@@ -7732,11 +7732,6 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;

-      -Wl,--as-needed)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
      -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -7789,10 +7784,12 @@ func_mode_link ()
      # -tp=*                Portland pgcc target processor selection
      # --sysroot=*          for sysroot support
      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
      # -stdlib=*            select c++ std lib with clang
      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*)
        func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
        func_append compile_command " $arg"
@@ -8041,7 +8038,6 @@ func_mode_link ()

    case $linkmode in
    lib)
-	as_needed_flag=
 	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
@@ -8053,7 +8049,6 @@ func_mode_link ()
 	done
 	;;
    prog)
-	as_needed_flag=
 	compile_deplibs=
 	finalize_deplibs=
 	alldeplibs=false
@@ -8123,15 +8118,6 @@ func_mode_link ()
 	lib=
 	found=false
 	case $deplib in
-	-Wl,--as-needed)
-	  if test prog,link = "$linkmode,$pass" ||
-	     test lib,link = "$linkmode,$pass"; then
-	    as_needed_flag="$deplib "
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
@@ -10549,13 +10535,6 @@ EOF
 	  test "X$libobjs" = "X " && libobjs=
 	fi

-	# A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds instead, but that
-	# comes from libtool.m4 which is part of the project being built. This should put it
-	# in the right place though.
-	if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
-	  libobjs=$as_needed_flag$libobjs
-	fi
-
 	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
 	  IFS=$sp$nl
@@ -10788,8 +10767,8 @@ EOF
      compile_deplibs=$new_libs


-      func_append compile_command " $as_needed_flag $compile_deplibs"
-      func_append finalize_command " $as_needed_flag $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"

      if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -11694,7 +11673,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"

 # A language specific compiler.
-CC="/opt/psi/Programming/gcc/7.3.0/bin/g++"
+CC="/opt/psi/Programming/gcc/7.5.0/bin/g++"

 # Is the compiler the GNU compiler?
 with_gcc=yes
@@ -11815,17 +11794,17 @@ file_list_spec=""
 hardcode_action=immediate

 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.3.0/lib64/../lib64 /opt/psi/Programming/gcc/7.3.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.3.0/lib64 /opt/psi/Programming/gcc/7.3.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../.."
+compiler_lib_search_dirs="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.."

 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtbeginS.o"
-postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/crtendS.o /lib/../lib64/crtn.o"
+predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o"
+postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"

 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.3.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.3.0/lib64 -L/opt/psi/Programming/gcc/7.3.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../.."
+compiler_lib_search_path="-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.."

 # ### END LIBTOOL TAG CONFIG: CXX
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2867,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  # before this can be enabled.
  hardcode_into_libs=yes

+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
  # Ideally, we could use ldconfig to report *all* directores which are
  # searched for libraries, however this is still not possible.  Aside from not
  # being certain /sbin/ldconfig is available, command
@@ -2875,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  # appending ld.so.conf contents (and includes) to the search path.
  if test -f /etc/ld.so.conf; then
    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
  fi

  # We used to test for /lib/ld.so.1 and disable shared libraries on
--- a/122
+++ b/122
@@ -1,7 +1,7 @@
-# makefile.in generated by automake 1.13.4 from makefile.am.
+# makefile.in generated by automake 1.16.1 from makefile.am.
 # makefile.  Generated from makefile.in by configure.

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@



-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -76,19 +86,9 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/makefile.in $(srcdir)/makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/./include/config.in $(include_HEADERS) \
-	.//AUTHORS COPYING .//COPYING .//ChangeLog .//INSTALL .//NEWS \
-	.//README config.guess .//config.guess config.sub \
-	.//config.sub install-sh .//install-sh missing .//missing \
-	ltmain.sh .//ltmain.sh $(top_srcdir)/./config.guess \
-	$(top_srcdir)/./config.sub $(top_srcdir)/./install-sh \
-	$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -96,6 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -165,7 +167,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -187,6 +189,15 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./compile \
+	$(top_srcdir)/./config.guess $(top_srcdir)/./config.sub \
+	$(top_srcdir)/./include/config.in $(top_srcdir)/./install-sh \
+	$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing .//AUTHORS \
+	.//COPYING .//ChangeLog .//INSTALL .//NEWS .//README \
+	.//compile .//config.guess .//config.sub .//install-sh \
+	.//ltmain.sh .//missing AUTHORS COPYING ChangeLog INSTALL NEWS \
+	README compile config.guess config.sub install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -229,24 +240,24 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.13
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  @CAFE_LIBS@
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib @CAFE_LIBS@
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.13
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
+CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -268,9 +279,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = -lpython3.10 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -288,23 +299,23 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.18.0
+PACKAGE_STRING = CAFE 1.19.3
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.18.0
+PACKAGE_VERSION = 1.19.3
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.18.0
+VERSION = 1.19.3
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -313,27 +324,27 @@ am__quote =
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = x86_64-pc-linux-gnu
 build_alias = 
 build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = x86_64-pc-linux-gnu
 host_alias = 
 host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -341,7 +352,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -373,15 +384,14 @@ $(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu makefile
-.PRECIOUS: makefile
 makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -394,8 +404,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):

 ./include/config.h: ./include/stamp-h1
-	@if test ! -f $@; then rm -f ./include/stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) ./include/stamp-h1; else :; fi
+	@test -f $@ || rm -f ./include/stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) ./include/stamp-h1

 ./include/stamp-h1: $(top_srcdir)/./include/config.in $(top_builddir)/config.status
 	@rm -f ./include/stamp-h1
@@ -544,7 +554,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -609,7 +622,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@@ -625,11 +638,17 @@ dist-xz: distdir
 	$(am__post_remove_distdir)

 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)

 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@@ -647,7 +666,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -657,22 +676,23 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -852,6 +872,8 @@ uninstall-am: uninstall-includeHEADERS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-includeHEADERS

+.PRECIOUS: makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/src/PyCafe37.cpp
+++ b/src/PyCafe37.cpp
--- a/src/bitshuffle/.deps/bitshuffle.Plo
+++ b/src/bitshuffle/.deps/bitshuffle.Plo
@@ -1,27 +1,38 @@
 bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \
 /usr/include/stdc-predef.h bitshuffle/bitshuffle.h /usr/include/stdlib.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/bits/libc-header-start.h /usr/include/features.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/bits/long-double.h /usr/include/gnu/stubs.h \
 /usr/include/gnu/stubs-64.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
 /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
+ /usr/include/sys/types.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h /usr/include/bits/stdint-intn.h \
 /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h /usr/include/bits/byteswap-16.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/bits/stdlib-float.h bitshuffle/bitshuffle_core.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/uintn-identity.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/types/sigset_t.h /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ bitshuffle/bitshuffle_core.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
 /usr/include/stdint.h /usr/include/bits/wchar.h \
- bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \
- .././include/lz4.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/stdint-uintn.h bitshuffle/bitshuffle_internals.h \
+ bitshuffle/iochain.h .././include/lz4.h /usr/include/stdio.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
+ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
 /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/string.h /usr/include/xlocale.h \
- /usr/include/bits/string.h /usr/include/bits/string2.h
+ /usr/include/bits/stdio.h /usr/include/string.h \
+ /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \
+ /usr/include/strings.h

 /usr/include/stdc-predef.h:

@@ -29,12 +40,16 @@ bitshuffle/bitshuffle.h:

 /usr/include/stdlib.h:

+/usr/include/bits/libc-header-start.h:
+
 /usr/include/features.h:

 /usr/include/sys/cdefs.h:

 /usr/include/bits/wordsize.h:

+/usr/include/bits/long-double.h:
+
 /usr/include/gnu/stubs.h:

 /usr/include/gnu/stubs-64.h:
@@ -45,36 +60,56 @@ bitshuffle/bitshuffle.h:

 /usr/include/bits/waitstatus.h:

+/usr/include/bits/floatn.h:
+
+/usr/include/bits/floatn-common.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/bits/types/clock_t.h:
+
+/usr/include/bits/types/clockid_t.h:
+
+/usr/include/bits/types/time_t.h:
+
+/usr/include/bits/types/timer_t.h:
+
+/usr/include/bits/stdint-intn.h:
+
 /usr/include/endian.h:

 /usr/include/bits/endian.h:

 /usr/include/bits/byteswap.h:

-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/bits/byteswap-16.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
+/usr/include/bits/uintn-identity.h:

 /usr/include/sys/select.h:

 /usr/include/bits/select.h:

-/usr/include/bits/sigset.h:
+/usr/include/bits/types/sigset_t.h:

-/usr/include/bits/time.h:
+/usr/include/bits/types/__sigset_t.h:

-/usr/include/sys/sysmacros.h:
+/usr/include/bits/types/struct_timeval.h:
+
+/usr/include/bits/types/struct_timespec.h:

 /usr/include/bits/pthreadtypes.h:

+/usr/include/bits/thread-shared-types.h:
+
+/usr/include/bits/pthreadtypes-arch.h:
+
 /usr/include/alloca.h:

+/usr/include/bits/stdlib-bsearch.h:
+
 /usr/include/bits/stdlib-float.h:

 bitshuffle/bitshuffle_core.h:
@@ -85,6 +120,8 @@ bitshuffle/bitshuffle_core.h:

 /usr/include/bits/wchar.h:

+/usr/include/bits/stdint-uintn.h:
+
 bitshuffle/bitshuffle_internals.h:

 bitshuffle/iochain.h:
@@ -93,14 +130,20 @@ bitshuffle/iochain.h:

 /usr/include/stdio.h:

-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:

+/usr/include/bits/types/__fpos_t.h:
+
+/usr/include/bits/types/__mbstate_t.h:
+
+/usr/include/bits/types/__fpos64_t.h:
+
+/usr/include/bits/types/__FILE.h:
+
+/usr/include/bits/types/FILE.h:
+
+/usr/include/bits/types/struct_FILE.h:
+
 /usr/include/bits/stdio_lim.h:

 /usr/include/bits/sys_errlist.h:
@@ -109,8 +152,8 @@ bitshuffle/iochain.h:

 /usr/include/string.h:

-/usr/include/xlocale.h:
+/usr/include/bits/types/locale_t.h:

-/usr/include/bits/string.h:
+/usr/include/bits/types/__locale_t.h:

-/usr/include/bits/string2.h:
+/usr/include/strings.h:
--- a/src/bitshuffle/.deps/bitshuffle_core.Plo
+++ b/src/bitshuffle/.deps/bitshuffle_core.Plo
@@ -1,26 +1,38 @@
 bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
 /usr/include/stdc-predef.h bitshuffle/bitshuffle_core.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
- /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \
- /usr/include/stdlib.h \
+ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/bits/wchar.h /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h /usr/include/stdlib.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
 /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h /usr/include/bits/byteswap-16.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/bits/stdlib-float.h bitshuffle/bitshuffle_internals.h \
- bitshuffle/iochain.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
+ /usr/include/sys/types.h /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/bits/uintn-identity.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \
+ /usr/include/stdio.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
+ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
 /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/string.h /usr/include/xlocale.h \
- /usr/include/bits/string.h /usr/include/bits/string2.h \
+ /usr/include/bits/stdio.h /usr/include/string.h \
+ /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \
+ /usr/include/strings.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h \
@@ -34,18 +46,30 @@ bitshuffle/bitshuffle_core.h:

 /usr/include/stdint.h:

+/usr/include/bits/libc-header-start.h:
+
 /usr/include/features.h:

 /usr/include/sys/cdefs.h:

 /usr/include/bits/wordsize.h:

+/usr/include/bits/long-double.h:
+
 /usr/include/gnu/stubs.h:

 /usr/include/gnu/stubs-64.h:

+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
 /usr/include/bits/wchar.h:

+/usr/include/bits/stdint-intn.h:
+
+/usr/include/bits/stdint-uintn.h:
+
 /usr/include/stdlib.h:

 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
@@ -54,36 +78,50 @@ bitshuffle/bitshuffle_core.h:

 /usr/include/bits/waitstatus.h:

+/usr/include/bits/floatn.h:
+
+/usr/include/bits/floatn-common.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/bits/types/clock_t.h:
+
+/usr/include/bits/types/clockid_t.h:
+
+/usr/include/bits/types/time_t.h:
+
+/usr/include/bits/types/timer_t.h:
+
 /usr/include/endian.h:

 /usr/include/bits/endian.h:

 /usr/include/bits/byteswap.h:

-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/bits/byteswap-16.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
+/usr/include/bits/uintn-identity.h:

 /usr/include/sys/select.h:

 /usr/include/bits/select.h:

-/usr/include/bits/sigset.h:
+/usr/include/bits/types/sigset_t.h:

-/usr/include/bits/time.h:
+/usr/include/bits/types/__sigset_t.h:

-/usr/include/sys/sysmacros.h:
+/usr/include/bits/types/struct_timeval.h:
+
+/usr/include/bits/types/struct_timespec.h:

 /usr/include/bits/pthreadtypes.h:

+/usr/include/bits/thread-shared-types.h:
+
+/usr/include/bits/pthreadtypes-arch.h:
+
 /usr/include/alloca.h:

+/usr/include/bits/stdlib-bsearch.h:
+
 /usr/include/bits/stdlib-float.h:

 bitshuffle/bitshuffle_internals.h:
@@ -92,14 +130,20 @@ bitshuffle/iochain.h:

 /usr/include/stdio.h:

-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:

+/usr/include/bits/types/__fpos_t.h:
+
+/usr/include/bits/types/__mbstate_t.h:
+
+/usr/include/bits/types/__fpos64_t.h:
+
+/usr/include/bits/types/__FILE.h:
+
+/usr/include/bits/types/FILE.h:
+
+/usr/include/bits/types/struct_FILE.h:
+
 /usr/include/bits/stdio_lim.h:

 /usr/include/bits/sys_errlist.h:
@@ -108,11 +152,11 @@ bitshuffle/iochain.h:

 /usr/include/string.h:

-/usr/include/xlocale.h:
+/usr/include/bits/types/locale_t.h:

-/usr/include/bits/string.h:
+/usr/include/bits/types/__locale_t.h:

-/usr/include/bits/string2.h:
+/usr/include/strings.h:

 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h:

--- a/src/bitshuffle/.deps/iochain.Plo
+++ b/src/bitshuffle/.deps/iochain.Plo
@@ -1,28 +1,40 @@
 bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \
- /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
+ /usr/include/stdlib.h /usr/include/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
 /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
+ /usr/include/sys/types.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h /usr/include/bits/stdint-intn.h \
 /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h /usr/include/bits/byteswap-16.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/bits/stdlib-float.h bitshuffle/iochain.h
+ /usr/include/bits/byteswap.h /usr/include/bits/uintn-identity.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/types/sigset_t.h /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ bitshuffle/iochain.h

 /usr/include/stdc-predef.h:

 /usr/include/stdlib.h:

+/usr/include/bits/libc-header-start.h:
+
 /usr/include/features.h:

 /usr/include/sys/cdefs.h:

 /usr/include/bits/wordsize.h:

+/usr/include/bits/long-double.h:
+
 /usr/include/gnu/stubs.h:

 /usr/include/gnu/stubs-64.h:
@@ -33,36 +45,56 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \

 /usr/include/bits/waitstatus.h:

+/usr/include/bits/floatn.h:
+
+/usr/include/bits/floatn-common.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/bits/types/clock_t.h:
+
+/usr/include/bits/types/clockid_t.h:
+
+/usr/include/bits/types/time_t.h:
+
+/usr/include/bits/types/timer_t.h:
+
+/usr/include/bits/stdint-intn.h:
+
 /usr/include/endian.h:

 /usr/include/bits/endian.h:

 /usr/include/bits/byteswap.h:

-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/bits/byteswap-16.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
+/usr/include/bits/uintn-identity.h:

 /usr/include/sys/select.h:

 /usr/include/bits/select.h:

-/usr/include/bits/sigset.h:
+/usr/include/bits/types/sigset_t.h:

-/usr/include/bits/time.h:
+/usr/include/bits/types/__sigset_t.h:

-/usr/include/sys/sysmacros.h:
+/usr/include/bits/types/struct_timeval.h:
+
+/usr/include/bits/types/struct_timespec.h:

 /usr/include/bits/pthreadtypes.h:

+/usr/include/bits/thread-shared-types.h:
+
+/usr/include/bits/pthreadtypes-arch.h:
+
 /usr/include/alloca.h:

+/usr/include/bits/stdlib-bsearch.h:
+
 /usr/include/bits/stdlib-float.h:

 bitshuffle/iochain.h:
--- a/src/cafe.cpp
+++ b/src/cafe.cpp
@@ -30,20 +30,6 @@

 using namespace std;

-bool MUTEX=true;
-bool CHECK_CONSISTENCY_CA_STATE=true;
-bool SF_WITH_PULSE_ID = false;
-
-vector<PVGroup> PVGroupV;
-vector<PVGroup> PVGroupPseudo;
-vector<deviceCollection>  deviceCollectionV;
-vector<string> globalChannelList;
-map<vector<unsigned int>, string> groupPseudoMap;
-
-cafeGroup_set gs;
-cafeConduit_set cs;
-epicsMutex cafeMutex;
-
 /*
 int CAFE::wfExpress(const unsigned int handle) {
  int status = ICAFE_NORMAL;
@@ -81,14 +67,19 @@ int CAFE::wfExpress(const unsigned int handle,  const unsigned int nelem, dbr_ch

  if (it_handle != handle_index.end())
    {
-      
-      
+         
      std::cout << "Initiate Callback =============" << std::endl;
      status=(*it_handle).getWithCallback(CALLBACK_CAFE::handlerGet);
      ca_flush_io();
      for (int i=0; i <20; ++i) {

-	sleep(0.05);
+#if HAVE_BOOST_THREAD
+        boost::this_thread::sleep_for(boost::chrono::milliseconds(50));
+#else
+#if HAVE_LINUX
+	    sleep(0.05);
+#endif
+#endif
 	//std::cout << "iscb done " << cafeGranules.isGetCallbackDone(handle) << std::endl;

      }
@@ -986,7 +977,15 @@ int CAFE::get(const unsigned int handle, PVDataHolder & pvd)
        }
        if ((status=cafeGranules.channelExecuteGet(handle)) != ICAFE_NORMAL)
        {
+	    std::cout << "HANDLE " << handle << __METHOD__ << std::endl;  
+	    
            (*it_handle).getPVDataHolder(pvd);
+	    std::cout << "BELEM " << pvd.nelem << __METHOD__ << std::endl;  
+	    std::cout << pvd.getAsFloat(0) << std::endl;
+	    if (pvd.nelem > 1) {
+	      std::cout << "////" <<  pvd.getAsFloat(1) << std::endl;
+	    }
+
            pvd.status=status;
            pvd.alarmStatus=-1;
            pvd.alarmSeverity=-1;
@@ -5238,7 +5237,13 @@ int CAFE::supplementHandlesV(std::vector<unsigned int> hV)
    for (int ij=0; ij<20; ++ij) {
 	    if (!initCallbackComplete(allHandles) ) {
 	      //cout << "Will wait for " << ij << " " << (1+ij)*0.1 << " ======= SECONDS ==== " << endl;
-	      usleep(100000); //tenth of a sec and loop over 2 sec
+#if HAVE_BOOST_THREAD
+                boost::this_thread::sleep_for(boost::chrono::microseconds(100000)); //tenth of a sec and loop over 2 sec
+#else
+#if HAVE_LINUX
+                usleep(100000); //tenth of a sec and loop over 2 sec
+#endif
+#endif
 	    }
     }
   
--- a/src/callbackHandlerCreate.cpp
+++ b/src/callbackHandlerCreate.cpp
@@ -203,8 +203,7 @@ void ChannelCreatePolicy::callbackHandlerCreate(struct connection_handler_args a
                CAFEStatus cafeStatus;
                cafeStatus.report(status);
            }
-	   
-
+	    
            // Check if any monitors for this channel are to be started.....
            // If monitors are to be started, then start the monitors
            // pass on handler functions
--- a/src/conduit.cpp
+++ b/src/conduit.cpp
@@ -582,7 +582,7 @@ int  Conduit::get(void) const

    std::cout << "Time Elapsed " << timeElapsed << std::endl;
    std::cout << "Time Elapsed/per event " << timeElapsed/nevent << std::endl;
-    */ 
+    */
    return ca_array_get(channelRequestMetaData.dbrDataType, channelRequestMetaData.nelem,
                        channelRegalia.channelID, dataBuffer);

--- a/src/connect.cpp
+++ b/src/connect.cpp
@@ -5,7 +5,7 @@
 /// \version CAFE 1.6.0
 ///

-#include <epicsMutex.h>
+//#include <epicsMutex.h>

 #include <connect.h>
 #include <conduitFriends.h>
@@ -27,7 +27,23 @@
 #endif


+bool MUTEX=true;
+bool CHECK_CONSISTENCY_CA_STATE=true;
+bool SF_WITH_PULSE_ID = false;
+
 using namespace std;
+vector<PVGroup> PVGroupV;
+vector<PVGroup> PVGroupPseudo;
+vector<deviceCollection>  deviceCollectionV;
+vector<string> globalChannelList;
+map<vector<unsigned int>, string> groupPseudoMap;
+
+cafeGroup_set gs;
+cafeConduit_set cs;
+epicsMutex cafeMutex;
+
+
+
 //epicsMutex cafeMutex;

 /**
@@ -197,7 +213,7 @@ int Connect::createChannel(unsigned int handle, const char * pv, chid &pCh)
            {

 #if HAVE_BOOST_THREAD
-                boost::this_thread::sleep_for(boost::chrono::microseconds(microSedcondsWait));
+                boost::this_thread::sleep_for(boost::chrono::microseconds(microSecondsWait));
 #else
 #if HAVE_LINUX
                usleep(microSecondsWait);
--- a/src/makefile
+++ b/src/makefile
@@ -1,7 +1,7 @@
-# makefile.in generated by automake 1.13.4 from makefile.am.
+# makefile.in generated by automake 1.16.1 from makefile.am.
 # src/makefile.  Generated from makefile.in by configure.

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@



-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -76,15 +86,13 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-#am__append_1 = PyCafe.cpp
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+am__append_1 = PyCafe.cpp
 #am__append_2 = zbsCafeService.cpp zbsDataHolders.cpp \
 #		bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c

 subdir = src
-DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/makefile.am \
-	$(top_srcdir)/./depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -92,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/./include/config.h
 CONFIG_CLEAN_FILES =
@@ -137,7 +146,7 @@ am__libcafe_la_SOURCES_DIST = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	zbsCafeService.cpp zbsDataHolders.cpp \
 	bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c \
 	bitshuffle/iochain.c
-#am__objects_1 = PyCafe.lo
+am__objects_1 = PyCafe.lo
 am__dirstamp = $(am__leading_dot)dirstamp
 #am__objects_2 = zbsCafeService.lo zbsDataHolders.lo \
 #	bitshuffle/bitshuffle_core.lo \
@@ -173,7 +182,25 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/./include
 depcomp = $(SHELL) $(top_srcdir)/./depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/PyCafe.Plo ./$(DEPDIR)/cafe.Plo \
+	./$(DEPDIR)/cafeCache.Plo ./$(DEPDIR)/cafeGroup.Plo \
+	./$(DEPDIR)/cafeVectors.Plo ./$(DEPDIR)/cafeXML.Plo \
+	./$(DEPDIR)/callbackHandlerCreate.Plo \
+	./$(DEPDIR)/callbackHandlerMonitor.Plo ./$(DEPDIR)/conduit.Plo \
+	./$(DEPDIR)/conduitGroup.Plo ./$(DEPDIR)/connect.Plo \
+	./$(DEPDIR)/connectCallbacks.Plo ./$(DEPDIR)/connectGroup.Plo \
+	./$(DEPDIR)/exceptionsHelper.Plo ./$(DEPDIR)/granules.Plo \
+	./$(DEPDIR)/handleHelper.Plo ./$(DEPDIR)/helper.Plo \
+	./$(DEPDIR)/loadCollectionXMLParser.Plo \
+	./$(DEPDIR)/loadGroupXMLParser.Plo \
+	./$(DEPDIR)/methodCallbacks.Plo ./$(DEPDIR)/policyHelper.Plo \
+	./$(DEPDIR)/restorePVGroupXMLParser.Plo \
+	./$(DEPDIR)/transpose.Plo ./$(DEPDIR)/zbsCafeService.Plo \
+	./$(DEPDIR)/zbsDataHolders.Plo \
+	bitshuffle/$(DEPDIR)/bitshuffle.Plo \
+	bitshuffle/$(DEPDIR)/bitshuffle_core.Plo \
+	bitshuffle/$(DEPDIR)/iochain.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -237,8 +264,9 @@ am__define_uniq_tagged_files = \
  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.13
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}

 #if HAVE_PYCAFE_EXT_
@@ -248,22 +276,22 @@ AMTAR = $${TAR-tar}
 #if HAVE_PYTHON_
 #libcafe_la_SOURCES += pycafe/PyCafe.cpp
 #endif
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.13
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
-CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
-CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
-CXX = /opt/psi/Programming/gcc/7.3.0/bin/g++
-CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
+CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
+CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++
+CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
@@ -285,9 +313,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib  -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = -lpython3.10 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -305,23 +333,23 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.18.0
+PACKAGE_STRING = CAFE 1.19.3
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.18.0
+PACKAGE_VERSION = 1.19.3
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.18.0
+VERSION = 1.19.3
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 ac_ct_AR = ar
-ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
+ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
 ac_ct_CXX = 
 ac_ct_DUMPBIN = 
 am__include = include
@@ -330,27 +358,27 @@ am__quote =
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = x86_64-pc-linux-gnu
 build_alias = 
 build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = x86_64-pc-linux-gnu
 host_alias = 
 host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -358,7 +386,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -377,8 +405,8 @@ lib_LTLIBRARIES = libcafe.la
 #1st: current-age
 #2nd: age
 #3rd: revision
-#1.9.1   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 19:0:18
+#1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
+libcafe_la_LDFLAGS = -version-info 20:3:19
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \
 	callbackHandlerMonitor.cpp conduit.cpp connect.cpp \
@@ -404,14 +432,13 @@ $(srcdir)/makefile.in:  $(srcdir)/makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/makefile
-.PRECIOUS: makefile
 makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -481,34 +508,40 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-include ./$(DEPDIR)/PyCafe.Plo
-include ./$(DEPDIR)/cafe.Plo
-include ./$(DEPDIR)/cafeCache.Plo
-include ./$(DEPDIR)/cafeGroup.Plo
-include ./$(DEPDIR)/cafeVectors.Plo
-include ./$(DEPDIR)/cafeXML.Plo
-include ./$(DEPDIR)/callbackHandlerCreate.Plo
-include ./$(DEPDIR)/callbackHandlerMonitor.Plo
-include ./$(DEPDIR)/conduit.Plo
-include ./$(DEPDIR)/conduitGroup.Plo
-include ./$(DEPDIR)/connect.Plo
-include ./$(DEPDIR)/connectCallbacks.Plo
-include ./$(DEPDIR)/connectGroup.Plo
-include ./$(DEPDIR)/exceptionsHelper.Plo
-include ./$(DEPDIR)/granules.Plo
-include ./$(DEPDIR)/handleHelper.Plo
-include ./$(DEPDIR)/helper.Plo
-include ./$(DEPDIR)/loadCollectionXMLParser.Plo
-include ./$(DEPDIR)/loadGroupXMLParser.Plo
-include ./$(DEPDIR)/methodCallbacks.Plo
-include ./$(DEPDIR)/policyHelper.Plo
-include ./$(DEPDIR)/restorePVGroupXMLParser.Plo
-include ./$(DEPDIR)/transpose.Plo
-include ./$(DEPDIR)/zbsCafeService.Plo
-include ./$(DEPDIR)/zbsDataHolders.Plo
-include bitshuffle/$(DEPDIR)/bitshuffle.Plo
-include bitshuffle/$(DEPDIR)/bitshuffle_core.Plo
-include bitshuffle/$(DEPDIR)/iochain.Plo
+include ./$(DEPDIR)/PyCafe.Plo # am--include-marker
+include ./$(DEPDIR)/cafe.Plo # am--include-marker
+include ./$(DEPDIR)/cafeCache.Plo # am--include-marker
+include ./$(DEPDIR)/cafeGroup.Plo # am--include-marker
+include ./$(DEPDIR)/cafeVectors.Plo # am--include-marker
+include ./$(DEPDIR)/cafeXML.Plo # am--include-marker
+include ./$(DEPDIR)/callbackHandlerCreate.Plo # am--include-marker
+include ./$(DEPDIR)/callbackHandlerMonitor.Plo # am--include-marker
+include ./$(DEPDIR)/conduit.Plo # am--include-marker
+include ./$(DEPDIR)/conduitGroup.Plo # am--include-marker
+include ./$(DEPDIR)/connect.Plo # am--include-marker
+include ./$(DEPDIR)/connectCallbacks.Plo # am--include-marker
+include ./$(DEPDIR)/connectGroup.Plo # am--include-marker
+include ./$(DEPDIR)/exceptionsHelper.Plo # am--include-marker
+include ./$(DEPDIR)/granules.Plo # am--include-marker
+include ./$(DEPDIR)/handleHelper.Plo # am--include-marker
+include ./$(DEPDIR)/helper.Plo # am--include-marker
+include ./$(DEPDIR)/loadCollectionXMLParser.Plo # am--include-marker
+include ./$(DEPDIR)/loadGroupXMLParser.Plo # am--include-marker
+include ./$(DEPDIR)/methodCallbacks.Plo # am--include-marker
+include ./$(DEPDIR)/policyHelper.Plo # am--include-marker
+include ./$(DEPDIR)/restorePVGroupXMLParser.Plo # am--include-marker
+include ./$(DEPDIR)/transpose.Plo # am--include-marker
+include ./$(DEPDIR)/zbsCafeService.Plo # am--include-marker
+include ./$(DEPDIR)/zbsDataHolders.Plo # am--include-marker
+include bitshuffle/$(DEPDIR)/bitshuffle.Plo # am--include-marker
+include bitshuffle/$(DEPDIR)/bitshuffle_core.Plo # am--include-marker
+include bitshuffle/$(DEPDIR)/iochain.Plo # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)

 .c.o:
 	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -617,7 +650,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -692,7 +728,34 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am

 distclean: distclean-am
-	-rm -rf ./$(DEPDIR) bitshuffle/$(DEPDIR)
+		-rm -f ./$(DEPDIR)/PyCafe.Plo
+	-rm -f ./$(DEPDIR)/cafe.Plo
+	-rm -f ./$(DEPDIR)/cafeCache.Plo
+	-rm -f ./$(DEPDIR)/cafeGroup.Plo
+	-rm -f ./$(DEPDIR)/cafeVectors.Plo
+	-rm -f ./$(DEPDIR)/cafeXML.Plo
+	-rm -f ./$(DEPDIR)/callbackHandlerCreate.Plo
+	-rm -f ./$(DEPDIR)/callbackHandlerMonitor.Plo
+	-rm -f ./$(DEPDIR)/conduit.Plo
+	-rm -f ./$(DEPDIR)/conduitGroup.Plo
+	-rm -f ./$(DEPDIR)/connect.Plo
+	-rm -f ./$(DEPDIR)/connectCallbacks.Plo
+	-rm -f ./$(DEPDIR)/connectGroup.Plo
+	-rm -f ./$(DEPDIR)/exceptionsHelper.Plo
+	-rm -f ./$(DEPDIR)/granules.Plo
+	-rm -f ./$(DEPDIR)/handleHelper.Plo
+	-rm -f ./$(DEPDIR)/helper.Plo
+	-rm -f ./$(DEPDIR)/loadCollectionXMLParser.Plo
+	-rm -f ./$(DEPDIR)/loadGroupXMLParser.Plo
+	-rm -f ./$(DEPDIR)/methodCallbacks.Plo
+	-rm -f ./$(DEPDIR)/policyHelper.Plo
+	-rm -f ./$(DEPDIR)/restorePVGroupXMLParser.Plo
+	-rm -f ./$(DEPDIR)/transpose.Plo
+	-rm -f ./$(DEPDIR)/zbsCafeService.Plo
+	-rm -f ./$(DEPDIR)/zbsDataHolders.Plo
+	-rm -f bitshuffle/$(DEPDIR)/bitshuffle.Plo
+	-rm -f bitshuffle/$(DEPDIR)/bitshuffle_core.Plo
+	-rm -f bitshuffle/$(DEPDIR)/iochain.Plo
 	-rm -f makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -738,7 +801,34 @@ install-ps-am:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR) bitshuffle/$(DEPDIR)
+		-rm -f ./$(DEPDIR)/PyCafe.Plo
+	-rm -f ./$(DEPDIR)/cafe.Plo
+	-rm -f ./$(DEPDIR)/cafeCache.Plo
+	-rm -f ./$(DEPDIR)/cafeGroup.Plo
+	-rm -f ./$(DEPDIR)/cafeVectors.Plo
+	-rm -f ./$(DEPDIR)/cafeXML.Plo
+	-rm -f ./$(DEPDIR)/callbackHandlerCreate.Plo
+	-rm -f ./$(DEPDIR)/callbackHandlerMonitor.Plo
+	-rm -f ./$(DEPDIR)/conduit.Plo
+	-rm -f ./$(DEPDIR)/conduitGroup.Plo
+	-rm -f ./$(DEPDIR)/connect.Plo
+	-rm -f ./$(DEPDIR)/connectCallbacks.Plo
+	-rm -f ./$(DEPDIR)/connectGroup.Plo
+	-rm -f ./$(DEPDIR)/exceptionsHelper.Plo
+	-rm -f ./$(DEPDIR)/granules.Plo
+	-rm -f ./$(DEPDIR)/handleHelper.Plo
+	-rm -f ./$(DEPDIR)/helper.Plo
+	-rm -f ./$(DEPDIR)/loadCollectionXMLParser.Plo
+	-rm -f ./$(DEPDIR)/loadGroupXMLParser.Plo
+	-rm -f ./$(DEPDIR)/methodCallbacks.Plo
+	-rm -f ./$(DEPDIR)/policyHelper.Plo
+	-rm -f ./$(DEPDIR)/restorePVGroupXMLParser.Plo
+	-rm -f ./$(DEPDIR)/transpose.Plo
+	-rm -f ./$(DEPDIR)/zbsCafeService.Plo
+	-rm -f ./$(DEPDIR)/zbsDataHolders.Plo
+	-rm -f bitshuffle/$(DEPDIR)/bitshuffle.Plo
+	-rm -f bitshuffle/$(DEPDIR)/bitshuffle_core.Plo
+	-rm -f bitshuffle/$(DEPDIR)/iochain.Plo
 	-rm -f makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -759,9 +849,9 @@ uninstall-am: uninstall-libLTLIBRARIES

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -773,6 +863,8 @@ uninstall-am: uninstall-libLTLIBRARIES
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES

+.PRECIOUS: makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -11,8 +11,8 @@ lib_LTLIBRARIES = libcafe.la
 #1st: current-age
 #2nd: age
 #3rd: revision
-#1.9.1   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 19:0:18
+#1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
+libcafe_la_LDFLAGS = -version-info 20:3:19

 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \
 		callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \
--- a/src/methodCallbacks.cpp
+++ b/src/methodCallbacks.cpp
@@ -327,17 +327,21 @@ void CALLBACK_CAFE::handlerGet( struct event_handler_args args)
 {
 #define __METHOD__  "CALLBACK_CAFE::handlerGet"

-    if (args.status == ECA_NORMAL)
+    if (args.status != ECA_NORMAL)
    {
-      if ("X09DA-FE-CCD1:FPICTURE" == ca_name (args.chid) ) {
+      //if ("ARIDI-BPM-01LE:WF-INT-1" == ca_name (args.chid) ) {
+	//if ("X09DA-FE-CCD1:FPICTURE" == ca_name (args.chid) ) {
        cout << __FILE__ << "/" << __LINE__ << "/" << __METHOD__ << endl;
        cout << "Status=" << args.status << " for channel " << ca_name (args.chid) << endl;
        if (RETURN_ON_ERROR == true) return;
-      }
+	//}
    }

    unsigned int _handle = (unsigned long)  args.usr; // ca_puser(args.chid);

+   
+ 
+
    cafeConduit_set_by_handle & handle_index = cs.get<by_handle> ();
    cafeConduit_set_by_handle::iterator it_handle;

@@ -354,6 +358,7 @@ void CALLBACK_CAFE::handlerGet( struct event_handler_args args)
        handle_index.modify(it_handle, change_eventHandlerArgs (args));
        handle_index.modify(it_handle, change_channelRequestStatusGet(channelRequestStatusGet));
        //cout << __METHOD__ << " CALLBACK DONE " << (*it_handle).getChannelRequestStatusGet().getCallbackProgressKind() << endl;
+	//cout << "handle/// " << _handle << endl;
        if(MUTEX)
        {
            cafeMutex.unlock();
@@ -760,6 +765,7 @@ void CALLBACK_CAFE::handlerGetClassName( struct event_handler_args args)
        cout << __FILE__ << "/" << __LINE__ << "/" << __METHOD__ << endl;
        cout << "Status=" << args.status << " for channel " << ca_name (args.chid) << endl;
        if (RETURN_ON_ERROR == true) return;
+	//return;
    }

    unsigned int _handle = (unsigned long)  args.usr; // ca_puser(args.chid);
--- a/src/transpose.cpp
+++ b/src/transpose.cpp
@@ -948,7 +948,7 @@ int  Transpose<dbr_string_t>::get(

            for (unsigned int  i=0; i<nelem; ++i)
            {
-                sprintf(val[i], "%f", (*(&((PVDataL)->tfltval.value)+i+offset)));
+                sprintf(val[i], "%f", (*(&((PVDataL)->tfltval.value)+i+offset)));	
            }
            ts            = ((struct dbr_time_float *) PVDataL)->stamp;
            alarmStatus   = ((struct dbr_time_float *) PVDataL)->status;
Author	SHA1	Message	Date
chrin	7b517f2fa6	changes from Nov. 2023	2024-02-08 14:23:15 +01:00
chrin	b00167016e	testing wf behaviour thru ca gateway	2023-07-06 10:01:36 +02:00
chrin	33bbcde48a	cafe-1.19.0-py38-gcc-7.5.0	2023-06-19 10:24:07 +02:00
chrin	7b052a21fc	Updated windows makefiles and config.h to build on windows VSC2019 - L. Rettig (FHI)	2023-01-26 11:51:15 +01:00