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

merge with developer

Browse Source
This commit is contained in:
maliakal_d
2022-01-24 11:36:46 +01:00
parent a44284834a c554bbb2d3
commit 7cc7d979e4
78 changed files with 15991 additions and 15883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsSupportLib/include/sls/file_utils.h
View File

@ -10,7 +10,6 @@
namespace sls {
/**
* @param data array of data values
* @param nch number of channels
@ -25,7 +24,6 @@ int readDataFile(std::ifstream &infile, short int *data, int nch,
*/
int readDataFile(std::string fname, short int *data, int nch);
std::vector<char> readBinaryFile(const std::string &fname,
const std::string &errorPrefix);
@ -47,7 +45,7 @@ int writeDataFile(std::string fname, int nch, short int *data);
void mkdir_p(const std::string &path, std::string dir = "");
int getFileSize(std::ifstream &ifs);
ssize_t getFileSize(FILE* fd, const std::string &prependErrorString);
ssize_t getFileSize(FILE *fd, const std::string &prependErrorString);
std::string getFileNameFromFilePath(const std::string &fpath);
}
} // namespace sls

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

@ -2,14 +2,14 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */
#define GITBRANCH "developer"
#define APILIB 0x211125
#define APIRECEIVER 0x211124
#define APIGUI 0x211124
#define APIEIGER 0x220118
#define APICTB 0x220124
#define APIGOTTHARD 0x220124
#define APIGOTTHARD2 0x220124
#define APIJUNGFRAU 0x220124
#define APIMYTHEN3 0x220124
#define APIMOENCH 0x220124
#define APIEIGER 0x220124