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

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-11-21 11:09:38 +01:00
parent d9e8e1c1c2
commit b79759bcff
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -2840,7 +2840,7 @@ void *start_timer(void *arg) {
srand(time(0)); srand(time(0));
for (int i = 0; i != 3; ++i) { for (int i = 0; i != 3; ++i) {
int r = rand() % 3; int r = rand() % 3;
if (r == 2) if (r == 2)
r = 3; r = 3;
randomGainValues[i] = r; randomGainValues[i] = r;
} }

15
slsReceiverSoftware/src/MultiReceiverApp.cpp
View File

@ -40,9 +40,11 @@ void sigInterruptHandler(int p) { sem_post(&semaphore); }
std::string getHelpMessage() { std::string getHelpMessage() {
std::ostringstream os; std::ostringstream os;
os << "\nUsage:\n" os << "\nUsage:\n"
<< "./slsMultiReceiver [start tcp port] [num recevers] [call back option (optional)]\n" << "./slsMultiReceiver [start tcp port] [num recevers] [call back "
"option (optional)]\n"
<< "\t - tcp port has to be non-zero and 16 bit\n" << "\t - tcp port has to be non-zero and 16 bit\n"
<< "\t - call back option is 0 (disabled) by default, 1 prints frame header for debugging\n"; << "\t - call back option is 0 (disabled) by default, 1 prints frame "
"header for debugging\n";
return os.str(); return os.str();
} }
@ -175,11 +177,14 @@ int main(int argc, char *argv[]) {
} }
numReceivers = std::stoi(argv[2]); numReceivers = std::stoi(argv[2]);
if (numReceivers > 1024) { if (numReceivers > 1024) {
cprintf(RED, "Did you mix up the order of the arguments?\n%s\n", getHelpMessage().c_str()); cprintf(RED,
"Did you mix up the order of the arguments?\n%s\n",
getHelpMessage().c_str());
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (numReceivers == 0) { if (numReceivers == 0) {
cprintf(RED, "Invalid number of receivers.\n%s\n", getHelpMessage().c_str()); cprintf(RED, "Invalid number of receivers.\n%s\n",
getHelpMessage().c_str());
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (argc == 4) { if (argc == 4) {
@ -187,7 +192,7 @@ int main(int argc, char *argv[]) {
} }
} else } else
throw std::runtime_error("Invalid number of arguments"); throw std::runtime_error("Invalid number of arguments");
} catch (const std::exception& e) { } catch (const std::exception &e) {
cprintf(RED, "Error: %s\n%s\n", e.what(), getHelpMessage().c_str()); cprintf(RED, "Error: %s\n%s\n", e.what(), getHelpMessage().c_str());
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -10,4 +10,4 @@
#define APIMOENCH "developer 0x241107" #define APIMOENCH "developer 0x241107"
#define APIXILINXCTB "developer 0x241107" #define APIXILINXCTB "developer 0x241107"
#define APIEIGER "developer 0x241107" #define APIEIGER "developer 0x241107"
#define APIJUNGFRAU "developer 0x241120" #define APIJUNGFRAU "developer 0x241120"