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

got ridf of warnings for eiger server

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-02-25 10:34:18 +01:00
parent 2c2d2171d2
commit 875ee02038
11 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/eigerDetectorServer/Beb.c
View File

@ -12,7 +12,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <string.h>
#include <unistd.h>
#include "xfs_types.h"
#include "xparameters.h"
@ -168,7 +169,7 @@ void Beb_GetModuleCopnfiguration(int* master, int* top){
void Beb_ClearBebInfos(){
unsigned int i;
//unsigned int i;
//for(i=0;i<bebInfoSize;i++) free(beb_infos[i]);
bebInfoSize=0;
}

2
slsDetectorSoftware/eigerDetectorServer/Beb.h
View File

@ -47,7 +47,7 @@ struct BebInfo{
unsigned int Beb_GetBebInfoIndex(unsigned int beb_numb);
void Beb_GetModuleCopnfiguration(int* master, int* top);

7
slsDetectorSoftware/eigerDetectorServer/Feb.c
View File

@ -10,7 +10,8 @@
#include <iomanip>*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "xparameters.h"
@ -18,7 +19,7 @@
Feb_Feb(){
void Feb_Feb(){
Feb_nfebs = 0;
Feb_feb_numb = 0;
@ -60,7 +61,7 @@ int Feb_WriteTo(unsigned int ch){
if(Local_Write(ll,4,Feb_send_data_raw)!=4) return 0;
Feb_send_data_raw[0] = 0xc0000000; //data
return 1;((Feb_send_ndata+1)*4==Local_Write(ll,(Feb_send_ndata+1)*4,Feb_send_data_raw));
return 1;//((Feb_send_ndata+1)*4==Local_Write(ll,(Feb_send_ndata+1)*4,Feb_send_data_raw));
}
int Feb_ReadFrom(unsigned int ch, unsigned int ntrys){

2
slsDetectorSoftware/eigerDetectorServer/Feb.h
View File

@ -40,7 +40,7 @@
void Feb_PrintData();
Feb_Feb();
void Feb_Feb();
/*virtual ~Feb();*/
void Feb_SendCompleteFebList(unsigned int n,unsigned int* list);
int Feb_CheckCommunication();

6
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -11,7 +11,7 @@
#include <unistd.h>
#include <math.h>
#include <string.h>
#include <time.h>
//#include <fstream>
//#include <iomanip>
@ -262,7 +262,7 @@ int Feb_Control_ReadSetUpFileToAddModules(char* file_name){
char line[100];
char str[100];
int i0,i1,i2;
int memaddress = 1;
// int memaddress = 1;
FILE* fp = fopen(file_name, "r");
if( fp == NULL ){
perror("Error while opening the file.\n");
@ -748,7 +748,7 @@ int Feb_Control_SendHighVoltage(unsigned int dst_num,float* value){
int Feb_Control_DecodeDACString(char* dac_str, unsigned int* module_index, int* top, int* bottom, unsigned int* dac_ch){
char* local_s = dac_str;
char temp[50];
//char temp[50];
*module_index = Feb_Control_current_index;
/*

1
slsDetectorSoftware/eigerDetectorServer/FebInterface.c
View File

@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "xparameters.h"

2
slsDetectorSoftware/eigerDetectorServer/FebInterface.h
View File

@ -19,7 +19,7 @@
/*int Feb_Interface_ReadFrom(unsigned int ch, unsigned int ntrys=20);*/
int Feb_Interface_ReadFrom(unsigned int ch, unsigned int ntrys);
void Feb_Interface_FebInterface();
void Feb_Interface_SendCompleteList(unsigned int n,unsigned int* list);

4
slsDetectorSoftware/eigerDetectorServer/LocalLinkInterface.c
View File

@ -16,7 +16,7 @@
Local_LocalLinkInterface1(struct LocalLinkInterface* ll,unsigned int ll_fifo_badr){
void Local_LocalLinkInterface1(struct LocalLinkInterface* ll,unsigned int ll_fifo_badr){
// printf("\n v 1 \n");
printf("Initialize PLB LL FIFOs\n");
ll->ll_fifo_base=0;
@ -30,7 +30,7 @@ Local_LocalLinkInterface1(struct LocalLinkInterface* ll,unsigned int ll_fifo_bad
/*~LocalLinkInterface(){};*/
Local_LocalLinkInterface(struct LocalLinkInterface* ll){
void Local_LocalLinkInterface(struct LocalLinkInterface* ll){
printf("Initializing new memory\n");
}

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

7
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -400,7 +400,6 @@ int setModule(sls_detector_module myMod){
setSettings( (enum detectorSettings)myMod.reg,-1); // put the settings in the module register?!?!?
//includ gap pixels
int offset = 0;
unsigned int tt[263680];
int iy,ichip,ix,ip=0,ich=0;
for(iy=0;iy<256;iy++) {
@ -437,7 +436,6 @@ int getModule(sls_detector_module *myMod){
tt = Feb_Control_GetTrimbits();
//exclude gap pixels
int offset = 0;
int iy,ichip,ix,ip=0,ich=0;
for(iy=0;iy<256;iy++) {
for (ichip=0; ichip<4; ichip++) {
@ -494,7 +492,7 @@ int startReceiver(int d){
int startStateMachine(){
int ret;int i=0;
int ret;
if(master){
printf("Going to start acquisition\n");
Feb_Control_StartAcquisition();
@ -511,6 +509,7 @@ int startStateMachine(){
if(master){
/*
* int i=0;
if(getRunStatus() == IDLE){
for(i=0;i<100000;i++){
usleep(1000);
@ -776,7 +775,7 @@ int configureMAC(int ipad, long long int macad, long long int detectormacadd, in
printf("dst_port:%d\n\n",dst_port);
int i=0;
/* for(i=0;i<32;i++){/** modified for Aldo*/
/* for(i=0;i<32;i++){ modified for Aldo*/
if(Beb_SetBebSrcHeaderInfos(beb_num,send_to_ten_gig,src_mac,src_ip,src_port) &&
Beb_SetUpUDPHeader(beb_num,send_to_ten_gig,header_number+i,dst_mac,dst_ip, dst_port))
printf("set up left ok\n");

5
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -85,12 +85,9 @@ int setDynamicRange(int dr);
int setROI(int n, ROI arg[], int *retvalsize, int *ret);
#ifdef MYTHEND
#if defined(EIGERD) || defined(MYTHEND)
enum readOutFlags setReadOutFlags(enum readOutFlags val);
int setSpeed(enum speedVariable arg, int val);
#endif
#if defined(EIGERD) || defined(MYTHEND)
int executeTrimming(enum trimMode mode, int par1, int par2, int imod);
#endif