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

almost done with ctb update, need to do slow adcs, split to moench and ctb

Browse Source
This commit is contained in:
maliakal_d
2018-11-30 10:39:26 +01:00
parent c19c787904
commit 8f3f9caf2b
110 changed files with 4526 additions and 14397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/GeneralData.h
View File

@@ -421,7 +421,7 @@ private:
/** Constructor */
JCTBData(){
myDetectorType = slsDetectorDefs::JUNGFRAUCTB;
myDetectorType = slsDetectorDefs::CHIPTESTBOARD;
nPixelsX = 400;
nPixelsY = 400;
headerSizeinPacket = 22;

2
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -468,7 +468,7 @@ void DataProcessor::PadMissingPackets(char* buf) {
else
memset(buf + fifohsize + (pnum * dsize), 0xFF, dsize+2);
break;
case JUNGFRAUCTB:
case CHIPTESTBOARD:
if (pnum == (pperFrame-1))
memset(buf + fifohsize + (pnum * dsize), 0xFF, corrected_dsize);
else

4
slsReceiverSoftware/src/Listener.cpp
View File

@@ -461,7 +461,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else
memcpy(buf + fifohsize + dsize - 2, carryOverPacket + hsize, dsize+2);
break;
case JUNGFRAUCTB:
case CHIPTESTBOARD:
if (pnum == (pperFrame-1))
memcpy(buf + fifohsize + (pnum * dsize), carryOverPacket + hsize, corrected_dsize);
else
@@ -594,7 +594,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else
memcpy(buf + fifohsize + (pnum * dsize) - 2, listeningPacket + hsize, dsize+2);
break;
case JUNGFRAUCTB:
case CHIPTESTBOARD:
if (pnum == (pperFrame-1))
memcpy(buf + fifohsize + (pnum * dsize), listeningPacket + hsize, corrected_dsize);
else

4
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@@ -832,7 +832,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
switch(myDetectorType) {
case GOTTHARD:
case EIGER:
case JUNGFRAUCTB:
case CHIPTESTBOARD:
case JUNGFRAU:
FILE_LOG(logINFO) << " ***** " << getDetectorType(d) << " Receiver *****";
break;
@@ -846,7 +846,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
switch(myDetectorType) {
case GOTTHARD: generalData = new GotthardData(); break;
case EIGER: generalData = new EigerData(); break;
case JUNGFRAUCTB: generalData = new JCTBData(); break;
case CHIPTESTBOARD: generalData = new JCTBData(); break;
case JUNGFRAU: generalData = new JungfrauData(); break;
default: break;
}

6
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@@ -582,7 +582,7 @@ int slsReceiverTCPIPInterface::set_detector_type(){
switch(arg) {
case GOTTHARD:
case EIGER:
case JUNGFRAUCTB:
case CHIPTESTBOARD:
case JUNGFRAU:
break;
default:
@@ -804,7 +804,7 @@ int slsReceiverTCPIPInterface::set_timer() {
receiver->setSubPeriod(index[1] + receiver->getSubExpTime());
break;
case SAMPLES_JCTB:
if (myDetectorType != JUNGFRAUCTB) {
if (myDetectorType != CHIPTESTBOARD) {
modeNotImplemented("(Samples) Timer index", (int)index[0]);
break;
}
@@ -836,7 +836,7 @@ int slsReceiverTCPIPInterface::set_timer() {
retval=(receiver->getSubPeriod() - receiver->getSubExpTime());
break;
case SAMPLES_JCTB:
if (myDetectorType != JUNGFRAUCTB) {
if (myDetectorType != CHIPTESTBOARD) {
ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for this receiver type\n", (long long int)index[0]);
FILE_LOG(logERROR) << "Warning: " << mess;