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

ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver

Browse Source
This commit is contained in:
maliakal_d
2019-02-28 16:07:47 +01:00
parent 96584ce397
commit debf3a1b01
14 changed files with 316 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
slsReceiverSoftware/include/GeneralData.h
View File

@ -182,9 +182,8 @@ public:
/**
* Setting packets per frame changes member variables
* @param ns number of samples
* @param nroich number of channels in roi
*/
virtual void setNumberofSamples(const uint64_t ns, uint32_t nroich) {
virtual void setNumberofSamples(const uint64_t ns) {
FILE_LOG(logERROR) << "This is a generic function that should be overloaded by a derived class";
};
@ -207,6 +206,17 @@ public:
return false;
};
/**
* Set databytes (ctb, moench)
* @param f readout flags
* @param r roi
* @param s number of samples
* @param t tengiga enable
*/
virtual void setImageSize(slsDetectorDefs::readOutFlags f, std::vector<slsDetectorDefs::ROI> i, int s, bool t) {
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
};
/**
* Print all variables
*/
@ -242,9 +252,9 @@ public:
class GotthardData : public GeneralData {
private:
const static int nChip = 10;
const static int nChan = 128;
const static int nChipsPerAdc = 2;
const int nChip = 10;
const int nChan = 128;
const int nChipsPerAdc = 2;
public:
/** Constructor */
@ -511,20 +521,26 @@ class JungfrauData : public GeneralData {
class ChipTestBoardData : public GeneralData {
public:
private:
/** Number of analog channels */
const int NCHAN_ANALOG = 32;
/** Number of digital channels */
const int NCHAN_DIGITAL = 4;
/** Number of bytes per pixel */
const int NUM_BYTES_PER_PIXEL = 2;
public:
/** Constructor */
ChipTestBoardData(){
myDetectorType = slsDetectorDefs::CHIPTESTBOARD;
nPixelsX = 36;
nPixelsY = 1;
nPixelsX = 36; // total number of channels
nPixelsY = 1; // numberofsamples
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
dataSize = 0; // to be calculatedd
dataSize = UDP_PACKET_DATA_BYTES;
packetSize = headerSizeinPacket + dataSize;
packetsPerFrame = 0; // to be calculated
imageSize = nPixelsX * nPixelsY * 2;
imageSize = 0; // to be calculated
maxFramesPerFile = CTB_MAX_FRAMES_PER_FILE;
fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsDetectorDefs::sls_receiver_header);
defaultFifoDepth = 2500;
@ -532,27 +548,43 @@ class ChipTestBoardData : public GeneralData {
};
/**
* Setting packets per frame changes member variables
* @param ns number of samples
* @param nroich number of channels in roi
* Set databytes (ctb, moench)
* @param f readout flags
* @param r roi
* @param s number of samples
* @param t tengiga enable
*/
void setNumberofSamples(const uint64_t ns, uint32_t nroich) {
packetsPerFrame = ceil(double(2 * (nroich ? nroich : 32) * ns) / dataSize);
nPixelsY = (ns * 2) / 25;/* depends on nroich also?? */
imageSize = nPixelsX * nPixelsY * 2;
};
void setImageSize(slsDetectorDefs::readOutFlags f, std::vector<slsDetectorDefs::ROI> i, int s, bool t) {
int nchans = 0;
if (f & slsDetectorDefs::NORMAL_READOUT || f & slsDetectorDefs::ANALOG_AND_DIGITAL) {
nchans += NCHAN_ANALOG;
/**
* Setting ten giga enable changes member variables
* @param tgEnable true if 10GbE is enabled, else false
* @param dr dynamic range
*/
void SetTenGigaEnable(bool tgEnable, int dr) {
dataSize = (tgEnable ? 4096 : 1024);
packetSize = headerSizeinPacket + dataSize;
packetsPerFrame = (tgEnable ? 4 : 16) * dr;
imageSize = dataSize*packetsPerFrame;
};
// if roi
if (i.size()) {
nchans = abs(i[0].xmax - i[0].xmin);
}
}
if (f & slsDetectorDefs::DIGITAL_ONLY || f & slsDetectorDefs::ANALOG_AND_DIGITAL)
nchans += NCHAN_DIGITAL;
nPixelsX = nchans;
nPixelsY = s;
// 10G
if (t) {
// fixed values
dataSize = 0; // FIXME: fix when firmware written
packetSize = headerSizeinPacket + dataSize;
packetsPerFrame = 0; // FIXME: fix when firmware written
imageSize = dataSize*packetsPerFrame; // FIXME: OR fix when firmware written
}
// 1g udp (via fifo readout)
else {
dataSize = UDP_PACKET_DATA_BYTES;
packetSize = headerSizeinPacket + dataSize;
imageSize = nchans * NUM_BYTES_PER_PIXEL * s;
packetsPerFrame = ceil((double)imageSize / (double)UDP_PACKET_DATA_BYTES);
}
}
};
@ -572,10 +604,8 @@ private:
public:
/** Bytes Per Adc */
const static uint32_t bytesPerAdc = 2;
const uint32_t bytesPerAdc = 2;
/** Constructor */
MoenchData(){
@ -615,10 +645,9 @@ private:
/**
* Setting packets per frame changes member variables
* @param ns number of samples
* @param nroich number of channels in roi
*/
void setNumberofSamples(const uint64_t ns, uint32_t nroich) {
packetsPerFrame = ceil(double(2 * (nroich ? nroich : 32) * ns) / dataSize);
void setNumberofSamples(const uint64_t ns) {
packetsPerFrame = ceil(double(2 * 32 * ns) / dataSize);
nPixelsY = (ns * 2) / 25;/* depends on nroich also?? */
imageSize = nPixelsX * nPixelsY * 2;
};

2
slsReceiverSoftware/include/Listener.h
View File

@ -112,7 +112,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
* Set GeneralData pointer to the one given
* @param g address of GeneralData (Detector Data) pointer
*/
void SetGeneralData(GeneralData*& g);
void SetGeneralData(GeneralData* g);
/**
* Set thread priority

17
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@ -73,6 +73,12 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
*/
bool getGapPixelsEnable() const;
/**
* Get readout flags (Eiger, chiptestboard, moench)
* @return readout flags
*/
readOutFlags getReadOutFlags() const;
//***file parameters***
/**
@ -342,6 +348,13 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
*/
int setGapPixelsEnable(const bool b);
/**
* Set readout flags (eiger, chiptestboard, moench)
* @param f readout flag
* @return OK or FAIL
*/
int setReadOutFlags(const readOutFlags f);
//***file parameters***
/**
@ -765,12 +778,12 @@ private:
int flippedData[2];
/** gap pixels enable */
bool gapPixelsEnable;
/** readout flags*/
readOutFlags readoutFlags;
//*** receiver parameters ***
/** Number of Threads */
int numThreads;
/** Number of channels in roi for jungfrauctb */
uint32_t nroichannels;
/** Maximum Number of Listening Threads/ UDP Ports */
const static int MAX_NUMBER_OF_LISTENING_THREADS = 2;
/** Receiver Status */

7
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@ -19,6 +19,8 @@ class slsReceiverImplementation;
*/
class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
private:
enum numberMode {DEC, HEX};
public:
@ -120,7 +122,7 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** validate and set error */
template <typename T>
void validate(T arg, T retval, std::string modename, bool hex);
void validate(T arg, T retval, std::string modename, numberMode hex);
/** Unrecognized Function */
int M_nofunc();
@ -277,6 +279,9 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** set deactivated receiver padding enable */
int set_deactivated_receiver_padding_enable();
/** set readout flags */
int set_readout_flags();
/** detector type */
detectorType myDetectorType;