solved many bugs, but cannot get data in eiger

This commit is contained in:
Dhanya Maliakal
2017-06-09 16:02:58 +02:00
parent c755a8974c
commit 132a9bbfe9
15 changed files with 545 additions and 351 deletions

View File

@ -143,8 +143,8 @@ void setAdc(int addr, int val);
int voltageToDac(int value);
int dacToVoltage(unsigned int digital);
#endif
void setDAC(enum DAC_INDEX ind, int val, int imod, int mV, int retval[]);
int getADC(enum ADC_INDEX ind, int imod);
void setDAC(enum DACINDEX ind, int val, int imod, int mV, int retval[]);
int getADC(enum ADCINDEX ind, int imod);
#ifndef MYTHEND
int setHighVoltage(int val);
#endif
@ -204,7 +204,7 @@ int setAllTrimbits(int val);
int getAllTrimbits();
int getBebFPGATemp();
int activate(int enable);
int setNetworkParameter(enum NETWORK_PARA_INDEX mode, int value);
int setNetworkParameter(enum NETWORKINDEX mode, int value);
#endif

View File

@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
extern int sockfd;

View File

@ -11,27 +11,21 @@
#include "sls_detector_defs.h"
#include <stdint.h>
#define GOODBYE -200
/* examples*/
#ifdef JUNGFRAU_DHANYA
#define NCHAN (256*256)
#define NCHIP 8
#define NADC 0
#else
#define NCHAN 1
#define NCHIP 1
#define NDAC 1
#define NADC 1
#endif
#define NMAXMODX 1
#define NMAXMODY 1
#define NMAXMOD NMAXMODX*NMAXMODY
#define NCHANS NCHAN*NCHIP*NMAXMOD
#define NDACS NDAC*NMAXMOD
/** This is only an example file!!! */
/*
#define GOODBYE (-200)
enum DAC_INDEX {examplesdac}
Hardware Definitions
#define NMAXMOD (1)
#define NMOD (1)
#define NCHAN (256 * 256)
#define NCHIP (4)
#define NADC (0)
#define NDAC (16)
#define NGAIN (0)
#define NOFFSET (0)
*/
#endif /* SLSDETECTORSERVER_DEFS_H_ */

View File

@ -5,6 +5,7 @@
#include <stdlib.h>
// initialization functions
int printSocketReadError();
void basictests();
void init_detector(int);
int decode_function(int);
@ -39,6 +40,7 @@ int get_chip(int);
int set_all_chips(int);
int set_module(int);
int get_module(int);
int set_all_modules(int);
int set_settings(int);
int get_threshold_energy(int);
int set_threshold_energy(int);
@ -85,6 +87,7 @@ int reset_fpga(int);
int power_chip(int);
int set_activate(int);
int prepare_acquisition(int);
int cleanup_acquisition(int);
#endif