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

ctb/ moench server fix: usleep of 10 for reading from fifo removed

Browse Source
This commit is contained in:
maliakal_d
2019-03-19 17:32:07 +01:00
parent 38bf540c1a
commit d8c0fb522a
4 changed files with 105 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin https://www.github.com/slsdetectorgroup/slsDetectorPackage Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 6765fd0dc89176b4eceaf5e2304ef808a316ba9b Repsitory UUID: 38bf540c1a6e7c1f37f0ad5c6598a4cb3184e314
Revision: 38 Revision: 40
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Erik_Frojdh
Last Changed Rev: 4394 Last Changed Rev: 4442
Last Changed Date: 2019-03-13 08:04:56.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-11 14:57:56.000000002 +0100 ./RegisterDefs.h

10
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "https://www.github.com/slsdetectorgroup/slsDetectorPackage" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "6765fd0dc89176b4eceaf5e2304ef808a316ba9b" #define GITREPUUID "38bf540c1a6e7c1f37f0ad5c6598a4cb3184e314"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x4394 #define GITREV 0x4442
#define GITDATE 0x20190313 #define GITDATE 0x20190311
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

43
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -924,9 +924,9 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
case FRAME_PERIOD: case FRAME_PERIOD:
if(val >= 0){ if(val >= 0){
FILE_LOG(logINFO, ("Setting period: %lldns\n",(long long int)val)); FILE_LOG(logINFO, ("Setting period: %lldns\n",(long long int)val));
val *= (1E-3 * clkDivider[ADC_CLK]); val *= (1E-3 * clkDivider[SYNC_CLK]);
} }
retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[ADC_CLK]); retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[SYNC_CLK]);
FILE_LOG(logINFO, ("\tGetting period: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting period: %lldns\n", (long long int)retval));
break; break;
@ -984,7 +984,7 @@ int64_t getTimeLeft(enum timerIndex ind){
break; break;
case FRAME_PERIOD: case FRAME_PERIOD:
retval = get64BitReg(PERIOD_LEFT_LSB_REG, PERIOD_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); retval = get64BitReg(PERIOD_LEFT_LSB_REG, PERIOD_LEFT_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]);
FILE_LOG(logINFO, ("Getting period left: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("Getting period left: %lldns\n", (long long int)retval));
break; break;
@ -1028,6 +1028,14 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
return OK; return OK;
switch(ind) { switch(ind) {
case FRAME_PERIOD: case FRAME_PERIOD:
// convert to freq
val *= (1E-3 * clkDivider[SYNC_CLK]);
// convert back to timer
val = (val) / (1E-3 * clkDivider[SYNC_CLK]);
if (val != retval) {
return FAIL;
}
break;
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
// convert to freq // convert to freq
val *= (1E-3 * clkDivider[ADC_CLK]); val *= (1E-3 * clkDivider[ADC_CLK]);
@ -2290,23 +2298,22 @@ void unsetFifoReadStrobes() {
} }
void readSample(int ns) { void readSample(int ns) {
if (!(ns%1000)) {
FILE_LOG(logINFO, ("Reading sample ns:%d (out of %d), DigitalFifoEmpty:%d AnalogFifoEmptyReg:0x%x\n",
ns, nSamples,
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
bus_r(FIFO_EMPTY_REG)));
}
uint32_t addr = DUMMY_REG; uint32_t addr = DUMMY_REG;
uint32_t fifoAddr = FIFO_DATA_REG;
// read adcs // read adcs
if (analogEnable) { if (analogEnable) {
uint32_t fifoAddr = FIFO_DATA_REG;
// read strobe to all analog fifos // read strobe to all analog fifos
bus_w(addr, bus_r(addr) | DUMMY_ANLG_FIFO_RD_STRBE_MSK); bus_w(addr, bus_r(addr) | DUMMY_ANLG_FIFO_RD_STRBE_MSK);
bus_w(addr, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK)); bus_w(addr, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK));
// wait as it is connected directly to fifo running on a different clock // wait as it is connected directly to fifo running on a different clock
usleep(WAIT_TIME_FIFO_RD_STROBE); //usleep(WAIT_TIME_FIFO_RD_STROBE);
if (!(ns%1000)) {
FILE_LOG(logDEBUG1, ("Reading sample ns:%d of %d AEmtpy:0x%x AFull:0x%x Status:0x%x\n",
ns, nSamples, bus_r(FIFO_EMPTY_REG), bus_r(FIFO_FULL_REG), bus_r(STATUS_REG)));
}
// loop through all channels // loop through all channels
int ich = 0; int ich = 0;
@ -2325,10 +2332,10 @@ void readSample(int ns) {
*((uint16_t*)now_ptr) = bus_r16(fifoAddr); *((uint16_t*)now_ptr) = bus_r16(fifoAddr);
// keep reading till the value is the same // keep reading till the value is the same
while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) { /* while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) {
FILE_LOG(logDEBUG1, ("%d ", ich)); FILE_LOG(logDEBUG1, ("%d ", ich));
*((uint16_t*)now_ptr) = bus_r16(fifoAddr); *((uint16_t*)now_ptr) = bus_r16(fifoAddr);
} }*/
// increment pointer to data out destination // increment pointer to data out destination
now_ptr += 2; now_ptr += 2;
@ -2342,7 +2349,13 @@ void readSample(int ns) {
bus_w(addr, bus_r(addr) | DUMMY_DGTL_FIFO_RD_STRBE_MSK); bus_w(addr, bus_r(addr) | DUMMY_DGTL_FIFO_RD_STRBE_MSK);
bus_w(addr, bus_r(addr) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK)); bus_w(addr, bus_r(addr) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK));
// wait as it is connected directly to fifo running on a different clock // wait as it is connected directly to fifo running on a different clock
usleep(WAIT_TIME_FIFO_RD_STROBE); if (!(ns%1000)) {
FILE_LOG(logDEBUG1, ("Reading sample ns:%d of %d DEmtpy:%d DFull:%d Status:0x%x\n",
ns, nSamples,
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_FULL_MSK) >> FIFO_DIN_STATUS_FIFO_FULL_OFST),
bus_r(STATUS_REG)));
}
// read fifo and write it to current position of data pointer // read fifo and write it to current position of data pointer
*((uint64_t*)now_ptr) = get64BitReg(FIFO_DIN_LSB_REG, FIFO_DIN_MSB_REG); *((uint64_t*)now_ptr) = get64BitReg(FIFO_DIN_LSB_REG, FIFO_DIN_MSB_REG);
@ -2392,7 +2405,7 @@ int checkFifoForEndOfAcquisition() {
// check if data in fifo again // check if data in fifo again
dataPresent = checkDataInFifo(); dataPresent = checkDataInFifo();
} }
FILE_LOG(logDEBUG2, ("Got data :0x%x\n", dataPresent)); FILE_LOG(logDEBUG1, ("Got data :0x%x\n", dataPresent));
return OK; return OK;
} }

103
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -845,9 +845,9 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
case FRAME_PERIOD: case FRAME_PERIOD:
if(val >= 0){ if(val >= 0){
FILE_LOG(logINFO, ("Setting period: %lldns\n",(long long int)val)); FILE_LOG(logINFO, ("Setting period: %lldns\n",(long long int)val));
val *= (1E-3 * clkDivider[ADC_CLK]); val *= (1E-3 * clkDivider[SYNC_CLK]);
} }
retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[ADC_CLK]); retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[SYNC_CLK]);
FILE_LOG(logINFO, ("\tGetting period: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting period: %lldns\n", (long long int)retval));
break; break;
@ -905,7 +905,7 @@ int64_t getTimeLeft(enum timerIndex ind){
break; break;
case FRAME_PERIOD: case FRAME_PERIOD:
retval = get64BitReg(PERIOD_LEFT_LSB_REG, PERIOD_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); retval = get64BitReg(PERIOD_LEFT_LSB_REG, PERIOD_LEFT_MSB_REG) / (1E-3 * clkDivider[SYNC_CLK]);
FILE_LOG(logINFO, ("Getting period left: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("Getting period left: %lldns\n", (long long int)retval));
break; break;
@ -949,6 +949,14 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
return OK; return OK;
switch(ind) { switch(ind) {
case FRAME_PERIOD: case FRAME_PERIOD:
// convert to freq
val *= (1E-3 * clkDivider[SYNC_CLK]);
// convert back to timer
val = (val) / (1E-3 * clkDivider[SYNC_CLK]);
if (val != retval) {
return FAIL;
}
break;
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
// convert to freq // convert to freq
val *= (1E-3 * clkDivider[ADC_CLK]); val *= (1E-3 * clkDivider[ADC_CLK]);
@ -1925,50 +1933,69 @@ void unsetFifoReadStrobes() {
} }
void readSample(int ns) { void readSample(int ns) {
if (!(ns%1000)) { uint32_t addr = DUMMY_REG;
FILE_LOG(logINFO, ("Reading sample ns:%d (out of %d), DigitalFifoEmpty:%d AnalogFifoEmptyReg:0x%x\n",
ns, nSamples,
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
bus_r(FIFO_EMPTY_REG)));
}
uint32_t addr = DUMMY_REG;
uint32_t fifoAddr = FIFO_DATA_REG;
// read adcs // read adcs
if (analogEnable) {
// read strobe to all analog fifos uint32_t fifoAddr = FIFO_DATA_REG;
bus_w(addr, bus_r(addr) | DUMMY_ANLG_FIFO_RD_STRBE_MSK);
bus_w(addr, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK));
// wait as it is connected directly to fifo running on a different clock
usleep(WAIT_TIME_FIFO_RD_STROBE);
// loop through all channels // read strobe to all analog fifos
int ich = 0; bus_w(addr, bus_r(addr) | DUMMY_ANLG_FIFO_RD_STRBE_MSK);
for (ich = 0; ich < NCHAN; ++ich) { bus_w(addr, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK));
// wait as it is connected directly to fifo running on a different clock
//usleep(WAIT_TIME_FIFO_RD_STROBE);
if (!(ns%1000)) {
FILE_LOG(logDEBUG1, ("Reading sample ns:%d of %d AEmtpy:0x%x AFull:0x%x Status:0x%x\n",
ns, nSamples, bus_r(FIFO_EMPTY_REG), bus_r(FIFO_FULL_REG), bus_r(STATUS_REG)));
}
// if channel is in ROI // loop through all channels
if ((1 << ich) & ~(adcDisableMask)) { int ich = 0;
for (ich = 0; ich < NCHAN_ANALOG; ++ich) {
// unselect channel // if channel is in ROI
bus_w(addr, bus_r(addr) & ~(DUMMY_FIFO_CHNNL_SLCT_MSK)); if ((1 << ich) & ~(adcDisableMask)) {
// select channel // unselect channel
bus_w(addr, bus_r(addr) | ((ich << DUMMY_FIFO_CHNNL_SLCT_OFST) & DUMMY_FIFO_CHNNL_SLCT_MSK)); bus_w(addr, bus_r(addr) & ~(DUMMY_FIFO_CHNNL_SLCT_MSK));
// read fifo and write it to current position of data pointer // select channel
*((uint16_t*)now_ptr) = bus_r16(fifoAddr); bus_w(addr, bus_r(addr) | ((ich << DUMMY_FIFO_CHNNL_SLCT_OFST) & DUMMY_FIFO_CHNNL_SLCT_MSK));
// keep reading till the value is the same // read fifo and write it to current position of data pointer
while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) { *((uint16_t*)now_ptr) = bus_r16(fifoAddr);
FILE_LOG(logDEBUG1, ("%d ", ich));
*((uint16_t*)now_ptr) = bus_r16(fifoAddr);
}
// increment pointer to data out destination // keep reading till the value is the same
now_ptr += 2; /* while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) {
} FILE_LOG(logDEBUG1, ("%d ", ich));
} *((uint16_t*)now_ptr) = bus_r16(fifoAddr);
}*/
// increment pointer to data out destination
now_ptr += 2;
}
}
}
// read digital output
if (digitalEnable) {
// read strobe to digital fifo
bus_w(addr, bus_r(addr) | DUMMY_DGTL_FIFO_RD_STRBE_MSK);
bus_w(addr, bus_r(addr) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK));
// wait as it is connected directly to fifo running on a different clock
if (!(ns%1000)) {
FILE_LOG(logDEBUG1, ("Reading sample ns:%d of %d DEmtpy:%d DFull:%d Status:0x%x\n",
ns, nSamples,
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> FIFO_DIN_STATUS_FIFO_EMPTY_OFST),
((bus_r(FIFO_DIN_STATUS_REG) & FIFO_DIN_STATUS_FIFO_FULL_MSK) >> FIFO_DIN_STATUS_FIFO_FULL_OFST),
bus_r(STATUS_REG)));
}
// read fifo and write it to current position of data pointer
*((uint64_t*)now_ptr) = get64BitReg(FIFO_DIN_LSB_REG, FIFO_DIN_MSB_REG);
now_ptr += 8;
}
} }
uint32_t checkDataInFifo() { uint32_t checkDataInFifo() {
@ -2006,7 +2033,7 @@ int checkFifoForEndOfAcquisition() {
// check if data in fifo again // check if data in fifo again
dataPresent = checkDataInFifo(); dataPresent = checkDataInFifo();
} }
FILE_LOG(logDEBUG2, ("Got data :0x%x\n", dataPresent)); FILE_LOG(logDEBUG1, ("Got data :0x%x\n", dataPresent));
return OK; return OK;
} }