detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Some fixes for the CTB

Browse Source
This commit is contained in:
bergamaschi
2014-10-14 17:43:25 +02:00
parent 74ef04e726
commit 327c2106df
9 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4839,7 +4839,7 @@ int multiSlsDetector::enableTenGigabitEthernet(int i){
@param fname pattern file to open
@returns OK/FAIL
*/
int setCTBPattern(string fname) {
int multiSlsDetector::setCTBPattern(string fname) {
@ -4853,7 +4853,7 @@ int setCTBPattern(string fname) {
@param word 64bit word to be written, -1 gets
@returns actual value
*/
uint64_t setCTBWord(int addr,uint64_t word) {
uint64_t multiSlsDetector::setCTBWord(int addr,uint64_t word) {
uint64_t ret=-100,ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
if (detectors[idet]){
@ -4878,7 +4878,7 @@ uint64_t setCTBWord(int addr,uint64_t word) {
@param n number of loops (if level >=0)
@returns OK/FAIL
*/
int setCTBPatLoops(int level,int &start, int &stop, int &n) {
int multiSlsDetector::setCTBPatLoops(int level,int &start, int &stop, int &n) {
int ret=-100,ret1;
@ -4903,7 +4903,7 @@ int setCTBPatLoops(int level,int &start, int &stop, int &n) {
@param addr wait address, -1 gets
@returns actual value
*/
int setCTBPatWaitAddr(int level, int addr) {
int multiSlsDetector::setCTBPatWaitAddr(int level, int addr) {
@ -4929,7 +4929,7 @@ int setCTBPatWaitAddr(int level, int addr) {
@param t wait time, -1 gets
@returns actual value
*/
int setCTBPatWaitTime(int level, uint64_t t=-1) {
int multiSlsDetector::setCTBPatWaitTime(int level, uint64_t t) {

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1254,7 +1254,7 @@ class multiSlsDetector : public slsDetectorUtils {
@param word 64bit word to be written, -1 gets
@returns actual value
*/
int setCTBWord(int addr,uint64_t word=-1);
uint64_t setCTBWord(int addr,uint64_t word=-1);
/** Sets the pattern or loop limits in the CTB
@param level -1 complete pattern, 0,1,2, loop level