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

made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-26 08:34:41 +00:00
parent 460ffe0549
commit 3075b8ae11
9 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4162,7 +4162,7 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
int *retdet, *p=retval;
string fullFName="";
string ext="";
char * pch;
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
@ -4176,9 +4176,11 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
//concatenate filenames
if(!fullFName.length()){
fullFName.assign(fileIO::getFileName());
size_t dot = fullFName.rfind(".");
if(dot != string::npos)
ext = fullFName.substr(dot,fullFName.size()-dot);
if (strrchr(fName,'.')!=NULL){
ext.assign(fName);
size_t dot = ext.rfind(".");
ext = ext.erase(0,dot);
}
}
fullFName.append(getReceiverFileNameToConcatenate(fName));
}else {
@ -4347,7 +4349,6 @@ int64_t multiSlsDetector::clearAllErrorMask(){
int multiSlsDetector::calibratePedestal(int frames){
int ret=-100, ret1;