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

clang-tidy modernize

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-18 15:15:39 +01:00
parent 449e4da892
commit 603b217b54
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -11,15 +11,15 @@
#include "MySocketTCP.h"
#include <sys/types.h>
#include <sys/shm.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <bitset>
#include <cmath>
#include <cstdlib>
#include <math.h>
#include <iomanip>
#include <sys/shm.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#define DEFAULT_HOSTNAME "localhost"
@ -566,7 +566,7 @@ slsDetectorDefs::sls_detector_module* slsDetector::createModule(detectorType ty
int *dacs = new int[nd];
int *chanregs = new int[nch*nc];
sls_detector_module *myMod = new sls_detector_module;
auto *myMod = new sls_detector_module;
myMod->ndac = nd;
myMod->nchip = nc;
myMod->nchan = nch*nc;
@ -4795,7 +4795,7 @@ slsDetectorDefs::frameDiscardPolicy slsDetector::setReceiverFramesDiscardPolicy(
int fnum = F_RECEIVER_DISCARD_POLICY;
int ret = FAIL;
int arg = (int)f;
frameDiscardPolicy retval = (frameDiscardPolicy)-1;
auto retval = (frameDiscardPolicy)-1;
FILE_LOG(logDEBUG1) << "Setting receiver frames discard policy to " << arg;
if (thisDetector->receiverOnlineFlag == ONLINE_FLAG && connectData() == OK) {
@ -4848,7 +4848,7 @@ slsDetectorDefs::fileFormat slsDetector::setFileFormat(fileFormat f) {
int fnum = F_SET_RECEIVER_FILE_FORMAT;
int ret = FAIL;
int arg = f;
fileFormat retval = (fileFormat)-1;
auto retval = (fileFormat)-1;
FILE_LOG(logDEBUG1) << "Setting receiver file format to " << arg;
if (thisDetector->receiverOnlineFlag == ONLINE_FLAG && connectData() == OK) {

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -13,7 +13,7 @@
#include "error_defs.h"
#include "logger.h"
#include "math.h"
#include <cmath>
class multiSlsDetector;
class SharedMemory;