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

receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-13 10:21:22 +00:00
parent bf7da5f493
commit dc94fc3c97
5 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4941,8 +4941,6 @@ int slsDetector::writeConfigurationFile(string const fname){
int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
slsDetectorCommand *cmd=new slsDetectorCommand(this);
int nvar;
int nsig=-1;
string names[]={ \
"hostname", \
@ -4965,8 +4963,7 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
// "trimen",
// "dataport",
switch (thisDetector->myDetectorType) {
case GOTTHARD:
if (thisDetector->myDetectorType==GOTTHARD) {
names[4]= "angdir";
names[5]= "moveflag";
names[6]= "lock";
@ -4977,15 +4974,12 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
names[11]="servermac";
names[12]="receiverip";
names[13]="outdir";
nvar=14;
break;
case MYTHEN:
nsig=4;
default:
nvar=15;
names[14]="vhighvoltage";
}
int nvar=15;
int nsig=4;//-1;
int iv=0;
char *args[100];
char myargs[100][1000];
@ -5685,6 +5679,7 @@ int slsDetector::resetFramesCaught(int index){
int* slsDetector::readFrameFromReceiver(){
//cout<<"databytes:"<<thisDetector->dataBytes<<" headerlength:"<<HEADERLENGTH<<endl;
int fnum=F_READ_FRAME;
int nel=(thisDetector->dataBytes+HEADERLENGTH)/sizeof(int);//2572/
int* retval=new int[nel];