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

read/write of config/parameter file rewritten so that parameter file can take in slsdetector level commands

Browse Source
This commit is contained in:
maliakal_d
2020-01-06 18:16:41 +01:00
parent 51c5520472
commit 38aad40fef
8 changed files with 480 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -709,25 +709,6 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;};
/**
Saves the detector setup to file
\param fname file to write to
\param level if 2 reads also trimbits, flat field, angular correction etc. and writes them to files with automatically added extension
\returns OK or FAIL
*/
int dumpDetectorSetup(std::string const fname, int level=0);
/**
Loads the detector setup from file
\param fname file to read from
\param level if 2 reads also reads trimbits, angular conversion coefficients etc. from files with default extensions as generated by dumpDetectorSetup
\returns OK or FAIL
*/
int retrieveDetectorSetup(std::string const fname, int level=0);
static int dummyAcquisitionFinished(double prog,int status,void* p){cout <<"Acquisition finished callback! " << prog << " " << status << endl; return 0;}
static int dummyMeasurementFinished(int im,int findex,void* p){cout <<"Measurement finished callback! " << im << " " << findex << endl; return 0;}