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

udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-13 15:34:53 +00:00
parent d205e79106
commit 1882454cf3
7 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1952,7 +1952,7 @@ dacs_t slsDetector::getADC(dacIndex index, int imod){
controlSocket->Disconnect();
if (ret==FORCE_UPDATE)
updateDetector();
}
}else setCannotConnectToDetector();
}
}
#ifdef VERBOSE
@ -5338,8 +5338,8 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
names[11]="detectorip";
names[12]= "rx_tcpport";
names[13]= "rx_udpport";
names[14]="rx_hostname";
names[15]="rx_udpip";
names[14]="rx_udpip";
names[15]="rx_hostname";
names[16]="outdir";
names[17]="vhighvoltage";
nvar=18;
@ -6270,4 +6270,14 @@ int64_t slsDetector::clearAllErrorMask(){
}
void slsDetector::setCannotConnectToDetector(){
std::cout << "cannot connect to detector" << endl;
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_DETECTOR));
}
void slsDetector::setCannotConnectToReceiver(){
std::cout << "cannot connect to Receiver" << endl;
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_RECEIVER));
}

8
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1554,6 +1554,14 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int64_t clearAllErrorMask();
/** Sets Cannot connect to Detector error mask and prints it
*/
void setCannotConnectToDetector();
/** Sets Cannot connect to Detector error mask and prints it
*/
void setCannotConnectToReceiver();
/** returns the detector MAC address\sa sharedSlsDetector */
char* getDetectorMAC() {return thisDetector->detectorMAC;};
/** returns the detector IP address\sa sharedSlsDetector */

13
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2968,7 +2968,6 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
dacIndex dac;
dacs_t val=-1;
char answer[1000];
if (cmd=="vthreshold")
dac=THRESHOLD;
else if (cmd=="vcalibration")
@ -3007,15 +3006,7 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
dac=G_VREF_COMP;
else if (cmd=="ib_test_c")
dac=G_IB_TESTC;
else if (cmd=="temp_adc") {
dac=TEMPERATURE_ADC;
if (action==PUT_ACTION)
return string("cannot set ")+cmd;
} else if (cmd=="temp_fpga") {
dac=TEMPERATURE_FPGA;
if (action==PUT_ACTION)
return string("cannot set ")+cmd;
} else
else
return string("cannot decode dac ")+cmd;
if (action==PUT_ACTION) {
@ -3144,6 +3135,8 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action) {
#else
sprintf(answer,"%f",myDet->getADC(adc));
#endif
if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA))
strcat(answer,"°C");
return string(answer);
}