slsdetectorgroup · thattil · Feb 18, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 20, 2025
diff --git a/RELEASE.txt b/RELEASE.txt
@@ -39,7 +39,6 @@ This document describes the differences between vx.x.x and vx.0.2
     Jungfrau    9.0.0
     Mythen3     9.0.0
     Gotthard2   9.0.0
-    Gotthard    9.0.0
     Moench      9.0.0
 
 
@@ -75,9 +74,6 @@ This document describes the differences between vx.x.x and vx.0.2
 
     Moench      26.10.2023 (v2.0)                   (updated in 9.0.0)
 
-    Gotthard    08.02.2018 (50um and 25um Master)
-                09.02.2018 (25 um Slave) 
-
 
     Detector Upgrade
     ----------------
@@ -90,8 +86,6 @@ This document describes the differences between vx.x.x and vx.0.2
     Gotthard2  via command <.rbf>
     Moench     via command <.pof>
 
-    Gotthard cannot be upgraded remotely  
-
     Except Eiger, 
         upgrade 
             Using command 'programfpga' or

diff --git a/docs/gen_server_doc.py.in b/docs/gen_server_doc.py.in
@@ -21,7 +21,7 @@ print('\n\n\n\n SERVER CSV')
 
 src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
 detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
-            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
+            'Jungfrau', 'Moench', 'Ctb']
 
 
 for det in detectors:

diff --git a/docs/src/binaryfileformat.rst b/docs/src/binaryfileformat.rst
@@ -320,61 +320,6 @@ Moench
         }
     }
 
-Gotthard I
-^^^^^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 15:16:19 2024",
-        "Detector Type": "Gotthard",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 2560,
-        "Pixels": {
-            "x": 1280,
-            "y": 1
-        },
-        "Max Frames Per File": 20000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "1.00001ms",
-        "Period": "1s",
-        "Detector Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295
-        },
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
 Chip Test Board
 ^^^^^^^^^^^^^^^
 

diff --git a/docs/src/firmware.rst b/docs/src/firmware.rst
@@ -131,42 +131,6 @@ Program from console
 
 
 
-Gotthard I
------------
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-
-.. _firmware upgrade using blaster for blackfin:
-
-Upgrade
-^^^^^^^^
-.. warning ::
-    | Gotthard firmware cannot be upgraded remotely and requires the use of USB-Blaster.
-    | It is generally updated by us.
-
-#. Download `Altera Quartus software or Quartus programmer <https://fpgasoftware.intel.com/20.1/?edition=standard&platform=linux&product=qprogrammer#tabs-4>`__.
-
-
-#. Start Quartus programmer, click on Hardware Setup. In the "Currently selected hardware" window, select USB-Blaster.
-
-#. In the Mode combo box, select "Active Serial Programming".
-
-#. Plug the end of your USB-Blaster with the adaptor provided to the connector 'AS config' on the Gotthard board.
-
-#. Click on 'Add file'. Select programming (pof) file provided by us.
-
-#. Check "Program/Configure" and "Verify". Push the start button. Wait until the programming process is finished.
-
-#. In case of error messages, check the polarity of cable (that pin1 corresponds) and that the correct programming connector is selected.
-
-#. Reboot the detector.
-
-
 Mythen III
 -----------
 
@@ -396,7 +360,3 @@ How to get back mtd3 drive remotely (udpating kernel)
             more /proc/mtd # verify mtd3 is listed
 
 
-Last Resort using USB Blaster
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If none of these steps work, the last resort might be physically upgrading the firmware using a USB blaster, which also requires opening up the detector. Instructions for all the blackfin detectors are the same as the one for :ref:`gotthard firmware upgrade <firmware upgrade using blaster for blackfin>`.
diff --git a/docs/src/masterfileattributes.rst b/docs/src/masterfileattributes.rst
@@ -287,56 +287,6 @@ Moench
    | Frame Header Format   | Expected frame header format for the data files |
    +-----------------------+-------------------------------------------------+
 
-Gotthard I
-^^^^^^^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Detector Roi          | Roi in detector restricted to an ADC.           |
-   |                       | Includes xmax                                   |
-   +-----------------------+-------------------------------------------------+
-   | Burst Mode            | Burst mode of detector                          |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
 
 Chip Test Board
 ^^^^^^^^^^^^^^^

diff --git a/docs/src/serverdefaults.rst b/docs/src/serverdefaults.rst
@@ -89,18 +89,3 @@ DACS
    :widths: 35, 35
    :header-rows: 1
 
-Gotthard
--------------
-
-.. csv-table:: Default values
-   :file: gotthard.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Gotthard DACS
-   :file: gotthard-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
diff --git a/docs/src/servers.rst b/docs/src/servers.rst
@@ -27,12 +27,11 @@ Arguments
          -p, --port <port>        : TCP communication port with client. 
          -g, --nomodule           : [Mythen3][Gotthard2] 
                                     Generic or No Module mode. Skips detector type checks. 
-         -f, --phaseshift <value> : [Gotthard] only. Sets phase shift. 
          -d, --devel              : Developer mode. Skips firmware checks. 
          -u, --update             : Update mode. Skips firmware checks and initial detector setup. 
-         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard][Gotthard2][Moench] 
+         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard2][Moench] 
                                     Ignore config file. 
-         -m, --master <master>    : [Eiger][Mythen3][Gotthard][Gotthard2] 
+         -m, --master <master>    : [Eiger][Mythen3][Gotthard2] 
                                     Set Master to 0 or 1. Precedence over config file. Only for virtual servers except Eiger. 
          -t, --top <top>          : [Eiger] Set Top to 0 or 1. Precedence over config file. 
          -s, --stopserver         : Stop server. Do not use as it is created by control server 
@@ -65,7 +64,7 @@ One can start the on-board detector server automatically upon powering on the bo
          /home/root/executables/eigerDetectorServer &> /dev/null &
          exit 0
 
-   Jungfrau | Moench | CTB | Gotthard I
+   Jungfrau | Moench | CTB
       .. code-block:: bash
 
          # Edit inittab on board

diff --git a/docs/src/troubleshooting.rst b/docs/src/troubleshooting.rst
@@ -385,14 +385,6 @@ Cannot get data without a module attached
 You cannot get data without a module attached as a specific pin is floating. Attach module to get data.
 
 
-Gotthard
-----------
-
-
-Missing first frame or next frame after a delay
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Connect the data link from the Module directly to receiver pc or to a private network.
-
 
 Mythen3
 --------

diff --git a/docs/src/udpheader.rst b/docs/src/udpheader.rst
@@ -92,14 +92,14 @@ Detector Enum
     ================    ========
     GENERIC             0
     EIGER               1
-    GOTTHARD            2    
+    GOTTHARD*           2    
     JUNGFRAU            3    
     CHIPTESTBOARD       4        
     MOENCH              5
     MYTHEN3             6
     GOTTHARD2           7    
     ================    ========
-
+    * deprecated since v10.0.0
 
 
 Previous Versions

diff --git a/docs/src/virtualserver.rst b/docs/src/virtualserver.rst
@@ -22,7 +22,6 @@ Binaries
 
         eigerDetectorServer_virtual
         jungfrauDetectorServer_virtual
-        gotthardDetectorServer_virtual
         gotthard2DetectorServer_virtual
         mythen3DetectorServer_virtual
         moenchDetectorServer_virtual

diff --git a/examples/gotthard.config b/examples/gotthard.config
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -37,7 +37,6 @@ set( PYTHON_FILES
     slsdet/enums.py
     slsdet/errors.py
     slsdet/gaincaps.py
-    slsdet/gotthard.py
     slsdet/pattern.py
     slsdet/gotthard2.py
     slsdet/moench.py

diff --git a/python/scripts/compile_servers.py b/python/scripts/compile_servers.py
@@ -55,7 +55,6 @@ def rc_to_string(rc):
 #     "jungfrauDetectorServer",
       "mythen3DetectorServer",
 #     "gotthard2DetectorServer",
-#     "gotthardDetectorServer",
 #     "ctbDetectorServer",
 #     "moenchDetectorServer",
 ]

diff --git a/python/slsdet/__init__.py b/python/slsdet/__init__.py
@@ -9,7 +9,6 @@
 from .jungfrau import Jungfrau
 from .mythen3 import Mythen3
 from .gotthard2 import Gotthard2
-from .gotthard import Gotthard
 from .moench import Moench
 from .pattern import Pattern, patternParameters
 from .gaincaps import Mythen3GainCapsWrapper