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

Merge branch 'release' into jungfrauv1.0

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-02-03 15:05:50 +01:00
parent bef8d413d6 316ecf1b50
commit 6cc22a350d
9 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -234,7 +234,11 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
\returns total number of channels
*/
virtual int getTotalNumberOfChannels()=0;
/**
\returns total number of channels for each dimension
*/
virtual int getTotalNumberOfChannels(dimension d)=0;
/** generates file name without extension */
virtual string createFileName()=0;

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1113,7 +1113,7 @@ string slsDetectorCommand::helpLine(int narg, char *args[], int action) {
if (narg==0) {
os << "Command can be: " << endl;
for(int i=0; i<numberOfCommands; ++i) {
os << descrToFuncMap[i].m_pFuncName << "\t" ;
os << descrToFuncMap[i].m_pFuncName << "\n" ;
}
os << endl;
return os.str();

14
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -110,22 +110,24 @@ int slsDetectorUsers::getPositions(double *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;
ny=1;
x0=0;
nx=myDetector->setNumberOfModules()*myDetector->getChansPerMod(0);
return nx;
nx=myDetector->getTotalNumberOfChannels(slsDetectorDefs::X);
ny=myDetector->getTotalNumberOfChannels(slsDetectorDefs::Y);
return nx*ny;
}
int slsDetectorUsers::getMaximumDetectorSize(int &nx, int &ny){
ny=1;
nx=myDetector->getMaxNumberOfModules()*myDetector->getChansPerMod(0);
return nx;
nx=myDetector->getMaxNumberOfChannelsPerDetector(slsDetectorDefs::X);
ny=myDetector->getMaxNumberOfChannelsPerDetector(slsDetectorDefs::Y);
return nx*ny;
}
int slsDetectorUsers::setBitDepth(int i){

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -155,10 +155,6 @@ int slsDetectorUtils::acquire(int delflag){
*stoppedFlag=1;
}
//resets frames caught in receiver
resetFramesCaught();
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
}
@ -181,6 +177,11 @@ int slsDetectorUtils::acquire(int delflag){
cout << " starting measurement "<< im << " of " << nm << endl;
#endif
//resets frames caught in receiver
if(receiver){
resetFramesCaught();
}
//cout << "data thread started " << endl;

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -421,6 +421,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
virtual int* startAndReadAll()=0;
virtual int getTotalNumberOfChannels()=0;
virtual int getTotalNumberOfChannels(dimension d)=0;
virtual int getMaxNumberOfChannels()=0;
virtual int getMaxNumberOfChannels(dimension d)=0;