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

added getchanregs function to get the trimbits

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@251 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-09-11 15:15:32 +00:00
parent c6d383f770
commit 3faeca0649
5 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2438,7 +2438,7 @@ int slsDetector::setModule(sls_detector_module module){
};
slsDetectorDefs::sls_detector_module *slsDetector::getModule(int imod){
cout<<"getModuke:"<<imod<<endl;
#ifdef VERBOSE
std::cout << "slsDetector get module " << std::endl;
#endif
@ -2813,6 +2813,19 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
};
int slsDetector::getChanRegs(double* retval){
int n=getTotalNumberOfChannels();
//else the original array has 0 initialized
if(chanregs){
for (int i=0; i<n; i++)
retval[i] = (double) chanregs[i];
}
return n;
}
int slsDetector::updateDetectorNoWait() {
// int ret=OK;

8
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -881,6 +881,14 @@ typedef struct sharedSlsDetector {
detectorSettings setSettings(detectorSettings isettings, int imod=-1);
//virtual detectorSettings setSettings(detectorSettings isettings, int imod=-1);
/**
gets the trimbits from shared memory *chanRegs
\param retval is the array with the trimbits
\returns the total number of channels for the detector
\sa ::sls_detector_module
*/
int getChanRegs(double* retval);
/**
updates the shared memory receiving the data from the detector (without asking and closing the connection