diff --git a/developer/.doctrees/commandline.doctree b/developer/.doctrees/commandline.doctree index 6c4e747f2..a231e52e6 100644 Binary files a/developer/.doctrees/commandline.doctree and b/developer/.doctrees/commandline.doctree differ diff --git a/developer/.doctrees/detector.doctree b/developer/.doctrees/detector.doctree index 831694813..0e059c9c3 100644 Binary files a/developer/.doctrees/detector.doctree and b/developer/.doctrees/detector.doctree differ diff --git a/developer/.doctrees/environment.pickle b/developer/.doctrees/environment.pickle index 3d1ad97cf..29d90b9d7 100644 Binary files a/developer/.doctrees/environment.pickle and b/developer/.doctrees/environment.pickle differ diff --git a/developer/.doctrees/pyctb.doctree b/developer/.doctrees/pyctb.doctree index 26d38a293..104085b6f 100644 Binary files a/developer/.doctrees/pyctb.doctree and b/developer/.doctrees/pyctb.doctree differ diff --git a/developer/.doctrees/pydetector.doctree b/developer/.doctrees/pydetector.doctree index 7bdedcd23..6ad6bf575 100644 Binary files a/developer/.doctrees/pydetector.doctree and b/developer/.doctrees/pydetector.doctree differ diff --git a/developer/commandline.html b/developer/commandline.html index 176a58ef6..315b8f0fa 100644 --- a/developer/commandline.html +++ b/developer/commandline.html @@ -464,10 +464,6 @@
Gets the values for every dac for this detector.
-
datastream [left|right] [0, 1]
-
[Eiger] Enables or disables data streaming from left or/and right side of detector for 10 GbE mode. 1 (enabled) by default.
-
-
dbitclk [n_clk] [(optional unit) Hz(default)|kHz|MHz]
[Ctb][Xilinx Ctb] Clock for latching the digital bits.
@@ -1674,6 +1670,11 @@
Clears udp destination details on the detector.
+
udp_datastream [left|right|top|bottom] [0, 1]
+
Enables or disables UDP data streaming from left or right of 10GbE UDP port of the detector. Options: left, right. Both ports are enabled (1) by default.
+
Enables or disables UDP data streaming from the top or bottom of receiver. This option is available only when numinterfaces is set to 2. Options: top, bottom. Both interfaces are enabled (1) by default.
+
+
udp_dstip [x.x.x.x] or auto
Ip address of the receiver (destination) udp interface. If ‘auto’ used, then ip is set to ip of rx_hostname.
@@ -1936,391 +1937,394 @@

cyclesl

triggersl

-

defaultdacs

+

datastream

+

udp_datastream

+ +

defaultdacs

resetdacs

-

detectorip

+

detectorip

udp_srcip

-

detectorip2

+

detectorip2

udp_srcip2

-

detectormac

+

detectormac

udp_srcmac

-

detectormac2

+

detectormac2

udp_srcmac2

-

detectornumber

+

detectornumber

serialnumber

-

detectorversion

+

detectorversion

firmwareversion

-

detsizechan

+

detsizechan

detsize

-

digitest

+

digitest

imagetest

-

enablefwrite

+

enablefwrite

fwrite

-

fileformat

+

fileformat

fformat

-

filter

+

filter

filterresistor

-

flags

+

flags

romode

-

flippeddatax

+

flippeddatax

fliprows

-

flowcontrol_10g

+

flowcontrol_10g

flowcontrol10g

-

frameindex

+

frameindex

rx_frameindex

-

framescaught

+

framescaught

rx_framescaught

-

i_a

+

i_a

im_a

-

i_b

+

i_b

im_b

-

i_c

+

i_c

im_c

-

i_d

+

i_d

im_d

-

i_io

+

i_io

im_io

-

ibias_sfp

+

ibias_sfp

dac

-

index

+

index

findex

-

iodelay

+

iodelay

dac

-

masterfile

+

masterfile

fmaster

-

nframes

+

nframes

framecounter

-

now

+

now

runtime

-

outdir

+

outdir

fpath

-

overwrite

+

overwrite

foverwrite

-

patternX

+

patternX

pattern

-

r_discardpolicy

+

r_discardpolicy

rx_discardpolicy

-

r_framesperfile

+

r_framesperfile

rx_framesperfile

-

r_lastclient

+

r_lastclient

rx_lastclient

-

r_lock

+

r_lock

rx_lock

-

r_padding

+

r_padding

rx_padding

-

r_readfreq

+

r_readfreq

rx_zmqfreq

-

r_silent

+

r_silent

rx_silent

-

readnlines

+

readnlines

readnrows

-

receiver

+

receiver

rx_status

-

receiverversion

+

receiverversion

rx_version

-

resmat

+

resmat

partialreset

-

rx_datastream

+

rx_datastream

rx_zmqstream

-

rx_readfreq

+

rx_readfreq

rx_zmqfreq

-

rx_udpip

+

rx_udpip

udp_dstip

-

rx_udpip2

+

rx_udpip2

udp_dstip2

-

rx_udpmac

+

rx_udpmac

udp_dstmac

-

rx_udpmac2

+

rx_udpmac2

udp_dstmac2

-

rx_udpport

+

rx_udpport

udp_dstport

-

rx_udpport2

+

rx_udpport2

udp_dstport2

-

rxb_lb

+

rxb_lb

dac

-

rxb_rb

+

rxb_rb

dac

-

settingsdir

+

settingsdir

settingspath

-

softwareversion

+

softwareversion

detectorserverversion

-

speed

+

speed

readoutspeed

-

startingfnum

+

startingfnum

nextframenumber

-

storagecells

+

storagecells

extrastoragecells

-

thisversion

+

thisversion

clientversion

-

timestamp

+

timestamp

frametime

-

trimdir

+

trimdir

settingspath

-

txndelay_frame

+

txndelay_frame

txdelay_frame

-

txndelay_left

+

txndelay_left

txdelay_left

-

txndelay_right

+

txndelay_right

txdelay_right

-

vb_comp

+

vb_comp

dac

-

vb_comp_adc

+

vb_comp_adc

dac

-

vb_comp_fe

+

vb_comp_fe

dac

-

vb_cs

+

vb_cs

dac

-

vb_ds

+

vb_ds

dac

-

vb_opa_1st

+

vb_opa_1st

dac

-

vb_opa_fd

+

vb_opa_fd

dac

-

vb_pixbuf

+

vb_pixbuf

dac

-

vb_sda

+

vb_sda

dac

-

vbp_colbuf

+

vbp_colbuf

dac

-

vcal

+

vcal

dac

-

vcal_n

+

vcal_n

dac

-

vcal_p

+

vcal_p

dac

-

vcall

+

vcall

vcal

-

vcas

+

vcas

dac

-

vcasc_sfp

+

vcasc_sfp

dac

-

vcassh

+

vcassh

dac

-

vcmp_ll

+

vcmp_ll

dac

-

vcmp_lr

+

vcmp_lr

dac

-

vcmp_rl

+

vcmp_rl

dac

-

vcmp_rr

+

vcmp_rr

dac

-

vcn

+

vcn

dac

-

vcom_adc1

+

vcom_adc1

dac

-

vcom_adc2

+

vcom_adc2

dac

-

vcom_cds

+

vcom_cds

dac

-

vcp

+

vcp

dac

-

vdcsh

+

vdcsh

dac

-

vdd_prot

+

vdd_prot

dac

-

vhighvoltage

+

vhighvoltage

highvoltage

-

vicin

+

vicin

dac

-

viinsh

+

viinsh

vishaper

-

vin_cm

+

vin_cm

dac

-

vin_com

+

vin_com

dac

-

vipre

+

vipre

dac

-

vipre_cds

+

vipre_cds

dac

-

vipre_out

+

vipre_out

dac

-

vis

+

vis

vishaper

-

vishaper

+

vishaper

dac

-

vout_cm

+

vout_cm

dac

-

vph

+

vph

vcal_p

-

vpl

+

vpl

vcal_n

-

vpreamp

+

vpreamp

vrpreamp

-

vref_cds

+

vref_cds

dac

-

vref_comp

+

vref_comp

dac

-

vref_comp_fe

+

vref_comp_fe

dac

-

vref_ds

+

vref_ds

dac

-

vref_h_adc

+

vref_h_adc

dac

-

vref_l_adc

+

vref_l_adc

dac

-

vref_prech

+

vref_prech

dac

-

vref_rstore

+

vref_rstore

dac

-

vrf

+

vrf

vrpreamp

-

vrpreamp

+

vrpreamp

dac

-

vrs

+

vrs

vrshaper

-

vrshaper

+

vrshaper

dac

-

vrshaper_n

+

vrshaper_n

dac

-

vshaper

+

vshaper

vrshaper

-

vshaperneg

+

vshaperneg

vrshaper_n

-

vsvn

+

vsvn

dac

-

vsvp

+

vsvp

dac

-

vtgstv

+

vtgstv

dac

-

vth1

+

vth1

dac

-

vth2

+

vth2

dac

-

vth3

+

vth3

dac

-

vthreshold

+

vthreshold

dac

-

vtr

+

vtr

vtrim

-

vtrim

+

vtrim

dac

diff --git a/developer/detector.html b/developer/detector.html index 961267277..fcc860a61 100644 --- a/developer/detector.html +++ b/developer/detector.html @@ -218,7 +218,7 @@
  • setScan()
  • getScanErrorMessage()
  • getNumberofUDPInterfaces()
    • -
  • setNumberofUDPInterfaces()
    • +
  • setNumberofUDPInterfaces()
  • getSelectedUDPInterface()
  • selectUDPInterface()
  • getSourceUDPIP()
    • @@ -262,6 +262,10 @@
  • setTransmissionDelayRight()
  • getTransmissionDelay()
  • setTransmissionDelay()
    • +
  • getUDPDataStream()
    • +
  • setUDPDataStream()
    • +
  • getRxDisabledUDPPortIndices()
    • +
  • getPortPositionList()
  • getUseReceiverFlag()
  • getRxHostname()
  • setRxHostname()
    • @@ -345,8 +349,6 @@
  • pulseChip()
  • getQuad()
  • setQuad()
    • -
  • getDataStream()
    • -
  • setDataStream()
  • getTop()
  • setTop()
  • getChipVersion()
    • @@ -1718,12 +1720,12 @@ containing results from all modules. ( -
    -void setNumberofUDPInterfaces(int n, Positions pos = {})
    +
    +void setNumberofUDPInterfaces(int n)

    [Jungfrau][Moench][Gotthard2] Number of udp interfaces to stream data from detector. Default is 1.

    Also enables second interface in receiver for listening (Writes a file per interface if writing enabled).

    Also restarts client and receiver zmq sockets if zmq streaming enabled.

    -

    [Gotthard2] second interface enabled to send veto information via 10Gbps for debugging. By default, if veto enabled, it is sent via 2.5 gbps interface. \nSetting this resets the receiver roi

    +

    [Gotthard2] second interface enabled to send veto information via 10Gbps for debugging. By default, if veto enabled, it is sent via 2.5 gbps interface. \nSetting this resets the receiver roi and any udp datastream disables

    @@ -2001,6 +2003,34 @@ containing results from all modules. ( +
    +Result<bool> getUDPDataStream(const defs::portPosition port, Positions pos = {}) const
    +

    [Eiger] Returns whether the 10GbE UDP data stream from detector is enabled. Options: LEFT, RIGHT [Jungfrau][Moench] Returns whether the UDP data stream from receiver is enabled. Options: TOP, BOTTOM

    +
    + +
    +
    +void setUDPDataStream(const defs::portPosition port, const bool enable, Positions pos = {})
    +

    [Eiger] Enables or disables UDP data streaming from left or right of 10GbE UDP port of the detector. Default: enabled. Options: LEFT, RIGHT

    +

    [Jungfrau][Moench] Enables or disables UDP data streaming from the top or bottom of receiver. Default: enabled. Options: TOP, BOTTOM. This option is available only when numinterfaces is set to 2.

    +

    +
    + +
    +
    +std::vector<int> getRxDisabledUDPPortIndices() const
    +

    List

    of disabled UDP ports with index (moduleIndex * 2 + portIndex), where portIndex is 0 for BOTTOM/LEFT port, and 1 for TOP/RIGHT port. It is the index with ‘d’ in the file name when writing data.

    +

    [Eiger] LEFT, RIGHT [Jungfrau][Moench] TOP, BOTTOM This feature is available only when numinterfaces is set to 2.

    +

    +
    + +
    +
    +std::vector<defs::portPosition> getPortPositionList() const
    +

    list of possible port positions. [Eiger] LEFT, RIGHT [Jungfrau][Moench] TOP, BOTTOM

    +
    +

    Receiver Configuration

    @@ -2528,18 +2558,6 @@ containing results from all modules. ( -
    -Result<bool> getDataStream(const defs::portPosition port, Positions pos = {}) const
    -

    [Eiger]

    -
    - -
    -
    -void setDataStream(const defs::portPosition port, const bool enable, Positions pos = {})
    -

    [Eiger] enable or disable data streaming from left or right of detector for 10GbE. Default: enabled

    -
    -
    Result<bool> getTop(Positions pos = {}) const
    diff --git a/developer/genindex.html b/developer/genindex.html index 3e31944df..47671128f 100644 --- a/developer/genindex.html +++ b/developer/genindex.html @@ -562,14 +562,6 @@
  • dacvalues [(optional unit) mV] -
    • -
  • datastream (slsdet.Ctb property) - -
    • -
  • datastream [left|right] [0, 1]
  • dbitclk (slsdet.Ctb property) @@ -615,10 +607,10 @@
  • (slsdet.Detector method)
    • - - + - - +