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

adding hostname+ changing that

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@121 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-02-17 11:09:51 +00:00
parent a7e9cc1091
commit 47f18d3cbf
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2772,7 +2772,7 @@ int slsDetector::updateDetectorNoWait() {
switch(thisDetector->myDetectorType){ switch(thisDetector->myDetectorType){
case GOTTHARD: case GOTTHARD:
n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP)); n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
cout << "Updating detector last modified by " << lastClientIP << endl; //cout << "Updating detector last modified by " << lastClientIP << endl; commented out by dhanya for now
break; break;
default: default:
n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP)); n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));

9
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1318,6 +1318,15 @@ typedef struct sharedSlsDetector {
*/ */
int* getDataFromDetector(); int* getDataFromDetector();
/**
Loads dark image or gain image to the detector
\param index is 0 for dark image and 1 for gain image
\fname file name to load data from
*/
int loadImageToDetector(int index,string const fname);
protected: protected:

1
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1085,6 +1085,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
strcpy(hostname,""); strcpy(hostname,"");
for (int id=1; id<narg; id++) { for (int id=1; id<narg; id++) {
strcat(hostname,args[id]); strcat(hostname,args[id]);
if(narg>2)
strcat(hostname,"+"); strcat(hostname,"+");
} }
} else } else