detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions 1 Packages Releases Activity

merge error fixed

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-09-08 09:31:26 +02:00
parent 1ba325e902
commit aef462da32
7 changed files with 148 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/jctbDetectorServer/server_funcs.h
View File

@ -23,6 +23,7 @@ int sockfd;
int function_table();
int decode_function(int);
const char* getFunctionName(enum detFuncs func);
int init_detector(int,int);
int M_nofunc(int);
@ -85,10 +86,6 @@ int load_image(int);
int read_counter_block(int);
int reset_counter_block(int);
int start_receiver(int);
int stop_receiver(int);
int calibrate_pedestal(int);
int set_roi(int);