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

Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench

Browse Source
This commit is contained in:
bergamaschi 2016-08-16 15:15:24 +02:00
parent 597f5e5d2a
commit b90ca7b864
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -361,7 +361,13 @@ enum dacIndex {
TEMPERATURE_10GE, /**< temperature sensor (close to 10GE) */ TEMPERATURE_10GE, /**< temperature sensor (close to 10GE) */
TEMPERATURE_DCDC, /**< temperature sensor (close to DCDC) */ TEMPERATURE_DCDC, /**< temperature sensor (close to DCDC) */
TEMPERATURE_SODL, /**< temperature sensor (close to SODL) */ TEMPERATURE_SODL, /**< temperature sensor (close to SODL) */
TEMPERATURE_SODR /**< temperature sensor (close to SODR) */ TEMPERATURE_SODR, /**< temperature sensor (close to SODR) */
V_POWER_A = 100, /**new chiptest board */
V_POWER_B = 101, /**new chiptest board */
V_POWER_C = 102, /**new chiptest board */
V_POWER_D = 103, /**new chiptest board */
V_POWER_IO =104, /**new chiptest board */
V_POWER_CHIP=105 /**new chiptest board */
}; };
/** /**

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2277,8 +2277,8 @@ dacs_t slsDetector::setDAC(dacs_t val, dacIndex index, int mV, int imod){
int arg[3]; int arg[3];
if ( (thisDetector->myDetectorType != GOTTHARD) && (thisDetector->myDetectorType != PROPIX) && index==HV_POT) if ( (thisDetector->myDetectorType == GOTTHARD) || (thisDetector->myDetectorType == PROPIX) && index==HV_NEW)
index=HV_NEW; index=HV_POT;
arg[0]=index; arg[0]=index;
arg[1]=imod; arg[1]=imod;

34
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -737,6 +737,26 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
i++; i++;
descrToFuncMap[i].m_pFuncName="v_b"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
descrToFuncMap[i].m_pFuncName="v_c"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
descrToFuncMap[i].m_pFuncName="v_d"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
descrToFuncMap[i].m_pFuncName="v_io"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
descrToFuncMap[i].m_pFuncName="v_chip"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
i++;
/* r/w timers */ /* r/w timers */
descrToFuncMap[i].m_pFuncName="temp_adc"; // descrToFuncMap[i].m_pFuncName="temp_adc"; //
@ -3562,7 +3582,7 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
else if (cmd=="vshaper2") else if (cmd=="vshaper2")
dac=SHAPER2; dac=SHAPER2;
else if (cmd=="vhighvoltage") else if (cmd=="vhighvoltage")
dac=HV_POT; dac=HV_NEW;
else if (cmd=="vapower") else if (cmd=="vapower")
dac=VA_POT; dac=VA_POT;
else if (cmd=="vddpower") else if (cmd=="vddpower")
@ -3642,6 +3662,18 @@ string slsDetectorCommand::cmdDAC(int narg, char *args[], int action) {
dac=E_Vis; dac=E_Vis;
else if (cmd== "iodelay") else if (cmd== "iodelay")
dac=IO_DELAY; dac=IO_DELAY;
else if (cmd== "v_a")
dac=V_POWER_A;
else if (cmd== "v_b")
dac=V_POWER_B;
else if (cmd== "v_c")
dac=V_POWER_C;
else if (cmd== "v_d")
dac=V_POWER_D;
else if (cmd== "v_io")
dac=V_POWER_IO;
else if (cmd== "v_chip")
dac=V_POWER_CHIP;
else else
return string("cannot decode dac ")+cmd; return string("cannot decode dac ")+cmd;