From 7196bfb9a55677c0d9628f040b0e9d9d4635840b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 10:16:06 +0100 Subject: [PATCH 01/15] updated release.txt --- RELEASE.txt | 271 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 205 insertions(+), 66 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index aa8246486..c9cbd9ea6 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -SLS Detector Package 3.0.1 released on 2017-09-27 +SLS Detector Package 3.0.1 released on 2018-02-12 ================================================= @@ -7,17 +7,31 @@ INTRODUCTION This document describes the differences between 3.0.0 and 3.0.1 release. +The conda package of the binaries can be downloaded from + + https://github.com/erikfrojdh/sls_detector_software.git + +The conda package of the python API wrap-around to the software 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 +Documentation from Source Code can be found for the Command Line and C++ 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 + +Documentation to the python API is available at + https://slsdetectorgroup.github.io/sls_detector/ + Example including binaries for detector and receiver user classes can be found in manual/manual-api @@ -30,6 +44,10 @@ 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 commens, please send them to: + + erik.frojdh@psi.ch CONTENTS @@ -44,110 +62,231 @@ CONTENTS Changes in User Interface ========================= + + Client + ------ + 1. Additional functions added for advanced users in users class: + (setSpeed, setClockDivider, setReadOutFlags, setDac, getADC, + setAllTrimbits, startReceiver, stopReceiver, + startAcquisition non blocking, setReceiverSilentMode, setHighVoltage, + enableDataStreamingToClient, enableDataStreamingFromReceiver, + setReceiverDataStreamingOutPort, setClientDataStreamingInPort) + + 2. Zmq set up for client and receiver are separated. + zmqport for client and rx_zmqport for receiver. By default, they are the + same for the slsDetectorGui to work. + + 3. Users example also works without config file, where detector already + configured in shared memory. + + 4. Use "sls_detector_get busy 0" to clear acquiring flag in shared memory + caused due to an earlier interrupted acquisition from Ctrl+C" + + 5. Set bit, clear bit, read register and write register cannot give -1 for + inconsistent values from multiple detectors. One has to check error from + API or read the values individually. + + 6. multiSlsDetector::char* getSettingsFile() function signature has been + changed to string getSettingsFile(). + + + Receiver - -------- - - 1. Bug Fix: Example receiver users code now handles child process exit - better. Example receiver code in slsDetectorsPackage/manual/manual-api - folder (mainReceiver.cpp). - - 2. detReceiver is now executed with [start tcp port] [number of receivers] - as arguments. By default, start tcp port is 1954 and number of receivers - is 1. + -------- + 7. Modified the help manaual/main-api/mainReceiver.cpp to make it more + robust (handling child process exit) and flexible to determine upon + start up the number of receivers (child processes), the start TCP port + and whether to call back data. + + detReceiver is now executed with [start tcp port] [number of receivers] + [1 for call back, 0 for none] as arguments. + By default, start tcp port is 1954, number of receivers is 1, and call + back is initiated. + + 8. rx_datastream to enable/disable data streaming in receiver. Using the GUI + or registering data call back in client automatically enables zmq in + receiver and client. "externalgui" is removed from the command line. Use + this command instead. - User - ---- - - 3. Added a few advanced user functions in slsDetectorUser class. - New Features ============ + + Package + ------- + 1. In addition to the C++ API, the Python API is also now provided. + + 2. CMAKE now with debug flag and rpath, show warnings, compile only certain + components (such as receiver or gui) + + 3. One repository for entire package and made available at github. + + 4. One can do --version or -v to all the binaries to find out the release + version of the particular executable. + + 5. All the software version numbers have only date in format YYMMDD. + + + Client + ------ + 6. Parallelized more commands to detector. Beneficial for large detectors. + (setTimer, setFileIndex, setOnline, setReceiverOnline, getReceiverStatus, + resetFramesCaught, setFrameIndex, setFileName, getFramesCaughtByReceiver, + setDynamicRange, setRateCorrection) + + Option to also use "sls_detector_put threaded 0" to improve speed by + eliminating progress display during acquisition. Effective only for + large detectors. + + Detector Server --------------- - 1. (Eiger): Virtual class to execute on pc for integration. - + 7. (Eiger) Virtual class to execute on pc. - Client - ------ - - 2. Parallelized more commands to detector. Beneficial for large multi detector systems. - - 3. One can set "threaded" to 0 in the config file and acquire from command line. It will - not give you progress, but might be faster for large multi detector systems. + 8. One can now read temperatures during acquisition. It goes via the stop + server. + 9. (Jungfrau) One can start server in "debug" mode and then program the + new firmware via software command "sls_detector_put programfpga xx.pof". + + 10. (Jungfrau) Server can exit on start up if either the firmware or the + server is incompatible with each other. + + 11.(Jungfrau) One is able to set transmission delay (ms) of image for each + individual detector using "txndelay_frame" command. Beneficial for + large detectors. + + 12.(Jungfrau) One can set a threshold temperature (temp_threshold) and + enable the temperature control feature (temp_control). When the + temperature (temp_fpga) overshoots the threshold temperature, it will + set the temperature event (temp_event) and power off the chip. One must + then switch off the detector and check cooling. Switching back on starts + with defaults. + + 13. (25um Gotthard) Added start acquisition delay to master module. + Receiver -------- - - 4. Added silent mode to receiver using command r_silent [i] from client. + 14. Added silent mode to receiver using command r_silent [i] from client. It might be beneficial for max frame rate applications. + + 15. Receiver print out can handle black or white backgrounds. + + 16. zmq package included updated to v4.0.8. + + 17. Zmq streaming from receiver also sends file index in json header. + + + Gui + --- + 18. If acquisition is done, but "stop dummy packet" to the gui was lost in + the network, stop acquisition command will restream it so that the gui + doesnt hang forever. This is used only for very fast detectors like + Moench. + Resolved Issues =============== + + Client + ------ + 1. gethostbyname used in connecting to sockets was not thread safe for + multiple detectors. Using getaddrinfo for stability in multi threaded + environment. + + 2. Updated writing content of config and parameter dump into files. + + 3. More locking to handle main and processing threads using the threadpool. + Removing unlock twice, which is undefined behavior. + + + Detector Server + --------------- + 4. (Eiger) The hardware MAC of the detector is used during configuration + and relayed back to client. Similarly, hardware IP for 1 Gbe data mode. + + 5. (Eiger) Status will return error if there was the unlikely trouble + reading status register in the front end board. Earlier, it would only + return idle. + + 6. (Jungfrau) patch server v3.0.0.6.3 + Able to set settings, high voltage now correctly reads 0 when + switched off, dacs are properly set. + + 7. (Jungfrau) FPGA reset and programming FPGA firmware via software is done + properly + + 8. (Gotthard) patch server v3.0.0.5.1 + Able to read temperature properly. + + 9. (Gotthard) butst mode if set too fast had unwanted behavior such as + sending same image continuously. Now it is handled to display error + and stop acquisition. + + 10. (Gotthard) completely removed the possibility to set timing modes + other than auto and trigger as they are not implemented anyway. + + 11. Non Mythen and non Eiger detectors can also now get settings file from + board. + + + Receiver + -------- + 12. Made it easier to disable the standard receiver and fixing bugs related + to the use of a custom one. + + 13. (Jungfrau) HDF5 dimensions (npixelsY) required for mapping fixed. + + 14. patch2-v3.0.0-slsReceiverSoftware.patch + x, y and z coordinates in the call backs and the files are hardcoded + for this release. + + 15. Rest implementation (not used by standard receiver) removed. + + Gui --- - - 1. Bug fix:(Eiger) In expert mode and in advanced tab, when trimbits + 16. patch1-v3.0.0-slsDetectorGui.patch + (Eiger) In expert mode and in advanced tab, when trimbits loaded are different for every pixel, the gui complains and sets all trimbits to zero. This has been resolved. Now, the "Set All Trimbits" field is just set to -1. - - 2. Minor alignment issue in Advanced Tab fixed. - - Client - ------ - - 3. Made it easier to disable the standard receiver and fixing bugs related to the use of a - custom one. - - Detector Server - --------------- - - 4. (Eiger): Status will return error if there was the unlikely trouble reading status - register in the front end board. Earlier, it would only return idle. - Receiver - -------- + 17. Fixed segmentation fault of xputsn properly. - 5. Bug fix: x, y and z coordinates in the call backs and the files - are still not corrected in the detector udp header and must be - hardcoded for this release. It is done now. + 18. Upon clicking on "Start", clears acquiring flag in shared memory + caused due to an earlier interrupted acquisition from Ctrl+C" + + 19. Fixed plotting twice caused due to unzooming the first time. - 6. File class in receiver should be created only if file write is - enabled. This has been corrected to that. - + 20. Removed option for compression in Gui as it is not available currently. + Known Issues ============ + Client ------ - - 1. Changing file name prefix at the single detector level will not concatenate scan or - position variables to the file name prefix. This is now done only at the multi - detector level. - + 1. File name prefix can only be done at multi deector level. Changing at + individual detector level will not include scan or position variables. + Detector Server --------------- - - 2. (Eiger) The hardware mac of the detector is used (not relayed back to the client). - For 1 GbE, the hardware IP of the detector is used (also not relayed back to the - client). - - 3. Standard header fills x-coord in 1D. y-coord and z-coord is not implemented (3D). - - + 2. Standard header fills x-coord in 1D. y-coord and z-coord is not + implemented (3D). + + Receiver -------- - - 4. HDF5 compression and filters are not implemented yet. + 3. HDF5 compression and filters are not implemented yet. From 0dd0486aa5b9a4e453dd4142ed42032b9109d904 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 10:22:17 +0100 Subject: [PATCH 02/15] indentation in release --- RELEASE.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index c9cbd9ea6..4805a6643 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -148,17 +148,17 @@ New Features 8. One can now read temperatures during acquisition. It goes via the stop server. - 9. (Jungfrau) One can start server in "debug" mode and then program the + 9. (Jungfrau) One can start server in "debug" mode and then program the new firmware via software command "sls_detector_put programfpga xx.pof". - 10. (Jungfrau) Server can exit on start up if either the firmware or the + 10. (Jungfrau) Server can exit on start up if either the firmware or the server is incompatible with each other. - 11.(Jungfrau) One is able to set transmission delay (ms) of image for each + 11. (Jungfrau) One is able to set transmission delay (ms) of image for each individual detector using "txndelay_frame" command. Beneficial for large detectors. - 12.(Jungfrau) One can set a threshold temperature (temp_threshold) and + 12. (Jungfrau) One can set a threshold temperature (temp_threshold) and enable the temperature control feature (temp_control). When the temperature (temp_fpga) overshoots the threshold temperature, it will set the temperature event (temp_event) and power off the chip. One must From ef574e6620831cc68f71ae0c5e7efe2c1b2a41bd Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 10:23:26 +0100 Subject: [PATCH 03/15] indentation in release --- RELEASE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.txt b/RELEASE.txt index 4805a6643..958e2d1b1 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -195,7 +195,7 @@ Resolved Issues Client ------ - 1. gethostbyname used in connecting to sockets was not thread safe for + 1. gethostbyname used in connecting to sockets was not thread safe for multiple detectors. Using getaddrinfo for stability in multi threaded environment. From 2429af754f969be3fb2d5777ab3a9b8f8b74e16d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 11:08:33 +0100 Subject: [PATCH 04/15] added -t option in release.txt --- RELEASE.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE.txt b/RELEASE.txt index 958e2d1b1..bcad9961f 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -108,6 +108,8 @@ Changes in User Interface receiver and client. "externalgui" is removed from the command line. Use this command instead. + 9. Rx_tcpport argument to the slsReceiver can be given using -t. + Eg. slsReceiver -t1955 New Features From 5c23fd65029a9fe2c71a957c4ef9b03afdb80b02 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 11:25:21 +0100 Subject: [PATCH 05/15] updated manuals --- manual/Makefile | 2 +- manual/docs/html/slsDetectors-FAQ/index.html | 4 ++-- manual/docs/html/slsDetectors-FAQ/node1.html | 2 +- manual/docs/html/slsDetectors-FAQ/node10.html | 2 +- manual/docs/html/slsDetectors-FAQ/node11.html | 2 +- manual/docs/html/slsDetectors-FAQ/node12.html | 2 +- manual/docs/html/slsDetectors-FAQ/node13.html | 2 +- manual/docs/html/slsDetectors-FAQ/node14.html | 2 +- manual/docs/html/slsDetectors-FAQ/node15.html | 2 +- manual/docs/html/slsDetectors-FAQ/node16.html | 2 +- manual/docs/html/slsDetectors-FAQ/node17.html | 2 +- manual/docs/html/slsDetectors-FAQ/node18.html | 2 +- manual/docs/html/slsDetectors-FAQ/node19.html | 2 +- manual/docs/html/slsDetectors-FAQ/node2.html | 2 +- manual/docs/html/slsDetectors-FAQ/node20.html | 2 +- manual/docs/html/slsDetectors-FAQ/node21.html | 2 +- manual/docs/html/slsDetectors-FAQ/node22.html | 2 +- manual/docs/html/slsDetectors-FAQ/node3.html | 2 +- manual/docs/html/slsDetectors-FAQ/node4.html | 2 +- manual/docs/html/slsDetectors-FAQ/node5.html | 2 +- manual/docs/html/slsDetectors-FAQ/node6.html | 2 +- manual/docs/html/slsDetectors-FAQ/node7.html | 2 +- manual/docs/html/slsDetectors-FAQ/node8.html | 2 +- manual/docs/html/slsDetectors-FAQ/node9.html | 2 +- .../slsDetectors-FAQ/slsDetectors-FAQ.html | 4 ++-- manual/docs/pdf/slsDetectorInstall.pdf | Bin 70240 -> 70273 bytes manual/docs/pdf/slsDetectors-FAQ.pdf | Bin 860691 -> 860712 bytes 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/manual/Makefile b/manual/Makefile index a341e3a5c..bf70e0f0b 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -5,7 +5,7 @@ DESTDIR?=docs -MAINDIRS= manual-main +MAINDIRS= manual-main manual-api manual-calwiz manual-client manual-gui #manual-calwiz manual-calwiz manual-gui manual-client manual-api CLEANDIRS=$(MAINDIRS:manual-%=clean-%) PDFDIRS=$(MAINDIRS:manual-%=pdf-%) diff --git a/manual/docs/html/slsDetectors-FAQ/index.html b/manual/docs/html/slsDetectors-FAQ/index.html index 7146179fa..3cc00c9b6 100644 --- a/manual/docs/html/slsDetectors-FAQ/index.html +++ b/manual/docs/html/slsDetectors-FAQ/index.html @@ -53,7 +53,7 @@ Frequently Asked Questions"> Frequently Asked Questions

Anna Bergamaschi

-

Date: November 28, 2017

+

Date: February 9, 2018

@@ -244,7 +244,7 @@ Frequently Asked Questions
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node1.html b/manual/docs/html/slsDetectors-FAQ/node1.html index 35fb1c515..c680b25ac 100644 --- a/manual/docs/html/slsDetectors-FAQ/node1.html +++ b/manual/docs/html/slsDetectors-FAQ/node1.html @@ -198,7 +198,7 @@ Contents
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node10.html b/manual/docs/html/slsDetectors-FAQ/node10.html index ced61e7cf..64e22bc17 100644 --- a/manual/docs/html/slsDetectors-FAQ/node10.html +++ b/manual/docs/html/slsDetectors-FAQ/node10.html @@ -195,7 +195,7 @@ Read Out Trigger mode: the external trigger signal defines the beginning of the
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node11.html b/manual/docs/html/slsDetectors-FAQ/node11.html index 2341f0e18..9fa00ec6a 100644 --- a/manual/docs/html/slsDetectors-FAQ/node11.html +++ b/manual/docs/html/slsDetectors-FAQ/node11.html @@ -103,7 +103,7 @@ After the configuration, the synchronization of the controllers will be complete
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node12.html b/manual/docs/html/slsDetectors-FAQ/node12.html index 2cb00c6f8..9f5739782 100644 --- a/manual/docs/html/slsDetectors-FAQ/node12.html +++ b/manual/docs/html/slsDetectors-FAQ/node12.html @@ -103,7 +103,7 @@ A simple high-level solution in case you need to maintain the software for sever
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node13.html b/manual/docs/html/slsDetectors-FAQ/node13.html index 2e99c04f7..91df3df2e 100644 --- a/manual/docs/html/slsDetectors-FAQ/node13.html +++ b/manual/docs/html/slsDetectors-FAQ/node13.html @@ -187,7 +187,7 @@ JUNGFRAU
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node14.html b/manual/docs/html/slsDetectors-FAQ/node14.html index 8692e1005..a3f89d754 100644 --- a/manual/docs/html/slsDetectors-FAQ/node14.html +++ b/manual/docs/html/slsDetectors-FAQ/node14.html @@ -81,7 +81,7 @@ General questions about detectors
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node15.html b/manual/docs/html/slsDetectors-FAQ/node15.html index 24e7d3e8d..0888995e5 100644 --- a/manual/docs/html/slsDetectors-FAQ/node15.html +++ b/manual/docs/html/slsDetectors-FAQ/node15.html @@ -203,7 +203,7 @@ Settings to be chosen for the MYTHEN detector as a function of the X-ray energy
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node16.html b/manual/docs/html/slsDetectors-FAQ/node16.html index 53c94be0e..b31033e10 100644 --- a/manual/docs/html/slsDetectors-FAQ/node16.html +++ b/manual/docs/html/slsDetectors-FAQ/node16.html @@ -105,7 +105,7 @@ In case the board has some memory that can be accessed by the hardware, this is
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node17.html b/manual/docs/html/slsDetectors-FAQ/node17.html index ea682d7dc..fba503072 100644 --- a/manual/docs/html/slsDetectors-FAQ/node17.html +++ b/manual/docs/html/slsDetectors-FAQ/node17.html @@ -109,7 +109,7 @@ Single photon counting detectors
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node18.html b/manual/docs/html/slsDetectors-FAQ/node18.html index fa25ade2d..ae96aa2b5 100644 --- a/manual/docs/html/slsDetectors-FAQ/node18.html +++ b/manual/docs/html/slsDetectors-FAQ/node18.html @@ -146,7 +146,7 @@ Plot indicating the reccomended choice of detector settings as a function of the
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node19.html b/manual/docs/html/slsDetectors-FAQ/node19.html index e4d5fa1a0..31ea00391 100644 --- a/manual/docs/html/slsDetectors-FAQ/node19.html +++ b/manual/docs/html/slsDetectors-FAQ/node19.html @@ -305,7 +305,7 @@ Example of data from a sample emitting fluorescent light and detector threshold
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node2.html b/manual/docs/html/slsDetectors-FAQ/node2.html index 93998fb12..7635ec164 100644 --- a/manual/docs/html/slsDetectors-FAQ/node2.html +++ b/manual/docs/html/slsDetectors-FAQ/node2.html @@ -111,7 +111,7 @@ SLS Detectors Software
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node20.html b/manual/docs/html/slsDetectors-FAQ/node20.html index 4aa9e7d1d..e889782c9 100644 --- a/manual/docs/html/slsDetectors-FAQ/node20.html +++ b/manual/docs/html/slsDetectors-FAQ/node20.html @@ -171,7 +171,7 @@ Sketch of the experimental setup for a dynamic acquisition of the flat field.
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node21.html b/manual/docs/html/slsDetectors-FAQ/node21.html index 8e9e7b61d..80c2e11c9 100644 --- a/manual/docs/html/slsDetectors-FAQ/node21.html +++ b/manual/docs/html/slsDetectors-FAQ/node21.html @@ -258,7 +258,7 @@ The authomatic loading of energy-specific trim files is not yet implemented.
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node22.html b/manual/docs/html/slsDetectors-FAQ/node22.html index ef4f21488..4c93d1f3b 100644 --- a/manual/docs/html/slsDetectors-FAQ/node22.html +++ b/manual/docs/html/slsDetectors-FAQ/node22.html @@ -179,7 +179,7 @@ Reading and analyzing the data takes some time, but, after a while, a canvas sho
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node3.html b/manual/docs/html/slsDetectors-FAQ/node3.html index 11733f1e5..e46a5d282 100644 --- a/manual/docs/html/slsDetectors-FAQ/node3.html +++ b/manual/docs/html/slsDetectors-FAQ/node3.html @@ -110,7 +110,7 @@ The class slsDetectorUsers can be used as API from your acquisition software (se
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node4.html b/manual/docs/html/slsDetectors-FAQ/node4.html index d66403b73..ffe93cdcf 100644 --- a/manual/docs/html/slsDetectors-FAQ/node4.html +++ b/manual/docs/html/slsDetectors-FAQ/node4.html @@ -158,7 +158,7 @@ You will need to configure more than one detector, only in case you want to oper
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node5.html b/manual/docs/html/slsDetectors-FAQ/node5.html index 920847db9..0c8dfa377 100644 --- a/manual/docs/html/slsDetectors-FAQ/node5.html +++ b/manual/docs/html/slsDetectors-FAQ/node5.html @@ -133,7 +133,7 @@ The client will take care of communicating with the data receiver and the detect
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node6.html b/manual/docs/html/slsDetectors-FAQ/node6.html index 06861fb14..f5e2c7d6f 100644 --- a/manual/docs/html/slsDetectors-FAQ/node6.html +++ b/manual/docs/html/slsDetectors-FAQ/node6.html @@ -143,7 +143,7 @@ It must contain the subdirectories dynamicgain, gain1,
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node7.html b/manual/docs/html/slsDetectors-FAQ/node7.html index 3562917f5..5b2bb2d5c 100644 --- a/manual/docs/html/slsDetectors-FAQ/node7.html +++ b/manual/docs/html/slsDetectors-FAQ/node7.html @@ -71,7 +71,7 @@ The configuration files look different for the different detector types. Example
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node8.html b/manual/docs/html/slsDetectors-FAQ/node8.html index 55848ca72..18ed3c2d5 100644 --- a/manual/docs/html/slsDetectors-FAQ/node8.html +++ b/manual/docs/html/slsDetectors-FAQ/node8.html @@ -80,7 +80,7 @@ where:
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/node9.html b/manual/docs/html/slsDetectors-FAQ/node9.html index ad7367b10..48288384b 100644 --- a/manual/docs/html/slsDetectors-FAQ/node9.html +++ b/manual/docs/html/slsDetectors-FAQ/node9.html @@ -337,7 +337,7 @@ where i si the file index and p is the stop script parameter.
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html b/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html index 7146179fa..3cc00c9b6 100644 --- a/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html +++ b/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html @@ -53,7 +53,7 @@ Frequently Asked Questions"> Frequently Asked Questions

Anna Bergamaschi

-

Date: November 28, 2017

+

Date: February 9, 2018

@@ -244,7 +244,7 @@ Frequently Asked Questions
Thattil Dhanya -2017-11-28 +2018-02-09
diff --git a/manual/docs/pdf/slsDetectorInstall.pdf b/manual/docs/pdf/slsDetectorInstall.pdf index 4dcc51eabe84b27be07140b3c19bec4ed3c47bc8..9f1a6f4575e41cbc70efbc84719d845ff77be00d 100644 GIT binary patch delta 6255 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 aeSB@aeFMEI4ruD6LL{`5l$PF6^#1{_;8Lvs delta 6202 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 R7zzUiP%vR(l}oCy{{wind4K=_ diff --git a/manual/docs/pdf/slsDetectors-FAQ.pdf b/manual/docs/pdf/slsDetectors-FAQ.pdf index 7618aec85c4e7377331f039a09f5e14b065967e0..0abd1b047e7d5f4640f4f5460b2d19f1937027d1 100644 GIT binary patch delta 13977 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 Date: Fri, 9 Feb 2018 12:15:45 +0100 Subject: [PATCH 06/15] updated Readme.md --- README.md | 63 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4e866a4aa..61ee66bc8 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,12 @@ # slsDetector package -## Installation +## Installation of binaries via the conda package +Documentation to obtain the binaries is available [here.](https://github.com/slsdetectorgroup/sls_detector_software) -### Get source -The source code is organised into several submodules, and the top level module is -sls_detectors_package. +## Installation of source code and compiling -``` - $ git clone git@git.psi.ch:sls_detectors_software/sls_detectors_package.git - $ cd sls_detectors_package - $ ./checkout.sh -``` - -### Setup dependencies +### Setup dependencies for GUI client and calibration wizards The GUI client requires Qt 4.8 and Qwt 6.0 ``` export QTDIR=/usr/local/Trolltech/ @@ -26,19 +19,55 @@ The calibration wizards require ROOT export ROOTSYS=/usr/local/root-5.34 ``` -### Compile -Use cmake to create out-of-source builds, by creating an build folder parallel to source directory. +### Compile using script cmk.sh +Usage: [-c] [-b] [-h] [-d ] [-j] + -[no option]: only make + -c: Clean + -b: Builds/Rebuilds CMake files normal mode + -h: Builds/Rebuilds Cmake files with HDF5 package + -d: HDF5 Custom Directory + -t: Build/Rebuilds only text client + -r: Build/Rebuilds only receiver + -g: Build/Rebuilds only gui + -j: Number of threads to compile through + +For only make: +./cmk.sh + +For make clean;make: +./cmk.sh -c + +For using hdf5 without custom dir /blabla: +./cmk.sh -h -d /blabla + +For rebuilding cmake without hdf5 +./cmk.sh -b + +For using multiple cores to compile faster: +(all these options work) +./cmk.sh -j9 +./cmk.sh -cj9 #with clean +./cmk.sh -hj9 #with hdf5 +./cmk.sh -j9 -h #with hdf + +For rebuilding only certain sections +./cmk.sh -tg #only text client and gui +./cmk.sh -r #only receiver + + +### Compile without script +Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. ``` $ cd .. - $ mkdir sls_detectors_package-build - $ cd sls_detectors_package-build - $ cmake ../sls_detectors_package + $ mkdir slsDetectorPackage-build + $ cd slsDetectorPackage-build + $ cmake ../slsDetectorPackage -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=OFF -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=OFF $ make ``` Use the following as an example to compile statically and using specific hdf5 folder ``` - $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake -DHDF5_USE_STATIC_LIBRARIES=TRUE ../slsDetectorsPackage + $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=OFF -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=ON ``` The libraries and executables will be found at `bin` directory ``` From d2a2a2729ec0c2418e62ada794c1725408675877 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:19:19 +0100 Subject: [PATCH 07/15] updated Readme.md --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 61ee66bc8..c47b152f2 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # slsDetector package -## Installation of binaries via the conda package -Documentation to obtain the binaries is available [here.](https://github.com/slsdetectorgroup/sls_detector_software) +## Installation -## Installation of source code and compiling +### Get binaries +Documentation to obtain the binaries via the conda package is available [here.](https://github.com/slsdetectorgroup/sls_detector_software) + +### Get source code +One can also obtain the source code from this repository and compile as follows. ### Setup dependencies for GUI client and calibration wizards The GUI client requires Qt 4.8 and Qwt 6.0 From 2cf150bb30fb41fed2fd31835f4bfb4b16f53ecf Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:21:25 +0100 Subject: [PATCH 08/15] updated Readme.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c47b152f2..c37176985 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,17 @@ Documentation to obtain the binaries via the conda package is available [here.]( ### Get source code One can also obtain the source code from this repository and compile as follows. -### Setup dependencies for GUI client and calibration wizards -The GUI client requires Qt 4.8 and Qwt 6.0 +### Setup dependencies +* Gui Client +Requirements: Qt 4.8 and Qwt 6.0 ``` export QTDIR=/usr/local/Trolltech/ export QWTDIR=/usr/local/qwt-6.0.1/ ``` If either of them does not exist, the GUI client will not be built. -The calibration wizards require ROOT +* Calibration wizards +Requirements: ROOT ``` export ROOTSYS=/usr/local/root-5.34 ``` From 14eff537987cbbc0f7aa06a2584980e6748bcaf0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:23:34 +0100 Subject: [PATCH 09/15] updated Readme.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c37176985..8b623ad0d 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,14 @@ Documentation to obtain the binaries via the conda package is available [here.]( One can also obtain the source code from this repository and compile as follows. ### Setup dependencies -* Gui Client -Requirements: Qt 4.8 and Qwt 6.0 +* Gui Client.
Requirements: Qt 4.8 and Qwt 6.0 ``` export QTDIR=/usr/local/Trolltech/ export QWTDIR=/usr/local/qwt-6.0.1/ ``` If either of them does not exist, the GUI client will not be built. -* Calibration wizards -Requirements: ROOT +* Calibration wizards.
Requirements: ROOT ``` export ROOTSYS=/usr/local/root-5.34 ``` From 98010057ce2797294df36387ff8b0849b3435a0b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:24:05 +0100 Subject: [PATCH 10/15] updated Readme.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8b623ad0d..15e552118 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,16 @@ Documentation to obtain the binaries via the conda package is available [here.]( One can also obtain the source code from this repository and compile as follows. ### Setup dependencies -* Gui Client.
Requirements: Qt 4.8 and Qwt 6.0 +* Gui Client
+Requirements: Qt 4.8 and Qwt 6.0 ``` export QTDIR=/usr/local/Trolltech/ export QWTDIR=/usr/local/qwt-6.0.1/ ``` If either of them does not exist, the GUI client will not be built. -* Calibration wizards.
Requirements: ROOT +* Calibration wizards
+Requirements: ROOT ``` export ROOTSYS=/usr/local/root-5.34 ``` From a29e70c52f56f7c7631cb85d0d08842f8576fde0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:26:19 +0100 Subject: [PATCH 11/15] updated Readme.md --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 15e552118..d64bf4481 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,16 @@ Requirements: ROOT ``` ### Compile using script cmk.sh -Usage: [-c] [-b] [-h] [-d ] [-j] - -[no option]: only make - -c: Clean - -b: Builds/Rebuilds CMake files normal mode - -h: Builds/Rebuilds Cmake files with HDF5 package - -d: HDF5 Custom Directory - -t: Build/Rebuilds only text client - -r: Build/Rebuilds only receiver - -g: Build/Rebuilds only gui - -j: Number of threads to compile through +Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]
+ -[no option]: only make
+ -c: Clean
+ -b: Builds/Rebuilds CMake files normal mode
+ -h: Builds/Rebuilds Cmake files with HDF5 package
+ -d: HDF5 Custom Directory
+ -t: Build/Rebuilds only text client
+ -r: Build/Rebuilds only receiver
+ -g: Build/Rebuilds only gui
+ -j: Number of threads to compile through
For only make: ./cmk.sh @@ -48,16 +48,16 @@ For using hdf5 without custom dir /blabla: For rebuilding cmake without hdf5 ./cmk.sh -b -For using multiple cores to compile faster: -(all these options work) -./cmk.sh -j9 -./cmk.sh -cj9 #with clean -./cmk.sh -hj9 #with hdf5 -./cmk.sh -j9 -h #with hdf +For using multiple cores to compile faster:
+(all these options work)
+./cmk.sh -j9
+./cmk.sh -cj9 #with clean
+./cmk.sh -hj9 #with hdf5
+./cmk.sh -j9 -h #with hdf
-For rebuilding only certain sections -./cmk.sh -tg #only text client and gui -./cmk.sh -r #only receiver +For rebuilding only certain sections
+./cmk.sh -tg #only text client and gui
+./cmk.sh -r #only receiver
### Compile without script From 18c2b8d72556cb7670ab7f206723e540d57c2581 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 12:27:10 +0100 Subject: [PATCH 12/15] updated Readme.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d64bf4481..5c37a7fe5 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,15 @@ Requirements: ROOT ### Compile using script cmk.sh Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]
- -[no option]: only make
- -c: Clean
- -b: Builds/Rebuilds CMake files normal mode
- -h: Builds/Rebuilds Cmake files with HDF5 package
- -d: HDF5 Custom Directory
- -t: Build/Rebuilds only text client
- -r: Build/Rebuilds only receiver
- -g: Build/Rebuilds only gui
- -j: Number of threads to compile through
+ * -[no option]: only make
+ * -c: Clean
+ * -b: Builds/Rebuilds CMake files normal mode
+ * -h: Builds/Rebuilds Cmake files with HDF5 package
+ * -d: HDF5 Custom Directory
+ * -t: Build/Rebuilds only text client
+ * -r: Build/Rebuilds only receiver
+ * -g: Build/Rebuilds only gui
+ * -j: Number of threads to compile through
For only make: ./cmk.sh From 1b6ca913b271624e5b6916a0ad5b77f492c20310 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 13:45:13 +0100 Subject: [PATCH 13/15] removed checkout.sh as it is a single repository now --- checkout.sh | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100755 checkout.sh diff --git a/checkout.sh b/checkout.sh deleted file mode 100755 index 01a3f21f4..000000000 --- a/checkout.sh +++ /dev/null @@ -1,17 +0,0 @@ -#git clone $1@git.psi.ch:sls_det_software/sls_detectors_package.git slsDetectorsPackage - -#cd slsDetectorsPackage - -git clone $1@git.psi.ch:sls_detectors_software/sls_detector_software.git slsDetectorSoftware - -git clone $1@git.psi.ch:sls_detectors_software/sls_detector_gui.git slsDetectorGui - -git clone $1@git.psi.ch:sls_detectors_software/sls_receiver_software.git slsReceiverSoftware - -git clone $1@git.psi.ch:sls_detectors_software/sls_detector_calibration.git slsDetectorCalibration - -#git clone $1@git.psi.ch:sls_detectors_software/sls_image_reconstruction.git slsImageReconstruction - -git clone $1@git.psi.ch:sls_detectors_software/calibration_wizards.git calibrationWizards - -#git clone git@git.psi.ch:sls_detectors_software/tests.git tests From 7a6b6e1feafca517b67739457028d1ff44bad485 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 14:02:57 +0100 Subject: [PATCH 14/15] updated Readme.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5c37a7fe5..c73101c0b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # slsDetector package +The SLS Detectors Package is intended to control the detectors developed by the SLS Detectors Group.
+The detectors currently supported are namely MYTHEN, GOTTHARD, EIGER, JUNGFRAU and MOENCH.
## Installation From 1609f1d495e45ef40a65be03c94289b3508437c4 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Feb 2018 14:06:09 +0100 Subject: [PATCH 15/15] release.txt is not pushed in by default --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 28cdacd3c..4ef28dd50 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bin/ *.toc build docs/ +RELEASE.txt