From 664c992028f46b8c5292cef4bdb41e9a21498d8b Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 24 Jan 2022 09:39:19 +0100
Subject: [PATCH] exchanging patsetbit and patsetmask functionalities

---
 .../slsDetectorFunctionList.c                  | 18 +++++++++---------
 slsDetectorSoftware/src/CmdProxy.h             | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
index 77482af77..a0932b8fd 100644
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
@@ -952,42 +952,42 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
     switch (sett) {
     case G1_HIGHGAIN:
         LOG(logINFO, ("Set settings - G1_HIGHGAIN\n"));
-        setPatternMask(G1_HIGHGAIN_PATMASK);
+        setPatternBitMask(G1_HIGHGAIN_PATMASK);
         break;
     case G1_LOWGAIN:
         LOG(logINFO, ("Set settings - G1_LOWGAIN\n"));
-        setPatternMask(G1_LOWGAIN_PATMASK);
+        setPatternBitMask(G1_LOWGAIN_PATMASK);
         break;
     case G2_HIGHCAP_HIGHGAIN:
         LOG(logINFO, ("Set settings - G2_HIGHCAP_HIGHGAIN\n"));
-        setPatternMask(G2_HIGHCAP_HIGHGAIN_PATMASK);
+        setPatternBitMask(G2_HIGHCAP_HIGHGAIN_PATMASK);
         break;
     case G2_HIGHCAP_LOWGAIN:
         LOG(logINFO, ("Set settings - G2_HIGHCAP_LOWGAIN\n"));
-        setPatternMask(G2_HIGHCAP_LOWGAIN_PATMASK);
+        setPatternBitMask(G2_HIGHCAP_LOWGAIN_PATMASK);
         break;
     case G2_LOWCAP_HIGHGAIN:
         LOG(logINFO, ("Set settings - G2_LOWCAP_HIGHGAIN\n"));
-        setPatternMask(G2_LOWCAP_HIGHGAIN_PATMASK);
+        setPatternBitMask(G2_LOWCAP_HIGHGAIN_PATMASK);
         break;
     case G2_LOWCAP_LOWGAIN:
         LOG(logINFO, ("Set settings - G2_LOWCAP_LOWGAIN\n"));
-        setPatternMask(G2_LOWCAP_LOWGAIN_PATMASK);
+        setPatternBitMask(G2_LOWCAP_LOWGAIN_PATMASK);
         break;
     case G4_HIGHGAIN:
         LOG(logINFO, ("Set settings - G4_HIGHGAIN\n"));
-        setPatternMask(G4_HIGHGAIN_PATMASK);
+        setPatternBitMask(G4_HIGHGAIN_PATMASK);
         break;
     case G4_LOWGAIN:
         LOG(logINFO, ("Set settings - G4_LOWGAIN\n"));
-        setPatternMask(G4_LOWGAIN_PATMASK);
+        setPatternBitMask(G4_LOWGAIN_PATMASK);
         break;
     default:
         LOG(logERROR,
             ("This settings is not defined for this detector %d\n", (int)sett));
         return -1;
     }
-    setPatternBitMask(DEFAULT_PATSETBIT);
+    setPatternMask(DEFAULT_PATSETBIT);
     thisSettings = sett;
 
     return getSettings();
diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h
index 0e3c544da..ba87f3514 100644
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@@ -2164,15 +2164,15 @@ class CmdProxy {
 
     INTEGER_COMMAND_HEX_WIDTH16(
         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 "
         "have a pattern mask applied to the selected patmask for every "
         "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,
                         "\n\t[Mythen3] Starts Pattern");