detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

now the read/reset counter block and loadimage for gotthard works

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@160 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-03-23 11:17:39 +00:00
parent c0a69ebc2d
commit 47312e625c
2 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2511,7 +2511,7 @@ int multiSlsDetector::configureMAC() {
int multiSlsDetector::loadImageToDetector(imageType index,string const fname){
int ret=-100, ret1;
short int arg[thisMultiDetector->numberOfChannels];
short int imageVals[thisMultiDetector->numberOfChannels];
ifstream infile;
infile.open(fname.c_str(), ios_base::in);
@ -2526,8 +2526,8 @@ int multiSlsDetector::loadImageToDetector(imageType index,string const fname){
#endif
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
if(detectors[idet]->readDataFile(infile,arg)>=0){
ret1=detectors[idet]->sendImageToDetector(index,arg);
if(detectors[idet]->readDataFile(infile,imageVals)>=0){
ret1=detectors[idet]->sendImageToDetector(index,imageVals);
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
@ -3380,3 +3380,54 @@ int multiSlsDetector::readDataFile(string fname, int *data) {
}
return iline;
}
int multiSlsDetector::writeCounterBlockFile(string const fname,int startACQ){
int ret=OK, ret1=OK;
short int arg[thisMultiDetector->numberOfChannels];
ofstream outfile;
outfile.open(fname.c_str(), ios_base::out);
if (outfile.is_open()) {
#ifdef VERBOSE
std::cout<< std::endl<< "Reading Counter to \""<<fname;
if(startACQ==1)
std::cout<<"\" and Restarting Acquisition";
std::cout<<std::endl;
#endif
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->getCounterBlock(arg,startACQ);
if(ret1!=OK)
ret=FAIL;
else{
ret1=detectors[idet]->writeDataFile(outfile,arg);
if(ret1!=OK)
ret=FAIL;
}
}
}
outfile.close();
} else {
std::cout<< "Could not open file "<< fname << std::endl;
return -1;
}
return ret;
}
int multiSlsDetector::resetCounterBlock(int startACQ){
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->resetCounterBlock(startACQ);
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
}
return ret;
}

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -949,6 +949,24 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int readDataFile(string fname, int *data);
/**
writes the counter memory block from the detector
\param startACQ is 1 to start acquisition after reading counter
\param fname file name to load data from
\returns OK or FAIL
*/
int writeCounterBlockFile(string const fname,int startACQ=0);
/**
Resets counter in detector
\param startACQ is 1 to start acquisition after resetting counter
\returns OK or FAIL
*/
int resetCounterBlock(int startACQ=0);
protected: