detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 16:45:55 +01:00
Code Issues Actions Packages Releases Activity

removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels

Browse Source
This commit is contained in:
maliakal_d
2018-11-02 17:08:25 +01:00
parent d1c8d0b01c
commit a99584a0da
18 changed files with 113 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
View File

Binary file not shown.

25
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@@ -23,7 +23,6 @@ char firmware_message[MAX_STR_LENGTH];
sls_detector_module *detectorModules = NULL;
int *detectorDacs = NULL;
int *detectorAdcs =NULL;
#ifdef VIRTUAL
pthread_t pthread_virtual_tid;
@@ -394,17 +393,12 @@ void allocateDetectorStructureMemory(){
//Allocation of memory
if (detectorModules != NULL) free(detectorModules);
if (detectorDacs != NULL) free(detectorDacs);
if (detectorAdcs != NULL) free(detectorAdcs);
detectorModules = malloc(sizeof(sls_detector_module));
detectorDacs = malloc(NDAC*sizeof(int));
detectorAdcs = malloc(NADC*sizeof(int));
FILE_LOG(logDEBUG1, ("modules from 0x%x to 0x%x\n",detectorModules, detectorModules));
FILE_LOG(logDEBUG1, ("dacs from 0x%x to 0x%x\n",detectorDacs, detectorDacs));
FILE_LOG(logDEBUG1, ("adcs from 0x%x to 0x%x\n",detectorAdcs, detectorAdcs));
(detectorModules)->dacs = detectorDacs;
(detectorModules)->adcs = detectorAdcs;
(detectorModules)->ndac = NDAC;
(detectorModules)->nadc = NADC;
(detectorModules)->nchip = NCHIP;
(detectorModules)->nchan = NCHIP * NCHAN;
(detectorModules)->reg = 0;
@@ -1629,13 +1623,12 @@ u_int32_t runBusy(void) {
//jungfrau doesnt require chips and chans (save memory)
int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod){
int idac, iadc;
int idac;
int ret=OK;
FILE_LOG(logDEBUG1, ("Copying module\n"));
if (srcMod->serialnumber>=0){
destMod->serialnumber=srcMod->serialnumber;
}
if ((srcMod->nchip)>(destMod->nchip)) {
@@ -1650,19 +1643,10 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod){
FILE_LOG(logERROR, ("Number of dacs of source is larger than number of dacs of destination\n"));
return FAIL;
}
if ((srcMod->nadc)>(destMod->nadc)) {
FILE_LOG(logERROR, ("Number of dacs of source is larger than number of dacs of destination\n"));
return FAIL;
}
FILE_LOG(logDEBUG1, ("DACs: src %d, dest %d\n",srcMod->ndac,destMod->ndac));
FILE_LOG(logDEBUG1, ("ADCs: src %d, dest %d\n",srcMod->nadc,destMod->nadc));
FILE_LOG(logDEBUG1, ("Chips: src %d, dest %d\n",srcMod->nchip,destMod->nchip));
FILE_LOG(logDEBUG1, ("Chans: src %d, dest %d\n",srcMod->nchan,destMod->nchan));
destMod->ndac=srcMod->ndac;
destMod->nadc=srcMod->nadc;
destMod->nchip=srcMod->nchip;
destMod->nchan=srcMod->nchan;
if (srcMod->reg>=0)
destMod->reg=srcMod->reg;
FILE_LOG(logDEBUG1, ("Copying register %x (%x)\n",destMod->reg,srcMod->reg ));
@@ -1671,10 +1655,6 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod){
if (*((srcMod->dacs)+idac)>=0)
*((destMod->dacs)+idac)=*((srcMod->dacs)+idac);
}
for (iadc=0; iadc<(srcMod->nadc); iadc++) {
if (*((srcMod->adcs)+iadc)>=0)
*((destMod->adcs)+iadc)=*((srcMod->adcs)+iadc);
}
return ret;
}
@@ -1686,7 +1666,6 @@ int calculateDataBytes(){
int getTotalNumberOfChannels(){return ((int)getNumberOfChannelsPerChip() * (int)getNumberOfChips());}
int getNumberOfChips(){return NCHIP;}
int getNumberOfDACs(){return NDAC;}
int getNumberOfADCs(){return NADC;}
int getNumberOfChannelsPerChip(){return NCHAN;}

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@@ -1,6 +1,4 @@
#ifndef SLSDETECTORSERVER_DEFS_H
#define SLSDETECTORSERVER_DEFS_H
#pragma once
#include "sls_detector_defs.h" //default dynamicgain in settings
#include "RegisterDefs.h"
@@ -48,7 +46,6 @@ enum NETWORKINDEX { TXN_FRAME };
/* Hardware Definitions */
#define NCHAN (256 * 256)
#define NCHIP (8)
#define NADC (0)
#define NDAC (8)
#define NDAC_OLDBOARD (16)
#define DYNAMIC_RANGE (16)
@@ -171,6 +168,3 @@ enum NETWORKINDEX { TXN_FRAME };
#define PLL_CHARGEPUMP_REG (0x09)
#define PLL_VCO_DIV_REG (0x1c)
#define PLL_MIF_REG (0x1f)
#endif /* SLSDETECTORSERVER_DEFS_H */