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

exchanging patsetbit and patsetmask functionalities

Browse Source
This commit is contained in:
maliakal_d 2022-01-24 09:39:19 +01:00
parent f95a15c841
commit 664c992028
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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"));
setPatternMask(G1_HIGHGAIN_PATMASK); setPatternBitMask(G1_HIGHGAIN_PATMASK);
break; break;
case G1_LOWGAIN: case G1_LOWGAIN:
LOG(logINFO, ("Set settings - G1_LOWGAIN\n")); LOG(logINFO, ("Set settings - G1_LOWGAIN\n"));
setPatternMask(G1_LOWGAIN_PATMASK); setPatternBitMask(G1_LOWGAIN_PATMASK);
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"));
setPatternMask(G2_HIGHCAP_HIGHGAIN_PATMASK); setPatternBitMask(G2_HIGHCAP_HIGHGAIN_PATMASK);
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"));
setPatternMask(G2_HIGHCAP_LOWGAIN_PATMASK); setPatternBitMask(G2_HIGHCAP_LOWGAIN_PATMASK);
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"));
setPatternMask(G2_LOWCAP_HIGHGAIN_PATMASK); setPatternBitMask(G2_LOWCAP_HIGHGAIN_PATMASK);
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"));
setPatternMask(G2_LOWCAP_LOWGAIN_PATMASK); setPatternBitMask(G2_LOWCAP_LOWGAIN_PATMASK);
break; break;
case G4_HIGHGAIN: case G4_HIGHGAIN:
LOG(logINFO, ("Set settings - G4_HIGHGAIN\n")); LOG(logINFO, ("Set settings - G4_HIGHGAIN\n"));
setPatternMask(G4_HIGHGAIN_PATMASK); setPatternBitMask(G4_HIGHGAIN_PATMASK);
break; break;
case G4_LOWGAIN: case G4_LOWGAIN:
LOG(logINFO, ("Set settings - G4_LOWGAIN\n")); LOG(logINFO, ("Set settings - G4_LOWGAIN\n"));
setPatternMask(G4_LOWGAIN_PATMASK); setPatternBitMask(G4_LOWGAIN_PATMASK);
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;
} }
setPatternBitMask(DEFAULT_PATSETBIT); setPatternMask(DEFAULT_PATSETBIT);
thisSettings = sett; thisSettings = sett;
return getSettings(); return getSettings();

10
slsDetectorSoftware/src/CmdProxy.h
View File

@ -2164,15 +2164,15 @@ class CmdProxy {
INTEGER_COMMAND_HEX_WIDTH16( INTEGER_COMMAND_HEX_WIDTH16(
patmask, getPatternMask, setPatternMask, StringTo<uint64_t>, patmask, getPatternMask, setPatternMask, StringTo<uint64_t>,
"[64 bit mask]\n\t[Ctb][Moench][Mythen3] Sets the mask applied to "
"every pattern to the selected bits.");
INTEGER_COMMAND_HEX_WIDTH16(
patsetbit, getPatternBitMask, setPatternBitMask, StringTo<uint64_t>,
"[64 bit mask]\n\t[Ctb][Moench][Mythen3] Selects the bits that will " "[64 bit mask]\n\t[Ctb][Moench][Mythen3] Selects the bits that will "
"have a pattern mask applied to the selected patmask for every " "have a pattern mask applied to the selected patmask for every "
"pattern."); "pattern.");
INTEGER_COMMAND_HEX_WIDTH16(
patsetbit, getPatternBitMask, setPatternBitMask, StringTo<uint64_t>,
"[64 bit mask]\n\t[Ctb][Moench][Mythen3] Sets the mask applied to "
"every pattern to the selected bits.");
EXECUTE_SET_COMMAND(patternstart, startPattern, EXECUTE_SET_COMMAND(patternstart, startPattern,
"\n\t[Mythen3] Starts Pattern"); "\n\t[Mythen3] Starts Pattern");