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

const string&

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-11 15:25:29 +02:00
parent 316ba01297
commit f806759af3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -936,7 +936,7 @@ int multiSlsDetector::execCommand(std::string cmd, int detPos) {
} }
int multiSlsDetector::readConfigurationFile(std::string const fname) { int multiSlsDetector::readConfigurationFile(const std::string& fname) {
freeSharedMemory(); freeSharedMemory();
setupMultiDetector(); setupMultiDetector();
@ -1902,7 +1902,7 @@ int multiSlsDetector::digitalTest(digitalTestMode mode, int ival, int detPos) {
} }
int multiSlsDetector::loadImageToDetector(imageType index, std::string const fname, int detPos) { int multiSlsDetector::loadImageToDetector(imageType index, const std::string& fname, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->loadImageToDetector(index, fname); return detectors[detPos]->loadImageToDetector(index, fname);
@ -1930,7 +1930,7 @@ int multiSlsDetector::loadImageToDetector(imageType index, std::string const fna
} }
int multiSlsDetector::writeCounterBlockFile(std::string const fname, int startACQ, int detPos) { int multiSlsDetector::writeCounterBlockFile(const std::string& fname, int startACQ, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->writeCounterBlockFile(fname, startACQ); return detectors[detPos]->writeCounterBlockFile(fname, startACQ);
@ -3511,7 +3511,7 @@ int multiSlsDetector::setCTBPatWaitTime(int level, uint64_t t, int detPos) {
} }
int multiSlsDetector::retrieveDetectorSetup(std::string const fname1, int level){ int multiSlsDetector::retrieveDetectorSetup(const std::string& fname1, int level){
int skip=0; int skip=0;
std::string fname; std::string fname;
@ -3594,7 +3594,7 @@ int multiSlsDetector::retrieveDetectorSetup(std::string const fname1, int level)
} }
int multiSlsDetector::dumpDetectorSetup(std::string const fname, int level){ int multiSlsDetector::dumpDetectorSetup(const std::string& fname, int level){
detectorType type = getDetectorsType(); detectorType type = getDetectorsType();
std::string names[100]; std::string names[100];
int nvar=0; int nvar=0;

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -468,7 +468,7 @@ public:
* @param fname configuration file name * @param fname configuration file name
* @return OK or FAIL * @return OK or FAIL
*/ */
int readConfigurationFile(std::string const fname); int readConfigurationFile(const std::string& fname);
/** /**
* Write current configuration to a file * Write current configuration to a file
@ -929,7 +929,7 @@ public:
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL * @returns OK or FAIL
*/ */
int loadImageToDetector(imageType index,std::string const fname, int detPos = -1); int loadImageToDetector(imageType index, const std::string& fname, int detPos = -1);
/** /**
* Writes the counter memory block from the detector (Gotthard) * Writes the counter memory block from the detector (Gotthard)
@ -938,7 +938,7 @@ public:
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL * @returns OK or FAIL
*/ */
int writeCounterBlockFile(std::string const fname,int startACQ=0, int detPos = -1); int writeCounterBlockFile(const std::string& fname,int startACQ=0, int detPos = -1);
/** /**
* Resets counter in detector (Gotthard) * Resets counter in detector (Gotthard)
@ -1516,7 +1516,7 @@ public:
* from files with default extensions as generated by dumpDetectorSetup * from files with default extensions as generated by dumpDetectorSetup
* @returns OK or FAIL * @returns OK or FAIL
*/ */
int retrieveDetectorSetup(std::string const fname, int level=0); int retrieveDetectorSetup(const std::string& fname, int level=0);
/** /**
* Saves the detector setup to file * Saves the detector setup to file
@ -1525,7 +1525,7 @@ public:
* and writes them to files with automatically added extension * and writes them to files with automatically added extension
* @returns OK or FAIL * @returns OK or FAIL
*/ */
int dumpDetectorSetup(std::string const fname, int level=0); int dumpDetectorSetup(const std::string& fname, int level=0);
/** /**
* register callback for accessing acquisition final data * register callback for accessing acquisition final data