From 8e980d1ace22fe923c6c4b4dfb2d48701e93219a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 28 Sep 2021 16:10:41 +0200 Subject: [PATCH 1/6] minor --- slsDetectorSoftware/src/Module.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 4f4038803..0f9a8d486 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -1080,7 +1080,7 @@ std::string Module::printReceiverConfiguration() { os << "\nSource UDP IP:\t" << getSourceUDPIP() << "\nSource UDP MAC:\t" << getSourceUDPMAC() << "\nDestination UDP IP:\t" - << getDestinationUDPIP() << "\nReceiver UDP MAC:\t" + << getDestinationUDPIP() << "\nDestination UDP MAC:\t" << getDestinationUDPMAC(); if (shm()->detType == JUNGFRAU) { @@ -1510,7 +1510,7 @@ void Module::setRateCorrection(int64_t t) { } void Module::sendReceiverRateCorrections(const std::vector &t) { - LOG(logDEBUG) << "Sending to Module [rate corrections: " << ToString(t) + LOG(logDEBUG) << "Sending to receiver 0 [rate corrections: " << ToString(t) << ']'; auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort); receiver.Send(F_SET_RECEIVER_RATE_CORRECT); From eeaebbe78cb6025950d86c118322bccf708e67d6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 28 Sep 2021 17:00:40 +0200 Subject: [PATCH 2/6] release docs --- RELEASE.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/RELEASE.txt b/RELEASE.txt index b17da225c..00dd1cd1a 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -19,6 +19,30 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 1. New Features =============== + Jungfrau server + --------------- + 1. Features for chipv1.1 incorporated + + 2. chipversion - getchipVersion + gets chip version (1.0 or 1.1) + chipv1.1 requires config_jungfrau.txt on detector server. + + 3. chip configuration (only chipv1.1) + powering on the chip and changing settings will configure the chip. + Hence, required before acquisition. + + 4. Settings and Gain mode + Settings can be gain0 and highgain0. Gain mode can be dynamicgain, + forceswitchg1, forceswitchg2, fixg1, fixg2, fixg0. fixg0 must be + used with EXTRA caution as you can damage the detector. + Changing settings also changes dac values of 3 dacs () and reconfigures + chip (only v1.1) + + 5. default dacs + + + + Client ------ 1. Setting Mythen3 gain from command line From 9288d33a8f0f3104e7749a27f2dad32ad156a706 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 29 Sep 2021 12:15:58 +0200 Subject: [PATCH 3/6] release notes and help --- RELEASE.txt | 83 +++++++++++++++++++--- python/slsdet/detector.py | 2 +- slsDetectorSoftware/include/sls/Detector.h | 2 +- slsDetectorSoftware/src/CmdProxy.h | 2 +- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 00dd1cd1a..1cb0a2d35 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -7,7 +7,7 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. CONTENTS -------- - 1. New Features + 1. New or Changed Features 2. Resolved Issues 3. Known Issues 4. Firmware Requirements @@ -16,18 +16,20 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. -1. New Features -=============== +1. New or Changed Features +========================== + + Jungfrau + -------- - Jungfrau server - --------------- 1. Features for chipv1.1 incorporated - 2. chipversion - getchipVersion + 2. Chip version + Command line: chipversion, API: getchipVersion gets chip version (1.0 or 1.1) chipv1.1 requires config_jungfrau.txt on detector server. - 3. chip configuration (only chipv1.1) + 3. Chip configuration (only chipv1.1) powering on the chip and changing settings will configure the chip. Hence, required before acquisition. @@ -38,7 +40,62 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. Changing settings also changes dac values of 3 dacs () and reconfigures chip (only v1.1) - 5. default dacs + 5. Storage cells (only chipv1.1) + Additional number of storage cells not applicable for chipv1.1. + Storage cell start is only allowed from 0 - 3 for chipv1.1 + (0 - 15 for chipv1.0). + + 6. Filter cell (only chipv1.1) + Command line: filtercell, API: getFilterCell/ setFilterCell + Set filter cell. Options: [0-12]. Advanced user command. + + 7. Comparator disable time (only chipv1.1) + Command line: comp_disable_time, API: getComparatorDisableTime/ + setComparatorDisableTime + One can customize the period to disable comparator. + + Others + ------ + + 1. Flip rows [Eiger][Jungfrau] + Command line: fliprows, API: getFlipRows/ setFlipRows + Previous command: flippeddatax, setBottom/ getBottom + [Jungfrau] Flips rows in detector only for HW v2.0. + slsReceiver and slsDetectorGui will not flip them again. + [Eiger] same as before. + + 2. Read n rows [Eiger][Jungfrau] + Command line: readnrows, API: getReadNRows/ setReadNRows + Previous Command: readnlines, getPartialReadout/ setPartialReadout + [Eiger] same as before + [Jungfrau] Options: 8 - 512, multiples of 8. Default is 512. + + 2. Filter Resistor [Gotthard2][Jungfrau] + Command line: filterresistor, API: getFilterResistor/ setFilterResistor + Previous Command: filter, setFilter/ getFilter + Set Filter resistor. Increasing values for increasing resistance. + [Jungfrau] only for chipv1.1. Options: [0|1]. Default is 1. + [Gotthard2] Options: [0|1|2|3]. Default is 0. + + 3. Current source [Gotthard2][Jungfrau] + Command line: currentsource, API: getCurrentSource, setCurrentSource + Enable or disable current source. Default is disabled. + [Gotthard2] Can only enable or disable. + [Jungfrau] Can choose to fix, select source and choose normal or low + current. Normal/ low only for chipv1.1. + Select source is 0-63 for chipv1.0 and a 64 bit mask for chipv1.1. + + 2. Default dac + Command line: defaultdac, API: getDefaultDac/ setDefaultDac + change default value of a dac + [Jungfrau][Mythen3] Also change default value of dac for particular + setting. + + 3. Reset dacs + Command line: resetdacs, API: resetToDefaultDacs + Previous command: defaultdacs + Resets dacs to their default values or hard coded values. + @@ -49,7 +106,8 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 2. (Gotthard2) veto streaming - New command to enable/ disable veto streaming via 2.5GbE or/ and 10GbE (debugging). + New command to enable/ disable veto streaming via 2.5GbE or/ and 10GbE + (debugging). Command: vetostream, Detector::setVetoStream @@ -70,6 +128,11 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 2. Resolved Issues ================== + Jungfrau + -------- + + 1. + Gotthard2 Server ---------------- @@ -127,7 +190,7 @@ virtual server plots increasing values for every packet.. not every pixel Gotthard2 ========= - Compatible version : 27.05.2021 (v1.0) + Compatible version : 27.05.2021 (development) Moench ====== diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 9495c71f9..888d7df0e 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -2263,7 +2263,7 @@ class Detector(CppDetectorApi): [Jungfrau] Set filter capacitor. Note ---- - [Jungfrau] Options: 0-12. Default: 0. Advanced user command. + [Jungfrau] Options: 0-12. Default: 0. Advanced user command. Only for chipv1.1. """ return self.getFilterCell() diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index a92a7087b..7f4082370 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -1236,7 +1236,7 @@ class Detector { /** [Jungfrau] Advanced */ Result getFilterCell(Positions pos = {}) const; - /** [Jungfrau] Advanced Options[0-12] + /** [Jungfrau] Advanced Options[0-12], only for chip v1.1 */ void setFilterCell(int cell, Positions pos = {}); diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 081197f49..7f89cc65b 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1933,7 +1933,7 @@ class CmdProxy { INTEGER_COMMAND_VEC_ID( filtercell, getFilterCell, setFilterCell, sls::StringTo, - "[0-12]\n\t[Jungfrau] Set Filter Cell. Advanced user Command"); + "[0-12]\n\t[Jungfrau] Set Filter Cell. Only for chipv1.1. Advanced user Command"); /* Gotthard Specific */ TIME_GET_COMMAND(exptimel, getExptimeLeft, From 6421c153878728ede5602a9d9b1814712f800f7d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 29 Sep 2021 15:14:52 +0200 Subject: [PATCH 4/6] release notes and help --- RELEASE.txt | 155 ++++++++++----------- python/slsdet/detector.py | 2 +- slsDetectorSoftware/include/sls/Detector.h | 2 +- slsDetectorSoftware/src/CmdProxy.cpp | 2 +- 4 files changed, 76 insertions(+), 85 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 1cb0a2d35..f27091e52 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -19,65 +19,62 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 1. New or Changed Features ========================== - Jungfrau - -------- + Client + ------ - 1. Features for chipv1.1 incorporated - - 2. Chip version + 1. [Jungfrau] Chip version + Features for chipv1.1 incorporated Command line: chipversion, API: getchipVersion gets chip version (1.0 or 1.1) chipv1.1 requires config_jungfrau.txt on detector server. - 3. Chip configuration (only chipv1.1) + 2. [Jungfrau] Chip configuration (only chipv1.1) powering on the chip and changing settings will configure the chip. Hence, required before acquisition. - 4. Settings and Gain mode + 3. [Jungfrau] Settings and Gain mode Settings can be gain0 and highgain0. Gain mode can be dynamicgain, forceswitchg1, forceswitchg2, fixg1, fixg2, fixg0. fixg0 must be used with EXTRA caution as you can damage the detector. Changing settings also changes dac values of 3 dacs () and reconfigures chip (only v1.1) - 5. Storage cells (only chipv1.1) + 4. [Jungfrau] Storage cells (only chipv1.1) Additional number of storage cells not applicable for chipv1.1. Storage cell start is only allowed from 0 - 3 for chipv1.1 (0 - 15 for chipv1.0). - 6. Filter cell (only chipv1.1) - Command line: filtercell, API: getFilterCell/ setFilterCell - Set filter cell. Options: [0-12]. Advanced user command. - - 7. Comparator disable time (only chipv1.1) - Command line: comp_disable_time, API: getComparatorDisableTime/ - setComparatorDisableTime - One can customize the period to disable comparator. - - Others - ------ - - 1. Flip rows [Eiger][Jungfrau] - Command line: fliprows, API: getFlipRows/ setFlipRows - Previous command: flippeddatax, setBottom/ getBottom - [Jungfrau] Flips rows in detector only for HW v2.0. - slsReceiver and slsDetectorGui will not flip them again. - [Eiger] same as before. - - 2. Read n rows [Eiger][Jungfrau] - Command line: readnrows, API: getReadNRows/ setReadNRows - Previous Command: readnlines, getPartialReadout/ setPartialReadout - [Eiger] same as before - [Jungfrau] Options: 8 - 512, multiples of 8. Default is 512. - - 2. Filter Resistor [Gotthard2][Jungfrau] + 5. [Gotthard2][Jungfrau] Filter Resistor Command line: filterresistor, API: getFilterResistor/ setFilterResistor Previous Command: filter, setFilter/ getFilter Set Filter resistor. Increasing values for increasing resistance. [Jungfrau] only for chipv1.1. Options: [0|1]. Default is 1. [Gotthard2] Options: [0|1|2|3]. Default is 0. - 3. Current source [Gotthard2][Jungfrau] + 6. [Jungfrau] Filter cell (only chipv1.1) + Command line: filtercell, API: getFilterCell/ setFilterCell + Set filter cell. Options: [0-12]. Advanced user command. + + 7. [Jungfrau] Comparator disable time (only chipv1.1) + Command line: comp_disable_time, API: getComparatorDisableTime/ + setComparatorDisableTime + One can customize the period to disable comparator. + + 8. [Eiger][Jungfrau] Flip rows + Command line: fliprows, API: getFlipRows/ setFlipRows + Previous command: flippeddatax, setBottom/ getBottom + [Jungfrau] Flips rows in detector only for HW v2.0. + slsReceiver and slsDetectorGui will not flip them again. + [Eiger] same as before. + + 9. [Eiger][Jungfrau] Read n rows + Command line: readnrows, API: getReadNRows/ setReadNRows + Previous Command: readnlines, getPartialReadout/ setPartialReadout + [Eiger] same as before + [Jungfrau] Options: 8 - 512, multiples of 8. Default is 512. + + + 10. [Gotthard2][Jungfrau] Current source Command line: currentsource, API: getCurrentSource, setCurrentSource Enable or disable current source. Default is disabled. [Gotthard2] Can only enable or disable. @@ -85,87 +82,80 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. current. Normal/ low only for chipv1.1. Select source is 0-63 for chipv1.0 and a 64 bit mask for chipv1.1. - 2. Default dac + 11. Default dac Command line: defaultdac, API: getDefaultDac/ setDefaultDac change default value of a dac [Jungfrau][Mythen3] Also change default value of dac for particular setting. - 3. Reset dacs + 12. Reset dacs Command line: resetdacs, API: resetToDefaultDacs Previous command: defaultdacs Resets dacs to their default values or hard coded values. - + 13. [Mythen3] Gain Capacitance + Command line: gaincaps, API: getGainCaps/ setGainCaps + Set various gain capacitances. + 14. [Gotthard2] Veto Streaming from chip + Command line: veto, API: getVeto/ setVeto + This command used to mean veto streaming from detector. Now, it means + veto streaming from chip (New feature). Default is disabled. + 15. [Gotthard2] Veto streaming from detector + Command line: vetostream, API: getVetoStream, setVetoStream + Options: None, local link interface, 10 10GbE, Both + Default: None - Client - ------ - 1. Setting Mythen3 gain from command line - - - 2. (Gotthard2) veto streaming - New command to enable/ disable veto streaming via 2.5GbE or/ and 10GbE - (debugging). - Command: vetostream, Detector::setVetoStream + 16. [Gotthard2] Veto algorithm + Command line: vetoalg, API: getVetoAlgorithm/ setVetoAlgorithm + Set veto algorithm for each interface. + Options: hits, raw + 17. [Eiger][Gotthard2][Mythen3] Module ID + Command line: moduleid, API: getModuleId + Previous command (Eiger only): serialnumber, getSerialNumber + Unique id read from txt file on detector and streamed out in udp header. + + 18. [Gotthard2] + Command line: dbitpipeline, API: getDBITPipeline/ setDBITPipeline + Set pipeline to latch digital bits. Options: 0-7 - 2. (Gotthard2) veto algorithm - New command to set veto algorithm for 2.5GbE or 10GbE (debugging). - Command: vetoalg, Detector::setVetoAlgorithm - Gotthard2 server + Detector servers ---------------- - 1. Bad Channels moved to a new register + 1. [Gotthard2] Bad Channels moved to a new register + + 2. [Gotthard2] Updated config file in detector server - Jungfrau- many Features + Virtual servers + ---------------- + + 1. Artifical pixel values increasing by every packet, instead of every pixel. + + - 2. Resolved Issues ================== - Jungfrau - -------- - - 1. - - Gotthard2 Server + Detector Servers ---------------- - 1. Tolerance in time parameters. + 1. [Gotthard2] Tolerance in time parameters. Eg. 220 ns was being set to 215 ns, instead of 222ns. - - - Jungfrau Server - ---------------- - - 1. Stopping in trigger mode and then switching to auto timing mode + 1. [Jungfrau] Stopping in trigger mode and then switching to auto timing mode blocks data streaming from detector. Workaround fix made in - detector server to reset core until firmware release. + detector server to reset core until next firmware release. -getAutoCompDisable->getAutoComparatorDisable -filter->filterResistor -setBottom->setFlipRows -currentsource expects currentsrcparameters structure instread of bool - -g2: -updated config file indetector server -vetoalg -vetostream -serialnumber (put) -dbitpipeline -readnlines->readnrows -serialnumber->moduleid setting number of udp interfaces from 1 to 2, didnt get image in gui -virtual server plots increasing values for every packet.. not every pixel + 3. Firmware Requirements ======================== @@ -222,6 +212,7 @@ virtual server plots increasing values for every packet.. not every pixel + 5. Known Issues =============== diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 888d7df0e..12449391e 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -2454,7 +2454,7 @@ class Detector(CppDetectorApi): Note ---- Options: - (vetoAlgorithm): ALG_HITS, ALG_RAW + (vetoAlgorithm): ALG_HITS (default), ALG_RAW (streamingInterface): ETHERNET_10GB, LOW_LATENCY_LINK Example ---------- diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index 7f4082370..01dd0dcb4 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -1363,7 +1363,7 @@ class Detector { getVetoAlgorithm(const defs::streamingInterface value, Positions pos = {}) const; - /** [Gotthard2] Options(vetoAlgorithm): ALG_HITS, ALG_RAW. + /** [Gotthard2] Options(vetoAlgorithm): ALG_HITS (default), ALG_RAW. * Options(streamingInterface): LOW_LATENCY_LINK, ETHERNET_10GB */ void setVetoAlgorithm(const defs::vetoAlgorithm alg, const defs::streamingInterface value, diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 833a4008f..5f4842a9a 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -2136,7 +2136,7 @@ std::string CmdProxy::VetoAlgorithm(int action) { os << cmd << ' '; if (action == defs::HELP_ACTION) { os << "[hits|raw] [lll|10gbe]\n\t[Gotthard2] Set the veto " - "algorithm." + "algorithm. Default is hits." << '\n'; } else if (action == defs::GET_ACTION) { if (args.size() != 1) { From edf72f06c2dbffdadaac5d1e06199fda1a00d6a1 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 29 Sep 2021 17:19:01 +0200 Subject: [PATCH 5/6] release notes --- RELEASE.txt | 81 +++++++++++++++++++++++-- slsReceiverSoftware/src/receiver_defs.h | 4 +- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index f27091e52..6f8030488 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -73,7 +73,6 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. [Eiger] same as before [Jungfrau] Options: 8 - 512, multiples of 8. Default is 512. - 10. [Gotthard2][Jungfrau] Current source Command line: currentsource, API: getCurrentSource, setCurrentSource Enable or disable current source. Default is disabled. @@ -106,6 +105,7 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. Command line: vetostream, API: getVetoStream, setVetoStream Options: None, local link interface, 10 10GbE, Both Default: None + 10GbE (as before) will enable 2 udp interfaces in receiver. 16. [Gotthard2] Veto algorithm Command line: vetoalg, API: getVetoAlgorithm/ setVetoAlgorithm @@ -121,11 +121,50 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. Command line: dbitpipeline, API: getDBITPipeline/ setDBITPipeline Set pipeline to latch digital bits. Options: 0-7 + 19. [Eiger][Jungfrau] Round Robin commands + Command line, udp_dstlist, API: getDestinationUDPList/ + setDestinationUDPList + Round robin commands at the moment does not configure the receiver. + Set multiple udp destinations in the detector to stream udp data packets + to. Upto 32 destinations. Refer documentation for details. + + Command line, udp_numdst, API: getNumberofUDPDestinations + + [Jungfrau] Command line, udp_firstdst, API: getFirstUDPDestination/ + setFirstUDPDestination + + 20. Command Line Parsing + Parsing of detector index and module index has been modified to + integrate round robin index. + [detector index]-[module index]:[round robin index] [command] + + It is backwards compatible. + For ease, one can also execute + sls_detector_put [module index] [command] + + 21. Clear Udp Destination + Command line, udp_cleardst, API: clearUDPDestinations + This is useful when changing receivers for a detector or for round robin + system. + + 22. Shared Memory Naming + Shared memory name has been changed to reflect a more appropriate naming + scheme. + + 23. [Eiger][Mythen3] Blocking trigger + Command line: blockingtrigger, API: sendSoftwareTrigger + Sends software trigger signal to detector and blocks till frames are + sent out for that trigger. + + 24. [Eiger] Data stream enable for ports + Command line: datastream, API: getDataStream/ setDataStream + Enable or disable each port. Default: enabled Detector servers ---------------- - 1. [Gotthard2] Bad Channels moved to a new register + 1. [Gotthard2] Bad Channels moved to a new register, default settings + including clock frequency changed 2. [Gotthard2] Updated config file in detector server @@ -135,8 +174,22 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 1. Artifical pixel values increasing by every packet, instead of every pixel. + 2. All possible features updated. + Receiver + -------- + + 1. Frames caught in metadata + Frames caught by the master receiver is added to master file metadata. + Hdf5 and Binary version numbers changed to 6.3 + + + Gui + ---- + + 1. [Mythen3] counters added in settings tab + 2. Resolved Issues ================== @@ -147,13 +200,33 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 1. [Gotthard2] Tolerance in time parameters. Eg. 220 ns was being set to 215 ns, instead of 222ns. - 1. [Jungfrau] Stopping in trigger mode and then switching to auto timing mode + 2. [Jungfrau] Stopping in trigger mode and then switching to auto timing mode blocks data streaming from detector. Workaround fix made in detector server to reset core until next firmware release. + 3. [Jungfrau][CTB][Moench][Gotthard][Gotthard2][Mythen3] Firmware Programming + Firmware programming incorporates more validations such as checksum of + program. Always ensure client and server are of same release before + programming firmware. + 4. [Eiger] Stop sends last frame + Stop acquisition will now also send out all complete frames in fifo. + + 5. [Eiger] Bottom not rotated in quad mode. Fixed. + + 6. [Mythen3] counter mask effect on vthreshold + Setting counter mask changes vth daac values (ie. disabling sets to 2800), + vthreshold only changes for enabled counters, setting vth overwrites + dac even if counter disabled and when counters enabled, remembers set + values. + + 7. [Eiger] fast quad fix for loading trimbits + + Receiver + -------- + + 1. Disabled port or deactivated (half) modules will not create files. -setting number of udp interfaces from 1 to 2, didnt get image in gui diff --git a/slsReceiverSoftware/src/receiver_defs.h b/slsReceiverSoftware/src/receiver_defs.h index f70ac5025..13e78f232 100755 --- a/slsReceiverSoftware/src/receiver_defs.h +++ b/slsReceiverSoftware/src/receiver_defs.h @@ -15,8 +15,8 @@ // files // versions -#define HDF5_WRITER_VERSION (6.2) // 1 decimal places -#define BINARY_WRITER_VERSION (6.2) // 1 decimal places +#define HDF5_WRITER_VERSION (6.3) // 1 decimal places +#define BINARY_WRITER_VERSION (6.3) // 1 decimal places #define MAX_FRAMES_PER_FILE 20000 #define SHORT_MAX_FRAMES_PER_FILE 100000 From 1cbfa54b993a4414e57dae818f14a7bf80562921 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 29 Sep 2021 17:23:51 +0200 Subject: [PATCH 6/6] release notes --- RELEASE.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE.txt b/RELEASE.txt index 6f8030488..672a4700e 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -228,6 +228,8 @@ This document describes the differences between 6.0.0 and 5.2.0 releases. 1. Disabled port or deactivated (half) modules will not create files. +- better control of what is built (PR)? +- cmake package has hardcoded path to zeromq library 3. Firmware Requirements