detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 11:20:04 +02:00
Code Issues Actions Packages Releases Activity

fixed getsettings (moench) for patsetbit and patmask

Browse Source
This commit is contained in:
maliakal_d 2022-01-24 11:00:16 +01:00
parent f38c1c8714
commit 3b11000532
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -952,42 +952,42 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
switch (sett) { switch (sett) {
case G1_HIGHGAIN: case G1_HIGHGAIN:
LOG(logINFO, ("Set settings - G1_HIGHGAIN\n")); LOG(logINFO, ("Set settings - G1_HIGHGAIN\n"));
setPatternBitMask(G1_HIGHGAIN_PATMASK); setPatternBitMask(G1_HIGHGAIN_PATSETBIT);
break; break;
case G1_LOWGAIN: case G1_LOWGAIN:
LOG(logINFO, ("Set settings - G1_LOWGAIN\n")); LOG(logINFO, ("Set settings - G1_LOWGAIN\n"));
setPatternBitMask(G1_LOWGAIN_PATMASK); setPatternBitMask(G1_LOWGAIN_PATSETBIT);
break; break;
case G2_HIGHCAP_HIGHGAIN: case G2_HIGHCAP_HIGHGAIN:
LOG(logINFO, ("Set settings - G2_HIGHCAP_HIGHGAIN\n")); LOG(logINFO, ("Set settings - G2_HIGHCAP_HIGHGAIN\n"));
setPatternBitMask(G2_HIGHCAP_HIGHGAIN_PATMASK); setPatternBitMask(G2_HIGHCAP_HIGHGAIN_PATSETBIT);
break; break;
case G2_HIGHCAP_LOWGAIN: case G2_HIGHCAP_LOWGAIN:
LOG(logINFO, ("Set settings - G2_HIGHCAP_LOWGAIN\n")); LOG(logINFO, ("Set settings - G2_HIGHCAP_LOWGAIN\n"));
setPatternBitMask(G2_HIGHCAP_LOWGAIN_PATMASK); setPatternBitMask(G2_HIGHCAP_LOWGAIN_PATSETBIT);
break; break;
case G2_LOWCAP_HIGHGAIN: case G2_LOWCAP_HIGHGAIN:
LOG(logINFO, ("Set settings - G2_LOWCAP_HIGHGAIN\n")); LOG(logINFO, ("Set settings - G2_LOWCAP_HIGHGAIN\n"));
setPatternBitMask(G2_LOWCAP_HIGHGAIN_PATMASK); setPatternBitMask(G2_LOWCAP_HIGHGAIN_PATSETBIT);
break; break;
case G2_LOWCAP_LOWGAIN: case G2_LOWCAP_LOWGAIN:
LOG(logINFO, ("Set settings - G2_LOWCAP_LOWGAIN\n")); LOG(logINFO, ("Set settings - G2_LOWCAP_LOWGAIN\n"));
setPatternBitMask(G2_LOWCAP_LOWGAIN_PATMASK); setPatternBitMask(G2_LOWCAP_LOWGAIN_PATSETBIT);
break; break;
case G4_HIGHGAIN: case G4_HIGHGAIN:
LOG(logINFO, ("Set settings - G4_HIGHGAIN\n")); LOG(logINFO, ("Set settings - G4_HIGHGAIN\n"));
setPatternBitMask(G4_HIGHGAIN_PATMASK); setPatternBitMask(G4_HIGHGAIN_PATSETBIT);
break; break;
case G4_LOWGAIN: case G4_LOWGAIN:
LOG(logINFO, ("Set settings - G4_LOWGAIN\n")); LOG(logINFO, ("Set settings - G4_LOWGAIN\n"));
setPatternBitMask(G4_LOWGAIN_PATMASK); setPatternBitMask(G4_LOWGAIN_PATSETBIT);
break; break;
default: default:
LOG(logERROR, LOG(logERROR,
("This settings is not defined for this detector %d\n", (int)sett)); ("This settings is not defined for this detector %d\n", (int)sett));
return -1; return -1;
} }
setPatternMask(DEFAULT_PATSETBIT); setPatternMask(DEFAULT_PATMASK);
thisSettings = sett; thisSettings = sett;
return getSettings(); return getSettings();
@ -995,44 +995,44 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
enum detectorSettings getSettings() { enum detectorSettings getSettings() {
uint64_t patsetbit = getPatternBitMask(); uint64_t patmask = getPatternMask();
if (patsetbit != DEFAULT_PATSETBIT) { if (patmask != DEFAULT_PATMASK) {
LOG(logERROR, LOG(logERROR,
("Patsetbit is 0x%llx, and not 0x%llx. Undefined Settings!\n", ("Patmask is 0x%llx, and not 0x%llx. Undefined Settings!\n",
patsetbit, DEFAULT_PATSETBIT)); patmask, DEFAULT_PATMASK));
thisSettings = UNDEFINED; thisSettings = UNDEFINED;
return thisSettings; return thisSettings;
} }
uint64_t patsetmask = getPatternMask(); uint64_t patsetbit = getPatternBitMask();
switch (patsetmask) { switch (patsetbit) {
case G1_HIGHGAIN_PATMASK: case G1_HIGHGAIN_PATSETBIT:
thisSettings = G1_HIGHGAIN; thisSettings = G1_HIGHGAIN;
break; break;
case G1_LOWGAIN_PATMASK: case G1_LOWGAIN_PATSETBIT:
thisSettings = G1_LOWGAIN; thisSettings = G1_LOWGAIN;
break; break;
case G2_HIGHCAP_HIGHGAIN_PATMASK: case G2_HIGHCAP_HIGHGAIN_PATSETBIT:
thisSettings = G2_HIGHCAP_HIGHGAIN; thisSettings = G2_HIGHCAP_HIGHGAIN;
break; break;
case G2_HIGHCAP_LOWGAIN_PATMASK: case G2_HIGHCAP_LOWGAIN_PATSETBIT:
thisSettings = G2_HIGHCAP_LOWGAIN; thisSettings = G2_HIGHCAP_LOWGAIN;
break; break;
case G2_LOWCAP_HIGHGAIN_PATMASK: case G2_LOWCAP_HIGHGAIN_PATSETBIT:
thisSettings = G2_LOWCAP_HIGHGAIN; thisSettings = G2_LOWCAP_HIGHGAIN;
break; break;
case G2_LOWCAP_LOWGAIN_PATMASK: case G2_LOWCAP_LOWGAIN_PATSETBIT:
thisSettings = G2_LOWCAP_LOWGAIN; thisSettings = G2_LOWCAP_LOWGAIN;
break; break;
case G4_HIGHGAIN_PATMASK: case G4_HIGHGAIN_PATSETBIT:
thisSettings = G4_HIGHGAIN; thisSettings = G4_HIGHGAIN;
break; break;
case G4_LOWGAIN_PATMASK: case G4_LOWGAIN_PATSETBIT:
thisSettings = G4_LOWGAIN; thisSettings = G4_LOWGAIN;
break; break;
default: default:
LOG(logERROR, LOG(logERROR,
("Patsetmask is 0x%llx. Undefined Settings!\n", patsetmask)); ("Patsetbit is 0x%llx. Undefined Settings!\n", patsetbit));
thisSettings = UNDEFINED; thisSettings = UNDEFINED;
break; break;
} }

18
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -105,15 +105,15 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS };
#define DEFAULT_SETTINGS (G4_HIGHGAIN) #define DEFAULT_SETTINGS (G4_HIGHGAIN)
// settings // settings
#define DEFAULT_PATSETBIT (0x00000C800000800AULL) #define DEFAULT_PATMASK (0x00000C800000800AULL)
#define G1_HIGHGAIN_PATMASK (0x00000C0000008008ULL) #define G1_HIGHGAIN_PATSETBIT (0x00000C0000008008ULL)
#define G1_LOWGAIN_PATMASK (0x0000040000008000ULL) #define G1_LOWGAIN_PATSETBIT (0x0000040000008000ULL)
#define G2_HIGHCAP_HIGHGAIN_PATMASK (0x0000080000000008ULL) #define G2_HIGHCAP_HIGHGAIN_PATSETBIT (0x0000080000000008ULL)
#define G2_HIGHCAP_LOWGAIN_PATMASK (0x0000000000000000ULL) #define G2_HIGHCAP_LOWGAIN_PATSETBIT (0x0000000000000000ULL)
#define G2_LOWCAP_HIGHGAIN_PATMASK (0x00000C800000800AULL) #define G2_LOWCAP_HIGHGAIN_PATSETBIT (0x00000C800000800AULL)
#define G2_LOWCAP_LOWGAIN_PATMASK (0x0000048000008002ULL) #define G2_LOWCAP_LOWGAIN_PATSETBIT (0x0000048000008002ULL)
#define G4_HIGHGAIN_PATMASK (0x000008800000000AULL) #define G4_HIGHGAIN_PATSETBIT (0x000008800000000AULL)
#define G4_LOWGAIN_PATMASK (0x0000008000000002ULL) #define G4_LOWGAIN_PATSETBIT (0x0000008000000002ULL)
#define HIGHVOLTAGE_MIN (60) #define HIGHVOLTAGE_MIN (60)
#define HIGHVOLTAGE_MAX (200) // min dac val #define HIGHVOLTAGE_MAX (200) // min dac val