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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
Erik Frojdh
2018-12-19 11:45:24 +01:00
parent d07f53cd6f 6533a474d1
commit 1af2d95462
31 changed files with 1216 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4018,13 +4018,71 @@ std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int d
} else
sprintf(answer, "%d", myDet->getADC(adc, detPos));
//if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA))
if (adc <= 100)
strcat(answer, "°C");
else
strcat(answer, "mV");
if (sscanf(args[0],"adc:%d",&idac)==1) {
// printf("chiptestboard!\n");
adc=(dacIndex)(idac+1000);
if (idac < SLOW_ADC0 || idac > SLOW_ADC_TEMP)
return (string ("cannot set adc, must be between ") + (SLOW_ADC0 - 1000) +
string (" and ") + (SLOW_ADC_TEMP - 1000));
} else if (cmd=="temp_adc")
adc=TEMPERATURE_ADC;
else if (cmd=="temp_fpga")
adc=TEMPERATURE_FPGA;
else if (cmd=="temp_fpgaext")
adc=TEMPERATURE_FPGAEXT;
else if (cmd=="temp_10ge")
adc=TEMPERATURE_10GE;
else if (cmd=="temp_dcdc")
adc=TEMPERATURE_DCDC;
else if (cmd=="temp_sodl")
adc=TEMPERATURE_SODL;
else if (cmd=="temp_sodr")
adc=TEMPERATURE_SODR;
else if (cmd=="temp_fpgafl")
adc=TEMPERATURE_FPGA2;
else if (cmd=="temp_fpgafr")
adc=TEMPERATURE_FPGA3;
else if (cmd=="i_a")
adc=I_POWER_A;
else if (cmd=="i_b")
adc=I_POWER_B;
else if (cmd=="i_c")
adc=I_POWER_C;
else if (cmd=="i_d")
adc=I_POWER_D;
else if (cmd=="vm_a")
adc=V_POWER_A;
else if (cmd=="vm_b")
adc=V_POWER_B;
else if (cmd=="vm_c")
adc=V_POWER_C;
else if (cmd=="vm_d")
adc=V_POWER_D;
else if (cmd=="vm_io")
adc=V_POWER_IO;
else if (cmd=="i_io")
adc=I_POWER_IO;
else
return string("cannot decode adc ")+cmd;
myDet->setOnline(ONLINE_FLAG, detPos);
if (myDet->getDetectorsType(detPos) == EIGER || myDet->getDetectorsType(detPos) == JUNGFRAU){
int val = myDet->getADC(adc, detPos);
if (val == -1)
sprintf(answer,"%d",val);
else
sprintf(answer,"%.2f", (double)val/1000.000);
}
else sprintf(answer,"%d",myDet->getADC(adc, detPos));
//if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA))
if (adc<=100)
strcat(answer,"°C");
else
strcat(answer,"mV");
return string(answer);
return std::string(answer);
}
std::string slsDetectorCommand::helpADC(int action) {