Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

900/docs #1056

Merged
merged 5 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SLS Detector Package Major Release 9.0.0 released on 22.11.2024
SLS Detector Package Major Release 9.0.0 released on 25.11.2024
===============================================================

This document describes the differences between v9.0.0 and v8.0.2
Expand Down Expand Up @@ -136,6 +136,15 @@ This document describes the differences between v9.0.0 and v8.0.2
================================


Compilation
-----------


* cmake_source_dir
Fixed compilation error when using python and adding the slsDetectorPackage
as a subfolder due to cmake source directory changing.


Client
------

Expand Down
1 change: 0 additions & 1 deletion docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ set(SPHINX_SOURCE_FILES
src/binaryfileformat.rst
src/hdf5fileformat.rst
src/zmqjsonheaderformat.rst
src/ctbframeformat.rst
)

foreach(filename ${SPHINX_SOURCE_FILES})
Expand Down
81 changes: 0 additions & 81 deletions docs/src/ctbframeformat.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/src/dependencies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ the shared libraries these are needed:
Python bindings
-----------------------

* Python > 3.8
* Python >= 3.8
* pybind11 2.13.6 (packaged in libs)

.. note ::
Expand Down
3 changes: 1 addition & 2 deletions docs/src/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Welcome to slsDetectorPackage's documentation!
For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation

.. toctree::
:maxdepth: 1
:maxdepth: 3
:caption: Installation:

installation
Expand Down Expand Up @@ -88,7 +88,6 @@ Welcome to slsDetectorPackage's documentation!

fileformat
slsreceiverheaderformat
ctbframeformat
masterfileattributes
binaryfileformat
hdf5fileformat
Expand Down
33 changes: 20 additions & 13 deletions docs/src/installation.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@


.. _Installation:


Installation
===============

One can either install pre-built binaries using conda or build from source.

.. warning ::

Before building from source make sure that you have the
:doc:`dependencies <../dependencies>` installed. If installing using conda, conda will
manage the dependencies. Avoid also installing packages with pip.


.. _Installation:


Installation
===============

Install binaries using conda
-------------------------------
----------------------------------

Conda is not only useful to manage python environments but can also
be used as a user space package manager. Dates in the tag (for eg. 2020.07.23.dev0)
Expand Down Expand Up @@ -55,7 +60,7 @@ We have three different packages available:


Build from source
-------------------
----------------------

1. Download Source Code from github
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -75,8 +80,10 @@ Build from source
2. Build from Source
^^^^^^^^^^^^^^^^^^^^^^^^^^

One can either build using cmake or use the in-built cmk.sh script.

Build using CMake
^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. code-block:: bash

Expand Down Expand Up @@ -123,7 +130,7 @@ Example cmake options Comment


Build using in-built cmk.sh script
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


.. code-block:: bash
Expand Down Expand Up @@ -173,7 +180,7 @@ Build using in-built cmk.sh script


Build on old distributions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then
it's possible to install a newer gcc using conda and build the slsDetectorPackage
Expand All @@ -198,7 +205,7 @@ using this compiler


Build slsDetectorGui (Qt5)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1. Using pre-built binary on conda

Expand Down Expand Up @@ -259,7 +266,7 @@ Build slsDetectorGui (Qt5)


Build this documentation
^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The documentation for the slsDetectorPackage is build using a combination
of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
Expand All @@ -282,7 +289,7 @@ is to use conda


Pybind and Zeromq
^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. _pybind for different slsDetectorPackage versions:

Expand Down
Loading