From e2133317f598cb35c9b52b9aa978e424ad2df3a2 Mon Sep 17 00:00:00 2001 From: Gemma Tinti Date: Fri, 12 Feb 2016 14:32:03 +0100 Subject: [PATCH] add missing commands and cleanup --- manual/manual-client/commands.txt | 6 +++++- manual/manual-client/slsDetectorClientHowTo.tex | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manual/manual-client/commands.txt b/manual/manual-client/commands.txt index f771743f9..80406daee 100644 --- a/manual/manual-client/commands.txt +++ b/manual/manual-client/commands.txt @@ -30,7 +30,8 @@ "gainimage"; // sets/gets the gainimage for the Gotthard detector "readctr"; // read counters for the Gotthard detector "resetctr"; //resets counters for the Gotthard detector - /* trim/cal directories */ + "resmat"; //reset or not the counter before the following acquisition (at the end of the acquisoition the counter is always reset) (very advanced! EIGER only) + /* trim/cal directories */ "settingsdir"; //sets/gets the directory where the settings files are "trimdir"; // as settingsdir "caldir"; //sets/gets the directory where the calibration files are @@ -172,3 +173,6 @@ "ib_test_c"; // sets/get ib_test_c value (advanced! Gotthard) "temp_adc"; // get adc temperature (advanced! Gotthard) "temp_fpga"; //get fpga temperature (advanced! Gotthard) + "pulsechip n"; //advanc ed! EIGER: pulses the chip $n$ times with the enable. If n$=-1$, the chip will be set into normal mode. + "pulse n x y"; // Pulses pixel at coordinates (x,y) $n$-times. + "pulsenmove n x y"; //Pulses pixel $n$-times and moves relatively by x value (x axis) and y value (y axis) diff --git a/manual/manual-client/slsDetectorClientHowTo.tex b/manual/manual-client/slsDetectorClientHowTo.tex index 83cc22a98..24d8fee52 100644 --- a/manual/manual-client/slsDetectorClientHowTo.tex +++ b/manual/manual-client/slsDetectorClientHowTo.tex @@ -232,7 +232,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take %\item[checkonline] %\item[readctr i fname] GOTTHARD related - reads counter in detector to file fname, restarts acquisition if i=1 \item[resetctr i] GOTTHARD- ADVANCED- resets counter in detector, restarts acquisition if i=1 -\item[resmat 1] \E - ADVANCED - resets counter in detector before each acquisition. Default settings. \textit{resmat 0} does not reset the counter bit before the acquisition. Note that in \E the counter is always reset after the acquisition. +\item[resmat i] \E - ADVANCED - resets counter in detector before the following acquisition. Default settings is \textit{resmat 1}. \textit{resmat 0} does not reset the counter bit before the acquisition. Note that in \E the counter is always reset after the acquisition. %\item[exptimel] %\item[periodl] %\item[delayl] @@ -248,7 +248,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take \subsubsection{Configuration} Advanced commands to configure the detector system. Should be left to the configuration file \begin{description} -\item[type s] Sets the types of detector controllers in the system. Can be Mythen, Gotthard, Eiger and multiple controllers should be catenated with a + (e.g. Mythen+Mythen for 2 Mythen controllers). +\item[type s] Sets the types of detector controllers in the system. Can be Mythen, Gotthard, \E and multiple controllers should be catenated with a + (e.g. Mythen+Mythen for 2 Mythen controllers). \item[d:hostname s] Sets the hostname or IP address for the controller d, where d is the controller index within the detector structure. \item[d:extsig:i s] Configures the usage of the external IO signals to synchronize the detectors. s can be: off, gate\_in\_active\_high, gate\_in\_active\_low, trigger\_in\_rising\_edge, trigger\_in\_falling\_edge, @@ -375,7 +375,7 @@ Advanced settings changing the analog or digital performance of the acquisition. %\item[temp\_adc n] Sets %\item[temp\_fpga n] \item[reg a d] Write to register of address a the data d -\item[clkdivider n] Sets the clock divider for the readout. Can be increased for longer cables. For EIGER options are 0 (full speed), 1 (half speed), 2 (quarter speed), and 3 (slow). +\item[clkdivider n] Sets the clock divider for the readout. Can be increased for longer cables. For \E options are 0 (full speed), 1 (half speed), 2 (quarter speed), and 3 (slow). \item[setlength n] Changes the length of the set/reset signals in the acquisition. Never reduce it! \item[waitstates n] Sets the wait states for CPU/FPGA communication. Do not change it! \item[totdivider n] Sets the tot clock divider.