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

fixed dark/gain image correction

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@122 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-02-20 10:00:59 +00:00
parent 47f18d3cbf
commit 44eea027f3
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/gotthardDetectorServer/Makefile
View File

@ -6,7 +6,7 @@
CROSS = bfin-uclinux- CROSS = bfin-uclinux-
CC = $(CROSS)gcc CC = $(CROSS)gcc
CFLAGS += -Wall -DMCB_FUNCS #-DVERBOSE #-DVERYVERBOSE #-DVIRTUAL CFLAGS += -Wall -DMCB_FUNCS -DVERBOSE -DVERYVERBOSE #-DVIRTUAL
#INCLUDES= /usr/src/kernels/2.6.18-238.12.1.el5-i686/include #INCLUDES= /usr/src/kernels/2.6.18-238.12.1.el5-i686/include
#/home/l_maliakal_d/bfin/blackfin-linux-dist/linux-2.6.x/include #/home/l_maliakal_d/bfin/blackfin-linux-dist/linux-2.6.x/include

8
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -891,8 +891,12 @@ int loadImage(int index, short int ImageVals[]){
address = GAIN_IMAGE_REG; address = GAIN_IMAGE_REG;
break; break;
} }
int *ptr=(u_int16_t*)(CSP0BASE+address*2); volatile u_int16_t *ptr;
dma_memcpy(ptr,ImageVals ,2560); ptr=(u_int16_t*)(CSP0BASE+address*2);
memcpy(ptr,ImageVals ,2560);
#ifdef VERBOSE
printf("Loaded x%08x address with image of index %d\n",ptr,index);
#endif
return 0; return 0;
} }

6
slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
View File

@ -29,7 +29,8 @@ enum dacsVal{VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN_CM, VREF_COM
enum adcVals{TEMP_FPGA, TEMP_ADC}; enum adcVals{TEMP_FPGA, TEMP_ADC};
//dynamic range //dynamic range
#define MAX5523 /*
#define MAX5523 commented out by dhanya
#ifndef MAX5523 #ifndef MAX5523
#define MAX5533 #define MAX5533
#endif #endif
@ -37,8 +38,9 @@ enum adcVals{TEMP_FPGA, TEMP_ADC};
#define DAC_DR 4096 #define DAC_DR 4096
#endif #endif
#ifdef MAX5523 #ifdef MAX5523
*/
#define DAC_DR 1024 #define DAC_DR 1024
#endif //#endif
//reference voltage //reference voltage

10
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -2794,7 +2794,7 @@ int load_image(int file_des) {
sprintf(mess,"Can't load image\n"); sprintf(mess,"Can't load image\n");
n = receiveDataOnly(file_des,index,sizeof(index)); n = receiveDataOnly(file_des,&index,sizeof(index));
if (n < 0) { if (n < 0) {
sprintf(mess,"Error reading from socket\n"); sprintf(mess,"Error reading from socket\n");
ret=FAIL; ret=FAIL;
@ -2814,7 +2814,7 @@ int load_image(int file_des) {
break; break;
case GAIN_IMAGE : case GAIN_IMAGE :
#ifdef VERBOSE #ifdef VERBOSE
printf(" Loading Dark image\n"); printf(" Loading Gain image\n");
#endif #endif
break; break;
default: default:
@ -2822,16 +2822,16 @@ int load_image(int file_des) {
sprintf(mess,"Unknown index %d\n",index); sprintf(mess,"Unknown index %d\n",index);
ret=FAIL; ret=FAIL;
} }
#ifdef VERYVERBOSE
printf("%d\n%d\n",ImageVals[0],ImageVals[1]); printf("%d\n%d\n",ImageVals[0],ImageVals[1]);
#endif
if (ret==OK) { if (ret==OK) {
if (differentClients==1 && lockStatus==1) { if (differentClients==1 && lockStatus==1) {
ret=FAIL; ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP); sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else{ } else{
retval=loadImage(index,ImageVals); retval=loadImage(index,ImageVals);
if (retval= -1) if (retval==-1)
ret = FAIL; ret = FAIL;
} }
} }