sardana-nxsrecorder 3.29.1__tar.gz → 3.33.0__tar.gz

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/.ci/debian10_py2/Dockerfile

@@ -1,7 +1,11 @@
 FROM debian:buster
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
-RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
+# switch to the german archive mirror
+RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+RUN sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
 RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl software-properties-common coreutils gnupg2 procps apt-utils curl apt-transport-https gnupg2 ca-certificates
 RUN curl http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
 RUN add-apt-repository "deb http://repos.pni-hdri.de/apt/debian buster main" -y

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/.ci/debian10_py3/Dockerfile

@@ -1,7 +1,11 @@
 FROM debian:buster
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
-RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
+# switch to the german archive mirror
+RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+RUN sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list
+
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# RUN /bin/bash -c 'echo "deb http://ftp.de.debian.org/debian buster main" > /etc/apt/sources.list.d/debian9de.list'
 RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl software-properties-common coreutils gnupg2 procps apt-utils curl apt-transport-https gnupg2 ca-certificates
 RUN curl http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
 RUN add-apt-repository "deb http://repos.pni-hdri.de/apt/debian buster main" -y

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # workaround for a bug in debian9, i.e. starting mysql hangs
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ]  || [ "$1" = "debian13" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     docker exec --user root ndts service mariadb restart
 else
     docker exec --user root ndts service mysql stop
@@ -16,7 +16,7 @@ fi
 
 docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get -qq install -y xvfb  libxcb1 libx11-xcb1 libxcb-keysyms1 libxcb-image0 libxcb-icccm4 libxcb-render-util0 xkb-data tango-common; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     # docker exec  --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000  &'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -32,7 +32,7 @@ fi
 echo "install tango-db"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     docker exec  --user tango ndts /usr/bin/mysql -e 'create database tango'
     docker exec  --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
 fi
@@ -67,20 +67,20 @@ else
 	docker exec  --user root ndts /bin/bash -c 'cd itango-src; git checkout tags/v0.1.7 -b b0.1.7; python3 setup.py install'
 	# docker exec  --user root ndts /bin/bash -c 'cd taurus-src; git checkout; python3 setup.py install'
     fi
-    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
+    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian13" ] ; then
 	docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y git python3-six python3-numpy graphviz python3-sphinx g++ build-essential python3-dev pkg-config python3-all-dev  python3-setuptools libtango-dev python3-setuptools python3-tango python3-tz; apt-get -qq install -y nxsconfigserver-db; sleep 10'
     else
 	docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y git python3-six python3-numpy graphviz python3-sphinx g++ build-essential python3-dev pkg-config python3-all-dev  python3-setuptools libtango-dev python3-setuptools python3-pytango python3-tz; apt-get -qq install -y nxsconfigserver-db; sleep 10'
     fi
     docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y libboost-python-dev libboost-dev python3-h5py python3-qtpy  python3-click python3-setuptools  python3-pint'
-    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ]  || [ "$1" = "ubuntu22.04" ]|| [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian10" ]; then
+    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ]  || [ "$1" = "ubuntu22.04" ]|| [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] [ "$1" = "debian13" ] || [ "$1" = "debian10" ]; then
 	echo " "
     else
 	docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y libtango-dev python3-dev'
 	docker exec  --user root ndts /bin/bash -c 'git clone https://gitlab.com/tango-controls/pytango pytango; cd pytango; git checkout tags/v9.2.5 -b b9.2.5'
 	docker exec  --user root ndts /bin/bash -c 'cd pytango; python3 setup.py install'
     fi
-    if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+    if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
 	docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"%" identified by "rootpw"'
 	docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"localhost" identified by "rootpw"'
 	docker exec  --user root ndts /usr/bin/mysql -e 'FLUSH PRIVILEGES'
@@ -91,7 +91,7 @@ fi
 if [ "$?" -ne "0" ]; then exit 255; fi
 
 echo "install qt5"
-if [ "$1" = "debian12" ] ||[ "$1" = "debian11" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if [ "$1" = "debian12" ] ||  [ "$1" = "debian13" ] || [ "$1" = "debian11" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive;  apt-get -qq update; apt-get -qq install -y  qtbase5-dev-tools'
 else
     docker exec  --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive;  apt-get -qq update; apt-get -qq install -y  qtbase5-dev-tools qt5-default'
@@ -105,7 +105,7 @@ if [ "$2" = "2" ]; then
     echo "install pytango and nxsconfigserver-db"
     docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python-pytango  nxsconfigserver-db ; sleep 10'
 else
-    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
+    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ]  || [ "$1" = "debian13" ] ; then
 	echo "install pytango"
 	docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python3-tango'
 	echo "install nxsconfigserver-db"

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu24.10, ubuntu24.04, ubuntu22.04]
+        os: [debian13, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -45,31 +45,6 @@ jobs:
       - name: run tests
         run: .ci/run.sh 3
       - name: Stop the docker
-        run: docker container stop ndts
-
-  python2_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [debian10]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - name: Update bash files
         run: |
-          chmod +x .ci/run.sh
-          chmod +x .ci/install.sh
-      - name: Build the docker
-        env:
-          OS: ${{ matrix.os }}
-        run: docker build -t ndts .ci/${OS}_py2
-      - name: Run the docker
-        run: docker run  --name  ndts -d -it -v `pwd`:/home/tango ndts
-      - name: install tango
-        env:
-          OS: ${{ matrix.os }}
-        run: .ci/install.sh ${OS} 2
-      - name: run tests
-        run: .ci/run.sh 2
-      - name: Stop the docker
-        run: docker container stop ndts
+             docker exec  --user root ndts  /bin/bash -c "chown -R 1001 /home/tango "
+             docker container stop ndts

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/ChangeLog

@@ -1,3 +1,23 @@
+2026-02-05 Jan Kotanski <jankotan@gmail.com>
+	* skip cached init datasource for dynamic component (#170)
+	* tagged as 3.33.0
+
+2026-01-21 Jan Kotanski <jankotan@gmail.com>
+	* update configuration cache when profile created outside  the nxselector #167
+	* tagged as 3.32.0
+
+2026-01-16 Jan Kotanski <jankotan@gmail.com>
+	* add support for cache configuration
+	* tagged as 3.31.0
+
+2026-01-13 Jan Kotanski <jankotan@gmail.com>
+	* add debug info
+	* tagged as 3.30.1
+
+2025-07-29 Jan Kotanski <jankotan@gmail.com>
+	* add support for tango datasources from defmeas macro (#155)
+	* tagged as 3.30.0
+
 2024-12-11 Jan Kotanski <jankotan@gmail.com>
 	* reset SciCatMeasurements if not dict (#149)
 	* tagged as 3.29.1

{sardana-nxsrecorder-3.29.1/sardana_nxsrecorder.egg-info → sardana-nxsrecorder-3.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.29.1
+Version: 3.33.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -85,21 +85,22 @@ defining the package location, e.g.
 Debian packages
 """""""""""""""
 
-Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and Ubuntu Questing, Noble Jammy packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
 and then download the corresponding source list
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 
 Finally, for python2.7

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/README.rst

@@ -60,21 +60,22 @@ defining the package location, e.g.
 Debian packages
 """""""""""""""
 
-Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and Ubuntu Questing, Noble Jammy packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
 and then download the corresponding source list
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 
 Finally, for python2.7

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/man/sardananxsrecorder.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SARDANANXSRECORDER" "1" "Nov 07, 2024" "3.29" "Sardana NeXus Recorder"
+.TH "SARDANANXSRECORDER" "1" "Jul 29, 2025" "3.30" "Sardana NeXus Recorder"
 .SH NAME
 sardananxsrecorder \- sardananxsrecorder Documentation
 .sp
@@ -356,9 +356,9 @@ constructor
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBfilename\fP (\fI\%str\fP) – ScanFile name
+\fBfilename\fP (\fI\%str\fP) \-\- ScanFile name
 .IP \(bu 2
-\fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) – macro object
+\fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) \-\- macro object
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -370,13 +370,13 @@ adds custom data to configuration variables, i.e. from macros
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBvalue\fP (\fIany\fP) – variable value
+\fBvalue\fP (\fIany\fP) \-\- variable value
 .IP \(bu 2
-\fBname\fP (\fI\%str\fP) – variable name
+\fBname\fP (\fI\%str\fP) \-\- variable name
 .IP \(bu 2
-\fBgroup\fP (\fI\%str\fP) – variable group inside variable dictionary
+\fBgroup\fP (\fI\%str\fP) \-\- variable group inside variable dictionary
 .IP \(bu 2
-\fBremove\fP (\fI\%bool\fP) – if True variable will be removed
+\fBremove\fP (\fI\%bool\fP) \-\- if True variable will be removed
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -391,7 +391,7 @@ and closes the nexus file
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) – sardana record list
+\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -405,7 +405,7 @@ and records in INIT mode
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) – sardana record list
+\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -419,7 +419,7 @@ and records in INIT mode
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) – sardana record list
+\fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) \-\- sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -477,12 +477,12 @@ indent level.  An indent level of 0 will only insert newlines.
 None is the most compact representation.
 .sp
 If specified, separators should be an (item_separator, key_separator)
-tuple.  The default is (’, ‘, ‘: ‘) if \fIindent\fP is \fBNone\fP and
-(‘,’, ‘: ‘) otherwise.  To get the most compact JSON representation,
-you should specify (‘,’, ‘:’) to eliminate whitespace.
+tuple.  The default is (\(aq, \(aq, \(aq: \(aq) if \fIindent\fP is \fBNone\fP and
+(\(aq,\(aq, \(aq: \(aq) otherwise.  To get the most compact JSON representation,
+you should specify (\(aq,\(aq, \(aq:\(aq) to eliminate whitespace.
 .sp
 If specified, default is a function that gets called for objects
-that can’t otherwise be serialized.  It should return a JSON encodable
+that can\(aqt otherwise be serialized.  It should return a JSON encodable
 version of the object or raise a \fBTypeError\fP\&.
 .INDENT 7.0
 .TP
@@ -491,7 +491,7 @@ default encoder
 .INDENT 7.0
 .TP
 .B Parameters
-\fBobj\fP (\fI\%object\fP or \fIany\fP) – numpy array object
+\fBobj\fP (\fI\%object\fP or \fIany\fP) \-\- numpy array object
 .UNINDENT
 .UNINDENT
 .UNINDENT

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0/sardana_nxsrecorder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.29.1
+Version: 3.33.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -85,21 +85,22 @@ defining the package location, e.g.
 Debian packages
 """""""""""""""
 
-Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and Ubuntu Questing, Noble Jammy packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
 and then download the corresponding source list
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 
 Finally, for python2.7

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/sardananxsrecorder/__init__.py

@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.29.1"
+__version__ = "3.33.0"

{sardana-nxsrecorder-3.29.1 → sardana-nxsrecorder-3.33.0}/sardananxsrecorder/nxsrecorder.py

@@ -99,6 +99,7 @@ class NXS_FileRecorder(BaseFileRecorder):
         :type macro: :class:`sardana.macroserver.macro.Macro`
         """
         BaseFileRecorder.__init__(self)
+        self.debug('__init__:  Init NXS_FileRecorder: %s' % str(filename))
         #: (:obj:`str`) base filename
         self.__base_filename = filename
         #: (:obj:`str`) raw filename
@@ -116,7 +117,8 @@ class NXS_FileRecorder(BaseFileRecorder):
         self.__nexussettings_device = None
 
         #: (:obj:`int`) device proxy timeout
-        self.__timeout = 100000
+        # self.__timeout = 100000
+        self.__timeout = 10000000
         #: (:obj:`dict` <:obj:`str`, :obj:`list` <:obj:`str`>
         #:     or :obj:`dict` <:obj:`str` , `any`> > ) Custom variables
         self.__vars = {"data": {},
@@ -132,6 +134,8 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         #: (:obj:`str`) dynamic components
         self.__dynamicCP = "__dynamic_component__"
+        #: (:obj:`str`) cache component prefix
+        self.__cacheCPPrefix = "__configuration_"
 
         #: (:obj:`dict` <:obj:`str` , `any`> ) environment
         self.__env = macro.getAllEnv() if macro else {}
@@ -167,13 +171,17 @@ class NXS_FileRecorder(BaseFileRecorder):
         #: (:obj:`bool`) external measurement group
         self.__oddmntgrp = False
 
+        self.debug('__init__:  Set NeXus: %s' % str(filename))
         self.__setNexusDevices(onlyconfig=True)
 
+        self.debug('__init__:  Set Append Entry: %s' % str(filename))
         appendentry = self.__getConfVar("AppendEntry", True)
         scanID = self.__env["ScanID"] \
             if "ScanID" in self.__env.keys() else -1
+        self.debug('__init__:  Set FileName: %s' % str(filename))
         self.__setFileName(
             self.__base_filename, not appendentry, scanID)
+        self.debug('__init__:  Done: %s' % str(filename))
 
     def _serial(self, scanID):
         serial = None
@@ -411,7 +419,8 @@ class NXS_FileRecorder(BaseFileRecorder):
                 subs = False
         if not self.__raw_filename:
             self.__raw_filename = self.__rawfilename(self.__serial)
-        self.debug('Raw Filename: %s' % str(self.__raw_filename))
+        self.debug('__setFileName:  '
+                   'Raw Filename: %s' % str(self.__raw_filename))
         if not subs and self.__raw_filename and \
            "{ScanID" in self.__raw_filename:
             try:
@@ -453,6 +462,9 @@ class NXS_FileRecorder(BaseFileRecorder):
                            profile configuration of NXSRecSelector
         :type onlyconfig: :obj:`bool`
         """
+        self.debug(
+            '__setNexusDevices:  NXSRecSelector: %s'
+            % str(self.__raw_filename))
         vl = self.__getEnvVar("NeXusSelectorDevice", None)
         if vl is None:
             servers = self.__db.get_device_exported_for_class(
@@ -474,6 +486,8 @@ class NXS_FileRecorder(BaseFileRecorder):
                         "Cannot connect to '%s'" % servers[0])
         else:
             self.__nexussettings_device = None
+        self.debug('__setNexusDevices:  import profile: %s'
+                   % str(self.__raw_filename))
         if self.__nexussettings_device is None:
             from nxsrecconfig import Settings
             self.__nexussettings_device = Settings.Settings()
@@ -483,10 +497,13 @@ class NXS_FileRecorder(BaseFileRecorder):
             raise Exception("NXSRecSelector (%s) version below 2.0.0" %
                             (servers[0] if servers else "module"))
 
+        self.debug('__setNexusDevices:  set MG: %s' % str(self.__raw_filename))
         mntgrp = self.__getServerVar("mntGrp", None)
         amntgrp = self.__getEnvVar("ActiveMntGrp", None)
         if mntgrp and amntgrp != mntgrp:
             self.__nexussettings_device.mntgrp = amntgrp
+        self.debug('__setNexusDevices:  list profile: %s'
+                   % str(self.__raw_filename))
         if amntgrp not in self.__command(
                 self.__nexussettings_device, "availableProfiles"):
             if onlyconfig:
@@ -507,15 +524,29 @@ class NXS_FileRecorder(BaseFileRecorder):
                 self.info(
                     "NXS_FileRecorer: descriptive components will be reset")
             else:
+                self.debug('__setNexusDevices:  fetch profile: %s'
+                           % str(self.__raw_filename))
                 self.__command(self.__nexussettings_device, "fetchProfile")
+                self.debug('__setNexusDevices:  reset profile: %s'
+                           % str(self.__raw_filename))
                 self.__asynchcommand(self.__nexussettings_device,
                                      "resetPreselectedComponents")
+                self.debug('__setNexusDevices:  reset profile Done: %s'
+                           % str(self.__raw_filename))
             self.__oddmntgrp = True
         else:
+            self.debug('__setNexusDevices:  '
+                       'fetch profile 2: %s' % str(self.__raw_filename))
             self.__command(self.__nexussettings_device, "fetchProfile")
+            self.debug('__setNexusDevices:  fetch profile 2 Done: %s' %
+                       str(self.__raw_filename))
         self.__vars["vars"]["measurement_group"] = amntgrp
 
+        self.debug('__setNexusDevices:  '
+                   'profile config: %s' % str(self.__raw_filename))
         self.__conf = self.__getServerVar("profileConfiguration", {}, True)
+        self.debug('__setNexusDevices:  '
+                   'MG config: %s' % str(self.__raw_filename))
         if not self.__oddmntgrp and not onlyconfig:
             if "MntGrpConfiguration" in self.__conf.keys():
                 poolmg = self.__command(
@@ -525,16 +556,27 @@ class NXS_FileRecorder(BaseFileRecorder):
                 poolmg = None
                 profmg = None
             if not poolmg or not profmg or poolmg != profmg:
-                self.debug(
-                    "ActiveMntGrp created outside NXSRecSelector v3. "
-                    "Updating ActiveMntGrp")
+                self.debug("__setNexusDevices:  "
+                           "ActiveMntGrp created outside NXSRecSelector v3. "
+                           "Updating ActiveMntGrp")
                 if self.__macro:
                     self.__macro().debug(
                         "ActiveMntGrp created outside NXSRecSelector v3. "
                         "Updating ActiveMntGrp")
                 self.__command(self.__nexussettings_device, "importMntGrp")
                 self.__command(self.__nexussettings_device, "updateMntGrp")
-
+                if hasattr(self.__nexussettings_device, "cachecomponent"):
+                    ccomp = self.__nexussettings_device.cachecomponent
+                    if ccomp:
+                        self.debug('__setNexusDevices: '
+                                   'Cache Writer Configuration: %s'
+                                   % str(ccomp))
+                        self.__command(
+                            self.__nexussettings_device,
+                            "cacheWriterConfiguration", [])
+
+        self.debug('__setNexusDevices: '
+                   'Writer Device: %s' % str(self.__raw_filename))
         if not onlyconfig:
             vl = self.__getConfVar("WriterDevice", None)
             if not vl:
@@ -560,6 +602,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             else:
                 self.__nexuswriter_device = None
 
+            self.debug('__setNexusDevices:  Writer Device Properties: %s'
+                       % str(self.__raw_filename))
             if self.__nexuswriter_device is None:
                 from nxswriter import TangoDataWriter
                 self.__nexuswriter_device = TangoDataWriter.TangoDataWriter()
@@ -575,6 +619,7 @@ class NXS_FileRecorder(BaseFileRecorder):
                 for ky, vl in properties.items():
                     if hasattr(self.__nexuswriter_device, ky):
                         setattr(self.__nexuswriter_device, ky, vl)
+        self.debug('__setNexusDevices:  End: %s' % str(self.__raw_filename))
 
     def __get_alias(self, name):
         """ provides a device alias
@@ -600,6 +645,26 @@ class NXS_FileRecorder(BaseFileRecorder):
             alias = None
         return alias
 
+    def __short_name(self, name):
+        """ provides a device alias
+
+        :param name: device name
+        :type name: :obj:`str`
+        :returns: device alias
+        :rtype: :obj:`str`
+        """
+        # if name does not contain a "/" it's probably an alias
+        if name.startswith("tango://"):
+            name = name[8:]
+        if name.find("/") == -1:
+            return name
+
+        # haso107klx:10000/expchan/hasysis3820ctrl/1
+        if name.find(':') >= 0:
+            lst = name.split("/")
+            name = "/".join(lst[1:])
+        return name
+
     def __collectAliases(self, envRec):
         """ sets deviceAlaises and dynamicDataSources from env record
 
@@ -649,13 +714,16 @@ class NXS_FileRecorder(BaseFileRecorder):
         :param nexuscomponents: nexus component list
         :type nexuscomponents: :obj:`list` <:obj:`str`>
         """
-        self.debug("Step DSs: %s" % dss)
-        self.debug("Init DSs: %s" % keys)
-        self.debug("Init User Data: %s" % udata)
+        self.debug("__createDynamicComponent:  Step DSs: %s" % dss)
+        self.debug("__createDynamicComponent:  Init DSs: %s" % keys)
+        self.debug("__createDynamicComponent:  Init User Data: %s" % udata)
         envRec = self.recordlist.getEnviron()
         lddict = []
         tdss = [ds for ds in dss if not ds.startswith("tango://")
                 and ds not in nexuscomponents]
+        tgdss = [self.__short_name(ds)
+                 for ds in dss if ds.startswith("tango://")
+                 and ds not in nexuscomponents]
 
         fields = []
         for dd in envRec['datadesc']:
@@ -695,20 +763,27 @@ class NXS_FileRecorder(BaseFileRecorder):
                 if fld and att:
                     if fld in fields.keys():
                         fields[fld][att] = vl
-                    else:
-                        fields[fld] = {
-                            "name": fld,
-                            "dtype": "string",
-                            "shape": tuple(),
-                            att: vl}
+                    # else:
+                    #     fields[fld] = {
+                    #         "name": fld,
+                    #         "strategy": "INIT",
+                    #         "dtype": "string",
+                    #         "shape": tuple(),
+                    #         att: vl}
 
         for mdd in fields.values():
             lddict.append(mdd)
 
+        tdss.extend(tgdss)
         jddict = json.dumps(lddict, cls=NXS_FileRecorder.numpyEncoder)
         jdss = json.dumps(tdss, cls=NXS_FileRecorder.numpyEncoder)
         jkeys = json.dumps(keys, cls=NXS_FileRecorder.numpyEncoder)
-        # self.debug("JDD: %s" % jddict)
+        self.debug("__createDynamicComponent:  "
+                   "tango STEP datasources: %s" % tdss)
+        self.debug("__createDynamicComponent:  "
+                   "sardana STEP datasources: %s" % jddict)
+        self.debug("__createDynamicComponent:  "
+                   "INIT datasources: %s" % jkeys)
         self.__dynamicCP = \
             self.__command(self.__nexussettings_device,
                            "createDynamicComponent",
@@ -752,11 +827,14 @@ class NXS_FileRecorder(BaseFileRecorder):
         :rtype: (`list` <:obj:`str`>, `list` <:obj:`str`>,
                  `list` <:obj:`str`>, `list` <:obj:`str`>)
         """
+        self.debug("__searchDataSources: Init: %s"
+                   % str([nexuscomponents, cfm, dyncp, userkeys]))
         dsFound = {}
         dsNotFound = []
 
         # (:obj:`list` <:obj:`str`>) all component source names
         allcpdss = []
+        cachedss = []
         cpReq = {}
         keyFound = set()
 
@@ -767,6 +845,8 @@ class NXS_FileRecorder(BaseFileRecorder):
         else:
             cmps = list(set(nexuscomponents) &
                         set(self.__availableComponents()))
+        self.debug("__searchDataSources:  Get selected DSs: %s"
+                   % str([cfm, dyncp]))
         if self.__oddmntgrp:
             nds = []
         else:
@@ -774,8 +854,17 @@ class NXS_FileRecorder(BaseFileRecorder):
                                  "selectedDataSources")
         nds = nds if nds else []
         datasources = list(set(nds) | set(self.__deviceAliases.keys()))
+        self.debug("__searchDataSources:  Get components DSs: %s"
+                   % str([cfm, dyncp]))
         hascpsrcs = hasattr(self.__nexussettings_device, 'componentSources')
+        # aacpdss = json.loads(
+        #     self.__command(self.__nexussettings_device,
+        #                    "componentSources",
+        #                    cmps))
+        self.debug("__searchDataSources:  component loop: %s"
+                   % str([cfm, dyncp, hascpsrcs]))
         for cp in cmps:
+            self.debug("__searchDataSources:  component item: %s" % cp)
             try:
                 if hascpsrcs:
                     cpdss = json.loads(
@@ -786,6 +875,11 @@ class NXS_FileRecorder(BaseFileRecorder):
                         [ds["dsname"] for ds in cpdss
                          if ("parentobj" not in ds or
                              ds["parentobj"] in ["field"])])
+                    if cp.startswith(self.__cacheCPPrefix):
+                        cachedss.extend(
+                            [ds["dsname"] for ds in cpdss
+                             if ("parentobj" not in ds or
+                                 ds["parentobj"] in ["field"])])
 
                 else:
                     cpdss = json.loads(
@@ -807,28 +901,38 @@ class NXS_FileRecorder(BaseFileRecorder):
                             "Component '%s' wrongly defined in DB!" % cp)
                         # self.__macro().warning("Error: '%s'" % str(e))
                 else:
-                    self.debug("Component '%s' wrongly defined in DB!" % cp)
+                    self.debug(
+                        "__searchDataSources:  "
+                        "Component '%s' wrongly defined in DB!" % cp)
                     self.warning("Error: '%s'" % str(e))
                     if self.__macro:
                         self.__macro().debug(
+                            "__searchDataSources:  "
                             "Component '%s' wrongly defined in DB!" % cp)
                     self.__macro.debug("Error: '%s'" % str(e))
                 dss = []
             if dss:
                 cdss = list(set(dss) & set(datasources))
                 for ds in cdss:
-                    self.debug("'%s' found in '%s'" % (ds, cp))
+                    self.debug("__searchDataSources:  '%s' found in '%s'"
+                               % (ds, cp))
                     if ds not in dsFound.keys():
                         dsFound[ds] = []
                     dsFound[ds].append(cp)
                     if cp not in cpReq.keys():
                         cpReq[cp] = []
                     cpReq[cp].append(ds)
+        self.debug("__searchDataSources:  "
+                   "component loop end: %s" % str([cfm, dyncp]))
         missingKeys = set(userkeys) - keyFound
 
+        self.debug("__searchDataSources:  "
+                   "dynamic component loop: %s" % str([cfm, dyncp]))
         datasources.extend(self.__dynamicDataSources.keys())
         #: get not found datasources
         for ds in datasources:
+            self.debug("__searchDataSources:  "
+                       " dynamic component item: %s" % ds)
             if ds not in dsFound.keys() and ds not in allcpdss:
                 dsNotFound.append(ds)
                 if not dyncp:
@@ -857,7 +961,9 @@ class NXS_FileRecorder(BaseFileRecorder):
                                 "It was not found in User Components!"
                                 " Consider setting: "
                                 "NeXusDynamicComponents=True" % ds)
-        return (nds, dsNotFound, cpReq, list(missingKeys))
+        self.debug("__searchDataSources:  "
+                   "dynamic component loop end: %s" % str([cfm, dyncp]))
+        return (nds, dsNotFound, cpReq, list(missingKeys), cachedss)
 
     def __createConfiguration(self, userdata):
         """ create NeXus configuration
@@ -867,14 +973,19 @@ class NXS_FileRecorder(BaseFileRecorder):
         :returns: configuration xml string
         :rtype: :obj:`str`
         """
+        self.debug("__createConfiguration:  Init: %s" % self.__oddmntgrp)
         cfm = self.__getConfVar("ComponentsFromMntGrp",
                                 False, pass_default=self.__oddmntgrp)
         dyncp = self.__getConfVar("DynamicComponents",
                                   True, pass_default=self.__oddmntgrp)
 
         envRec = self.recordlist.getEnviron()
+        self.debug("__createConfiguration:  CollectAllises: %s"
+                   % self.__oddmntgrp)
         self.__collectAliases(envRec)
 
+        self.debug("__createConfiguration:  Get Components: %s"
+                   % self.__oddmntgrp)
         mandatory = self.__command(self.__nexussettings_device,
                                    "mandatoryComponents")
         self.info("Default Components %s" % str(mandatory))
@@ -886,6 +997,15 @@ class NXS_FileRecorder(BaseFileRecorder):
             nexuscomponents.extend(lst)
         self.info("User Components %s" % str(nexuscomponents))
 
+        ccomp = None
+        if hasattr(self.__nexussettings_device, "cachecomponent"):
+            ccomp = self.__nexussettings_device.cachecomponent
+            allnexuscomponents = list(set(nexuscomponents) | set(mandatory))
+        if ccomp:
+            self.info("Cache Component %s" % str(ccomp))
+            nexuscomponents = [ccomp]
+            allnexuscomponents = [ccomp]
+
         self.__availableComps = []
         lst = self.__getConfVar("OptionalComponents",
                                 None, True, pass_default=self.__oddmntgrp)
@@ -896,13 +1016,20 @@ class NXS_FileRecorder(BaseFileRecorder):
         self.info("Available Components %s" % str(
             self.__availableComponents()))
 
-        nds, dsNotFound, cpReq, missingKeys = self.__searchDataSources(
-            list(set(nexuscomponents) | set(mandatory)),
-            cfm, dyncp, userdata.keys())
-
-        self.debug("DataSources Not Found : %s" % dsNotFound)
-        self.debug("Components required : %s" % cpReq)
-        self.debug("Missing User Data : %s" % missingKeys)
+        self.debug("__createConfiguration:  Search DataSources: %s"
+                   % self.__oddmntgrp)
+        nds, dsNotFound, cpReq, missingKeys, cachedss = \
+            self.__searchDataSources(
+                allnexuscomponents,
+                cfm, dyncp, userdata.keys())
+        self.debug("__createConfiguration:  Get User data: %s"
+                   % self.__oddmntgrp)
+
+        self.debug("__createConfiguration:  DataSources Not Found : %s"
+                   % dsNotFound)
+        self.debug("__createConfiguration:  Components required : %s" % cpReq)
+        self.debug("__createConfiguration:  Missing User Data : %s"
+                   % missingKeys)
         if "InitDataSources" in self.__conf.keys():
             # compatibility with version 2
             ids = self.__getConfVar(
@@ -920,9 +1047,14 @@ class NXS_FileRecorder(BaseFileRecorder):
         # udata = {ky: userdata[ky] for ky in missingKeys}
         if userdata:
             userdata.update(udata)
+        ids = list(set(ids or []) - set(cachedss))
+        self.debug("__createConfiguration:  Create dynamic components: %s"
+                   % self.__oddmntgrp)
         self.__createDynamicComponent(
-            dsNotFound if dyncp else [], ids or [], udata, nexuscomponents)
+            dsNotFound if dyncp else [], ids, udata, nexuscomponents)
         nexuscomponents.append(str(self.__dynamicCP))
+        self.debug("__createConfiguration:  Add Components: %s"
+                   % self.__oddmntgrp)
 
         if cfm:
             self.info("Sardana Components %s" % cpReq.keys())
@@ -970,25 +1102,38 @@ class NXS_FileRecorder(BaseFileRecorder):
             if self.__macro:
                 self.__macro().debug(
                     "VAR %s" % self.__nexussettings_device.configVariables)
+            self.debug("__createConfiguration:  Update Config Varialels: %s"
+                       % self.__oddmntgrp)
             self.__command(self.__nexussettings_device,
                            "updateConfigVariables")
 
-            self.debug("Aliases: %s" % str(self.__aliases))
-            self.debug("Switching to STEP mode: %s" % stepdss)
+            self.debug("__createConfiguration:  Aliases: %s"
+                       % str(self.__aliases))
+            self.debug("__createConfiguration:  Switching to STEP mode: %s"
+                       % stepdss)
             oldtoswitch = self.__getServerVar("stepdatasources", "[]", False)
             stepdss = str(json.dumps(list(toswitch)))
+            self.debug("__createConfiguration:  Set STEP datasources: %s"
+                       % self.__oddmntgrp)
             self.__nexussettings_device.stepdatasources = stepdss
+            self.debug("__createConfiguration:   Set LINK datasources: %s"
+                       % self.__oddmntgrp)
             if hasattr(self.__nexussettings_device, "linkdatasources"):
                 self.__nexussettings_device.linkdatasources = stepdss
+            self.debug("__createConfiguration:  "
+                       "Create Writer configuration: %s" % self.__oddmntgrp)
             cnfxml = self.__command(
                 self.__nexussettings_device, "createWriterConfiguration",
                 nexuscomponents)
         finally:
+            self.debug("__createConfiguration:   Reset variables: %s"
+                       % self.__oddmntgrp)
             self.__nexussettings_device.configVariables = json.dumps(
                 nexusvariables)
             if oldtoswitch is not None:
                 self.__nexussettings_device.stepdatasources = oldtoswitch
 
+        self.debug("__createConfiguration:  End: %s" % self.__oddmntgrp)
         return cnfxml
 
     def _startRecordList(self, recordlist):
@@ -999,12 +1144,17 @@ class NXS_FileRecorder(BaseFileRecorder):
         :type recordlist: :class:`sardana.macroserver.scan.scandata.RecordList`
         """
         try:
+            self.debug('_startRecordList:  Start %s' % self.__base_filename)
             self.__env = self.__macro().getAllEnv() if self.__macro else {}
             if self.__base_filename is None:
                 return
             self.__udata = None
 
+            self.debug('_startRecordList:  Set NeXus %s'
+                       % self.__base_filename)
             self.__setNexusDevices()
+            self.debug('_startRecordList:  Set Variables %s'
+                       % self.__base_filename)
 
             appendentry = self.__getConfVar("AppendEntry", True)
             appendscanid = not self.__setFileName(
@@ -1030,7 +1180,11 @@ class NXS_FileRecorder(BaseFileRecorder):
             self.__vars["vars"]["filename"] = str(self.filename)
 
             envrecord = self.__appendRecord(self.__vars, 'INIT')
+            self.debug('_startRecordList:  Create Configuration %s'
+                       % self.__base_filename)
             cnfxml = self.__createConfiguration(envrecord["data"])
+            self.debug('_startRecordList:  Set Remove dynamic components %s'
+                       % self.__base_filename)
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             # self.debug('XML: %s' % str(cnfxml))
@@ -1048,24 +1202,31 @@ class NXS_FileRecorder(BaseFileRecorder):
             self.__vars["data"]["beamtime_id"] = \
                 self.__vars["vars"]["beamtime_id"]
 
+            self.debug('_startRecordList:  Init writer %s'
+                       % self.__base_filename)
             if hasattr(self.__nexuswriter_device, 'Init'):
                 self.__command(self.__nexuswriter_device, "Init")
             self.__nexuswriter_device.fileName = str(self.filename)
             self.__command(self.__nexuswriter_device, "openFile")
             self.__nexuswriter_device.xmlsettings = cnfxml
 
-            # self.debug('START_DATA: %s' % str(envRec))
+            if "DEBUG_INIT_DATA" in self.writerModes:
+                self.debug('_startRecordList:  INIT_DATA: %s' % str(envRec))
 
+            self.debug('_startRecordList: Set JSON %s' % self.__base_filename)
             self.__nexuswriter_device.jsonrecord = rec
             self.writerModes = self.__variableList(
                 "NeXusWriterModes")
             if "NOINIT" in self.writerModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
+            self.debug('_startRecordList SE: Open Entry %s' %
+                       self.__base_filename)
             self.__command(self.__nexuswriter_device, "openEntry")
         except Exception:
             self.__removeDynamicComponent()
             raise
+        self.debug('_startRecordList SE: END %s' % self.__base_filename)
 
     def __appendRecord(self, var, mode=None):
         """ merges userdata with variable dictionary
@@ -1151,9 +1312,10 @@ class NXS_FileRecorder(BaseFileRecorder):
             if "NOSTEP" in self.writerModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
-            # self.debug('DATA: {"data":%s}' % json.dumps(
-            #     record.data,
-            #     cls=NXS_FileRecorder.numpyEncoder))
+            if "DEBUG_STEP_DATA" in self.writerModes:
+                self.debug('_writeRecord DATA: {"data":%s}' % json.dumps(
+                    record.data,
+                    cls=NXS_FileRecorder.numpyEncoder))
 
             jsonString = '{"data":%s}' % json.dumps(
                 record.data,
@@ -1217,7 +1379,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             self.__env = self.__macro().getAllEnv() if self.__macro else {}
             envRec = recordlist.getEnviron()
 
-            # self.debug('END_DATA: %s ' % str(envRec))
+            if "DEBUG_FINAL_DATA" in self.writerModes:
+                self.debug('_endRecordList:  FINAL_DATA: %s ' % str(envRec))
 
             tzone = self.__getConfVar("TimeZone", self.__timezone)
             self.__vars["data"]["end_time"] = \
@@ -1286,7 +1449,7 @@ class NXS_FileRecorder(BaseFileRecorder):
         if isinstance(msvar, str):
             msvar = re.split(r"[-;,.\s]\s*", msvar)
         if msvar:
-            self.debug('%s: %s' % (variable, str(msvar)))
+            self.debug('__variableList:   %s: %s' % (variable, str(msvar)))
         return msvar
 
     def __rawfilename(self, serial):
@@ -1491,7 +1654,8 @@ class NXS_FileRecorder(BaseFileRecorder):
                                   (pdir, fname, entryname), rt, sname)
                 else:
                     h5writer.link("%s:/%s" % (fname, entryname), rt, sname)
-                self.debug("Link  '%s' in '%s' created " % (sname, mntname))
+                self.debug("__createMeasurementFile:  "
+                           "Link  '%s' in '%s' created " % (sname, mntname))
             rt.close()
             fl.close()