diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index d2b865387..5ace6172a 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index a23be7a45..9dea16dee 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -2551,8 +2551,7 @@ int readSample(int ns) { // read digital output if (digitalEnable && ns < ndSamples) { - - if (!(ns % 1000)) { + /*if (!(ns % 1000)) { LOG(logDEBUG1, ("Reading sample ns:%d of %d DEmtpy:%d DFull:%d Status:0x%x\n", ns, ndSamples, @@ -2563,6 +2562,15 @@ int readSample(int ns) { FIFO_DIN_STATUS_FIFO_FULL_MSK) >> FIFO_DIN_STATUS_FIFO_FULL_OFST), bus_r(STATUS_REG))); + }*/ + + // wait for data + int fifoEmtpy = 1; + while (fifoEmtpy) { + fifoEmtpy = ((bus_r(FIFO_DIN_STATUS_REG) & + FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >> + FIFO_DIN_STATUS_FIFO_EMPTY_OFST); + usleep(20); } // read fifo and write it to current position of data pointer diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h index 408ece595..e51f1771f 100644 --- a/slsReceiverSoftware/src/GeneralData.h +++ b/slsReceiverSoftware/src/GeneralData.h @@ -622,8 +622,8 @@ class ChipTestBoardData : public GeneralData { readoutType == slsDetectorDefs::DIGITAL_AND_TRANSCEIVER) { nDigitalChans = NCHAN_DIGITAL; nDigitalBytes = (sizeof(uint64_t) * nDigitalSamples); - LOG(logDEBUG1) << "Number of Digital Channels:" << nDigitalChans - << " Databytes: " << nDigitalBytes; + LOG(logINFORED) << "Number of Digital Channels:" << nDigitalChans + << " Databytes: " << nDigitalBytes; } // transceiver channels if (readoutType == slsDetectorDefs::TRANSCEIVER_ONLY || @@ -643,8 +643,8 @@ class ChipTestBoardData : public GeneralData { imageSize = nAnalogBytes + nDigitalBytes + nTransceiverBytes; packetsPerFrame = ceil((double)imageSize / (double)dataSize); - LOG(logDEBUG1) << "Total Number of Channels:" << nPixelsX - << " Databytes: " << imageSize; + LOG(logINFORED) << "Total Number of Channels:" << nPixelsX + << " Databytes: " << imageSize; }; };