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

refactored ONLY THE CLIENT first stage, compiles

Browse Source
This commit is contained in:
maliakal_d
2018-10-02 15:15:35 +02:00
parent def79807f6
commit c248b12455
150 changed files with 2756 additions and 29940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -72,55 +72,14 @@ int slsDetectorUsers::setFileIndex(int i){
return (int)myDetector->setFileIndex(i);
}
string slsDetectorUsers::getFlatFieldCorrectionDir(){
return myDetector->getFlatFieldCorrectionDir();
}
string slsDetectorUsers::setFlatFieldCorrectionDir(string dir){
return myDetector->setFlatFieldCorrectionDir(dir);
}
string slsDetectorUsers::getFlatFieldCorrectionFile(){
return myDetector->getFlatFieldCorrectionFile();
}
int slsDetectorUsers::setFlatFieldCorrectionFile(string fname){
return myDetector->setFlatFieldCorrectionFile(fname);
}
int slsDetectorUsers::enableFlatFieldCorrection(int i){
return myDetector->enableFlatFieldCorrection(i);
}
int slsDetectorUsers::enableCountRateCorrection(int i){
return myDetector->enableCountRateCorrection(i);
}
int slsDetectorUsers::enablePixelMaskCorrection(int i){
return myDetector->enablePixelMaskCorrection(i);
}
int slsDetectorUsers::enableAngularConversion(int i){
return myDetector->enableAngularConversion(i);
}
int slsDetectorUsers::enableWriteToFile(int i){
return myDetector->enableWriteToFile(i);
}
int slsDetectorUsers::setPositions(int nPos, double *pos){
return myDetector->setPositions(nPos, pos);
}
int slsDetectorUsers::getPositions(double *pos){
return myDetector->getPositions(pos);
}
int slsDetectorUsers::setDetectorSize(int x0, int y0, int nx, int ny){
if(myDetector->getTotalNumberOfChannels(slsDetectorDefs::Y)>1)
return 1;
int nmod=nx/(myDetector->getChansPerMod(0));
cout << myDetector->getChansPerMod(0) << " " << nx << " " << nmod << endl;
return myDetector->setNumberOfModules(nmod)*myDetector->getChansPerMod(0);}
int slsDetectorUsers::getDetectorSize(int &x0, int &y0, int &nx, int &ny){
y0=0;
x0=0;
@ -226,19 +185,6 @@ string slsDetectorUsers::getDetectorType(){
return myDetector->sgetDetectorsType();
}
void slsDetectorUsers::initDataset(int refresh){
myDetector->initDataset(refresh);
}
void slsDetectorUsers::addFrame(double *data, double pos, double i0, double t, string fname, double var){
myDetector->addFrame(data,pos,i0,t,fname,var);
}
void slsDetectorUsers::finalizeDataset(double *a, double *v, double *e, int &np){
myDetector->finalizeDataset(a, v, e, np);
}
int slsDetectorUsers::setReceiverMode(int n){
return myDetector->setReadReceiverFrequency(n);
}
@ -267,14 +213,6 @@ string slsDetectorUsers::setClientDataStreamingInIP(string ip){
return myDetector->setClientDataStreamingInIP(ip);
}
int64_t slsDetectorUsers::getModuleFirmwareVersion(){
return myDetector->getModuleFirmwareVersion();
}
int64_t slsDetectorUsers::getModuleSerialNumber(int imod){
return myDetector->getModuleSerialNumber(imod);
}
int64_t slsDetectorUsers::getDetectorFirmwareVersion(){
return myDetector->getDetectorFirmwareVersion();
}
@ -337,39 +275,10 @@ void slsDetectorUsers::registerDataCallback(int( *userCallback)(detectorData*, i
myDetector->registerDataCallback(userCallback,pArg);
}
void slsDetectorUsers::registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg){
myDetector->registerRawDataCallback(userCallback,pArg);
}
void slsDetectorUsers::registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){
myDetector->registerAcquisitionFinishedCallback(func,pArg);
}
void slsDetectorUsers::registerGetPositionCallback( double (*func)(void*),void *arg){
myDetector->registerGetPositionCallback(func,arg);
}
void slsDetectorUsers::registerConnectChannelsCallback( int (*func)(void*),void *arg){
myDetector->registerConnectChannelsCallback(func,arg);
}
void slsDetectorUsers::registerDisconnectChannelsCallback( int (*func)(void*),void *arg){
myDetector->registerDisconnectChannelsCallback(func,arg);
}
void slsDetectorUsers::registerGoToPositionCallback( int (*func)(double,void*),void *arg){
myDetector->registerGoToPositionCallback(func,arg);
}
void slsDetectorUsers::registerGoToPositionNoWaitCallback( int (*func)(double,void*),void *arg){
myDetector->registerGoToPositionNoWaitCallback(func,arg);
}
void slsDetectorUsers::registerGetI0Callback( double (*func)(int,void*),void *arg){
myDetector->registerGetI0Callback(func,arg);
}
string slsDetectorUsers::putCommand(int narg, char *args[], int pos){
if(narg < 2)
return string("Error: Insufficient Parameters");
@ -455,8 +364,8 @@ int slsDetectorUsers::setTenGigabitEthernet(int i) {
return myDetector->enableTenGigabitEthernet(i);
}
int slsDetectorUsers::getNMods() {
return myDetector->getNMods();
int slsDetectorUsers::getNumberOfDetectors() {
return myDetector->getNumberOfDetectors();
}
double slsDetectorUsers::setSubFrameExposureTime(double t, bool inseconds, int imod){