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

eiger and jungfrau server compiles, gotthard and receiver left to do

Browse Source
This commit is contained in:
maliakal_d
2018-10-08 14:38:35 +02:00
parent b9f97f42a6
commit 923a7e8936
86 changed files with 289 additions and 11934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile
View File

@ -1,6 +1,6 @@
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -DJUNGFRAUD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -DJUNGFRAUD -DSLS_DETECTOR_FUNCTION_LIST -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++
PROGS = jungfrauDetectorServer

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual
View File

@ -1,5 +1,5 @@
CC = gcc
CFLAGS += -Wall -DJUNGFRAUD -DVIRTUAL -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -DJUNGFRAUD -DVIRTUAL -DSLS_DETECTOR_FUNCTION_LIST -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++ -pthread
PROGS = jungfrauDetectorServer_virtual

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h
View File

@ -1 +1 @@
../../slsReceiverSoftware/include/ansi.h
../../../slsSupportLib/include/ansi.h

BIN
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor Executable file
View File

Binary file not shown.

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c
View File

@ -1 +1 @@
../commonFiles/communication_funcs.c
../../../slsSupportLib/include/communication_funcs.c

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h
View File

@ -1 +1 @@
../commonFiles/communication_funcs.h
../../../slsSupportLib/include/communication_funcs.h

14
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c52025dd7c4b44b93e64353a22997d971996ab18
Revision: 163
Branch: developer
Last Changed Author: Gemma_Tinti
Last Changed Rev: 3999
Last Changed Date: 2018-09-28 14:11:53.000000002 +0200 ./RegisterDefs.h
Repsitory UUID: b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1
Revision: 1
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4067
Last Changed Date: 2018-10-08 13:53:39.000000002 +0200 ./Makefile.virtual

10
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c52025dd7c4b44b93e64353a22997d971996ab18"
#define GITAUTH "Gemma_Tinti"
#define GITREV 0x3999
#define GITDATE 0x20180928
#define GITBRANCH "developer"
#define GITREPUUID "b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4067
#define GITDATE 0x20181008
#define GITBRANCH "refactor"

66
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -14,8 +14,8 @@
/* global variables */
//jungfrau doesnt require chips and chans (save memory)
sls_detector_module *detectorModules=NULL;
dacs_t *detectorDacs=NULL;
dacs_t *detectorAdcs=NULL;
int *detectorDacs=NULL;
int *detectorAdcs=NULL;
enum detectorSettings thisSettings;
enum masterFlags masterMode = NO_MASTER;
@ -234,9 +234,6 @@ int testBus() {
}
int moduleTest( enum digitalTestMode arg, int imod){
return OK;
}
int detectorTest( enum digitalTestMode arg){
#ifdef VIRTUAL
@ -402,8 +399,8 @@ void allocateDetectorStructureMemory(){
if (detectorDacs!=NULL) free(detectorDacs);
if (detectorAdcs!=NULL) free(detectorAdcs);
detectorModules=malloc(sizeof(sls_detector_module));
detectorDacs=malloc(NDAC*sizeof(dacs_t));
detectorAdcs=malloc(NADC*sizeof(dacs_t));
detectorDacs=malloc(NDAC*sizeof(int));
detectorAdcs=malloc(NADC*sizeof(int));
#ifdef VERBOSE
printf("modules from 0x%x to 0x%x\n",detectorModules, detectorModules+n);
printf("dacs from 0x%x to 0x%x\n",detectorDacs, detectorDacs+n*NDAC);
@ -415,7 +412,6 @@ void allocateDetectorStructureMemory(){
(detectorModules)->nadc=NADC;
(detectorModules)->nchip=NCHIP;
(detectorModules)->nchan=NCHIP*NCHAN;
(detectorModules)->module=0;
(detectorModules)->gain=0;
(detectorModules)->offset=0;
(detectorModules)->reg=0;
@ -460,7 +456,7 @@ void setupDetector() {
bus_w(ADC_PORT_INVERT_REG, ADC_PORT_INVERT_VAL);
//Initialization of acquistion parameters
setSettings(DEFAULT_SETTINGS,-1);
setSettings(DEFAULT_SETTINGS);
setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES);
setTimer(CYCLES_NUMBER, DEFAULT_NUM_CYCLES);
@ -493,7 +489,7 @@ int setDefaultDacs() {
for(i = 0; i < NDAC; ++i) {
// if not already default, set it to default
if (dacValues[i] != defaultvals[i]) {
setDAC((enum DACINDEX)i,defaultvals[i],0,0,retval);
setDAC((enum DACINDEX)i,defaultvals[i],0,retval);
if (retval[0] != defaultvals[i]) {
cprintf(RED, "Warning: Setting dac %d failed, wrote %d, read %d\n",i ,defaultvals[i], retval[0]);
ret = FAIL;
@ -602,16 +598,8 @@ void configureASICTimer() {
/* set parameters - nmod, dr, roi */
/* set parameters - dr, roi */
int setNMod(int nm, enum dimension dim){
return NMOD;
}
int getNModBoard(enum dimension arg){
return NMAXMOD;
}
int setDynamicRange(int dr){
@ -861,7 +849,7 @@ int setModule(sls_detector_module myMod){
printf("Setting module with settings %d\n",myMod.reg);
//#endif
setSettings( (enum detectorSettings)myMod.reg,-1);
setSettings( (enum detectorSettings)myMod.reg);
//copy module locally
if (detectorModules)
@ -869,7 +857,7 @@ int setModule(sls_detector_module myMod){
//set dac values
for(i=0;i<myMod.ndac;i++)
setDAC((enum DACINDEX)i,myMod.dacs[i],myMod.module,0,retval);
setDAC((enum DACINDEX)i,myMod.dacs[i],0,retval);
return thisSettings;
}
@ -881,7 +869,7 @@ int getModule(sls_detector_module *myMod){
//dacs
for(i=0;i<NDAC;i++)
setDAC((enum DACINDEX)i,-1,-1,0,retval);
setDAC((enum DACINDEX)i,-1,0,retval);
//copy from local copy
if (detectorModules)
@ -893,7 +881,7 @@ int getModule(sls_detector_module *myMod){
enum detectorSettings setSettings(enum detectorSettings sett, int imod){
enum detectorSettings setSettings(enum detectorSettings sett){
if(sett == UNINITIALIZED)
return thisSettings;
@ -1047,7 +1035,7 @@ int dacToVoltage(unsigned int digital){
void setDAC(enum DACINDEX ind, int val, int imod, int mV, int retval[]){
void setDAC(enum DACINDEX ind, int val, int mV, int retval[]){
int dacval = val;
//if set and mv, convert to dac
@ -1099,7 +1087,7 @@ void setDAC(enum DACINDEX ind, int val, int imod, int mV, int retval[]){
}
int getADC(enum ADCINDEX ind, int imod){
int getADC(enum ADCINDEX ind){
#ifdef VIRTUAL
return 0;
#endif
@ -1668,12 +1656,6 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod){
printf("Copying module %x to module %x\n",srcMod,destMod);
#endif
if (srcMod->module>=0) {
#ifdef VERBOSE
printf("Copying module number %d to module number %d\n",srcMod->module,destMod->module);
#endif
destMod->module=srcMod->module;
}
if (srcMod->serialnumber>=0){
destMod->serialnumber=srcMod->serialnumber;
@ -1732,28 +1714,14 @@ int calculateDataBytes(){
return DATA_BYTES;
}
int getTotalNumberOfChannels(){return ((int)getNumberOfChannelsPerModule() * (int)getTotalNumberOfModules());}
int getTotalNumberOfChips(){return ((int)getNumberOfChipsPerModule() * (int)getTotalNumberOfModules());}
int getTotalNumberOfModules(){return NMOD;}
int getNumberOfChannelsPerModule(){return ((int)getNumberOfChannelsPerChip() * (int)getTotalNumberOfChips());}
int getNumberOfChipsPerModule(){return NCHIP;}
int getNumberOfDACsPerModule(){return NDAC;}
int getNumberOfADCsPerModule(){return NADC;}
int getTotalNumberOfChannels(){return ((int)getNumberOfChannelsPerChip() * (int)getNumberOfChips());}
int getNumberOfChips(){return NCHIP;}
int getNumberOfDACs(){return NDAC;}
int getNumberOfADCs(){return NADC;}
int getNumberOfChannelsPerChip(){return NCHAN;}
/* sync */
enum masterFlags setMaster(enum masterFlags arg){
return NO_MASTER;
}
enum synchronizationMode setSynchronization(enum synchronizationMode arg){
return NO_SYNCHRONIZATION;
}

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -46,8 +46,6 @@ enum NETWORKINDEX { TXN_FRAME };
/* Hardware Definitions */
#define NMAXMOD (1)
#define NMOD (1)
#define NCHAN (256 * 256)
#define NCHIP (8)
#define NADC (0)

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h
View File

@ -1 +1 @@
../commonFiles/sls_detector_defs.h
../../../slsSupportLib/include/sls_detector_defs.h

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h
View File

@ -1 +1 @@
../commonFiles/sls_detector_funcs.h
../../../slsSupportLib/include/sls_detector_funcs.h

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h
View File

@ -1 +1 @@
../../slsReceiverSoftware/include/sls_receiver_defs.h
../../../slsSupportLib/include/sls_receiver_defs.h

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h
View File

@ -1 +1 @@
../../slsReceiverSoftware/include/sls_receiver_funcs.h
../../../slsSupportLib/include/sls_receiver_funcs.h

8
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh
View File

@ -1,12 +1,12 @@
SERVER=jungfrauDetectorServer
MAINDIR=slsDetectorsPackage
SPECDIR=slsDetectorSoftware/$SERVER
MAINDIR=slsDetectorPackage
SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER
TMPFILE=gitInfoJungfrauTmp.h
INCLFILE=gitInfoJungfrau.h
#evaluate the variables
EVALFILE=../../evalVersionVariables.sh
EVALFILE=../../../evalVersionVariables.sh
source $EVALFILE
@ -25,7 +25,7 @@ OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
#update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd ../../
cd ../../../
./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
cd $WD
fi

2
slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h
View File

@ -1 +1 @@
../commonFiles/versionAPI.h
../../../slsSupportLib/include/versionAPI.h