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

anna version

Browse Source
This commit is contained in:
bergamaschi
2018-12-06 10:55:18 +01:00
parent 2e83db7d45
commit d8140d8db9
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorCalibration/dataStructures/moench02CtbData.h
View File

@ -35,7 +35,7 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
int adc_off[4]={40,0,120,80}; int adc_off[4]={40,0,120,80};
int adc_nr[4]={8,10,20,23}; int adc_nr[4]={8,10,20,22};
int row, col; int row, col;
int isample; int isample;

27
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4962,9 +4962,9 @@ int slsDetector::setReadOutFlags(readOutFlags flag) {
char mess[MAX_STR_LENGTH]=""; char mess[MAX_STR_LENGTH]="";
int ret=OK; int ret=OK;
#ifdef VERBOSE //#ifdef VERBOSE
std::cout<< "Setting readout flags to "<< flag << std::endl; std::cout<< "Setting readout flags to "<< hex << flag << dec << std::endl;
#endif //#endif
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){ if (connectControl() == OK){
@ -4980,7 +4980,8 @@ int slsDetector::setReadOutFlags(readOutFlags flag) {
thisDetector->roFlags=(readOutFlags)retval; thisDetector->roFlags=(readOutFlags)retval;
if (thisDetector->myDetectorType==JUNGFRAUCTB) { if (thisDetector->myDetectorType==JUNGFRAUCTB) {
getTotalNumberOfChannels(); int nn=getTotalNumberOfChannels();
cout << "Total number of channels is " << nn << endl;
//thisDetector->dataBytes=getTotalNumberOfChannels()* //thisDetector->dataBytes=getTotalNumberOfChannels()*
//thisDetector->dynamicRange/8*thisDetector->timerValue[SAMPLES_JCTB]; //thisDetector->dynamicRange/8*thisDetector->timerValue[SAMPLES_JCTB];
} }
@ -5033,27 +5034,27 @@ int slsDetector::setReadOutFlags(readOutFlags flag) {
char h[1000]; char h[1000];
switch (flag) { switch (flag) {
case PEDESTAL: case PEDESTAL:
retval=PEDESTAL; retval|=PEDESTAL;
strcpy(h,"\"frameMode\":\"pedestal\""); strcpy(h,"\"frameMode\":\"pedestal\"");
break; break;
case NEWPEDESTAL: case NEWPEDESTAL:
retval=NEWPEDESTAL; retval|=NEWPEDESTAL;
strcpy(h,"\"frameMode\":\"newPedestal\""); strcpy(h,"\"frameMode\":\"newPedestal\"");
break; break;
case FLAT: case FLAT:
retval=FLAT; retval|=FLAT;
strcpy(h,"\"frameMode\":\"flatfield\""); strcpy(h,"\"frameMode\":\"flatfield\"");
break; break;
case NEWFLAT: case NEWFLAT:
retval=NEWFLAT; retval|=NEWFLAT;
strcpy(h,"\"frameMode\":\"newFlatfield\""); strcpy(h,"\"frameMode\":\"newFlatfield\"");
break; break;
default: default:
retval=FRAME; retval|=FRAME;
strcpy(h,"\"frameMode\":\"frame\""); strcpy(h,"\"frameMode\":\"frame\"");
} }
if (flag!=GET_READOUT_FLAGS) { if (flag!=GET_READOUT_FLAGS) {
if (header.length()>0) { if (header.length()>0) {
if (header.at(0)==',') if (header.at(0)==',')
header.erase(0,1); header.erase(0,1);
if (header.length()>0) if (header.length()>0)
@ -5103,14 +5104,14 @@ int slsDetector::setReadOutFlags(readOutFlags flag) {
switch (flag) { switch (flag) {
case COUNTING: case COUNTING:
strcpy(h,"\"detectorMode\":\"counting\""); strcpy(h,"\"detectorMode\":\"counting\"");
retval=COUNTING; retval|=COUNTING;
break; break;
case INTERPOLATING: case INTERPOLATING:
retval=INTERPOLATING; retval|=INTERPOLATING;
strcpy(h,"\"detectorMode\":\"interpolating\""); strcpy(h,"\"detectorMode\":\"interpolating\"");
break; break;
default: default:
retval=ANALOG; retval|=ANALOG;
strcpy(h,"\"detectorMode\":\"analog\""); strcpy(h,"\"detectorMode\":\"analog\"");
} }
if (flag!=GET_READOUT_FLAGS) { if (flag!=GET_READOUT_FLAGS) {

3
slsReceiverSoftware/include/genericSocket.h
View File

@ -666,7 +666,9 @@ public:
if (tcpfd<0) return -1; if (tcpfd<0) return -1;
while(length>0){ while(length>0){
nsending = (length>packet_size) ? packet_size:length; nsending = (length>packet_size) ? packet_size:length;
std::cout << "*"<<nsending << std::endl;
nsent = read(tcpfd,(char*)buf+total_sent,nsending); nsent = read(tcpfd,(char*)buf+total_sent,nsending);
std::cout << "+"<<nsent << std::endl;
if(!nsent) { if(!nsent) {
if(!total_sent) { if(!total_sent) {
return -1; //to handle it return -1; //to handle it
@ -675,6 +677,7 @@ public:
} }
length-=nsent; length-=nsent;
total_sent+=nsent; total_sent+=nsent;
std::cout << "+"<< length << " " << total_sent << std::endl;
} }
if (total_sent>0) if (total_sent>0)