resolved conflicts from merging 3.1.1 in here

2025-06-23 10:07:59 +02:00 · 2018-03-21 09:03:31 +01:00
parent 98752e1cdb 17c20748bc
commit a36b715eab
22 changed files with 61 additions and 161 deletions
--- a/RELEASE.txt
+++ b/RELEASE.txt
@ -1,113 +1 @@
-SLS Detector Package 3.1.1 released on 2018-03-12
-=================================================
-
-
-
-INTRODUCTION
-
-This document describes the differences between 3.1.0 and 3.1.0 releases.
-
-The conda package of the binaries can be downloaded from
-	
-	https://github.com/slsdetectorgroup/sls_detector_software.git
-	
-The Python interface to the software package (including the package) is at 
-	
-	https://github.com/slsdetectorgroup/sls_detector.git
-	
-Manual (both HTML and pdf versions) are provided in
-	manual/docs/
-
-Documentation from Source Code can be found for the Command Line and for the API in
-	html:
-		manual/docs/html/slsDetectorClientDocs/index.html
-		manual/docs/html/slsDetectorUsersDocs/index.html
-	pdf:
-		manual/docs/pdf/slsDetectorClientDocs.pdf
-		manual/docs/pdf/slsDetectorUsersDocs.pdf
-
-Example including binaries for detector and receiver user classes can be found in 
-
-	manual/manual-api
-	
-User documentation can also be accessed directly at this location:
-
-    https://www.psi.ch/detectors/users-support
-
-If you have any software related questions or comments, please send them to:
-
-    dhanya.thattil@psi.ch
-    anna.bergamaschi@psi.ch
-    
-If you have any python related questions or comments, please send them to:
-	
-	erik.frojdh@psi.ch
-
-
-CONTENTS
-
- Firmware Requirements
- Changes in User Interface
- New Features
- Resolved Issues
- Known Issues
-
-
-
-Firmware Requirements
-=====================
-
-	Please refer to the link below for more details on the firmware versions.
-		https://www.psi.ch/detectors/firmware.
-
-    	Gotthard
-    	========   
-    	Minimum compatible version  : 11.01.2013
-    	Latest version              : 08.02.2018 (50um and 25um Master)
-                                      09.02.2018 (25 um Slave) 
-
-   	-Can not be upgraded remotely.
-    
-    
-    	Eiger
-    	=====  
-    	Minimum compatible version  : 16
-    	Latest version              : 20
-        
-    	-Can be upgraded remotely via bit files.
-    
-        
-    	Jungfrau
-    	========       
-    	Minimum compatible version  : 13.11.2017
-    	Latest version              : 13.11.2017
-
-    	-Can be upgraded remotely via sls_detector_put programfpga <pof>.
-	 
-
-
-Changes in User Interface
-========================= 
-	
-
-
-
-New Features
-============
-
-
-
-Resolved Issues
-===============
-
-
-Known Issues
-============
-
-	
-
-	
-
-
-