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

moved configuremac to receiverip and change the config file writing to have the correct order

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@334 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-11-08 08:18:01 +00:00
parent fa9449e447
commit 3cc914a8fb
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4474,6 +4474,12 @@ char* slsDetector::setReceiverIP(string receiverIP){
setFilePath(fileIO::getFilePath()); setFilePath(fileIO::getFilePath());
setFileName(fileIO::getFileName()); setFileName(fileIO::getFileName());
setFileIndex(fileIO::getFileIndex()); setFileIndex(fileIO::getFileIndex());
if(thisDetector->myDetectorType==GOTTHARD){
if(configureMAC()!=OK){
setReceiverOnline(OFFLINE_FLAG);
std::cout << "could not configure mac" << endl;
}
}
}else }else
std::cout << "cannot connect to receiver" << endl; std::cout << "cannot connect to receiver" << endl;
} }
@ -4513,7 +4519,7 @@ char* slsDetector::setServerMAC(string serverMAC){
int slsDetector::configureMAC(int adc){ int slsDetector::configureMAC(int adc){
int retval,i; int i;
int ret=FAIL; int ret=FAIL;
int fnum=F_CONFIGURE_MAC; int fnum=F_CONFIGURE_MAC;
char mess[100]; char mess[100];
@ -4526,7 +4532,7 @@ int slsDetector::configureMAC(int adc){
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "slsDetector configureMAC "<< std::endl; std::cout<< "Configuring MAC with adc:"<< adc << std::endl;
#endif #endif
for(i=0;i<3;i++){ for(i=0;i<3;i++){
@ -4577,9 +4583,7 @@ int slsDetector::configureMAC(int adc){
controlSocket->SendDataOnly(arg,sizeof(arg)); controlSocket->SendDataOnly(arg,sizeof(arg));
controlSocket->SendDataOnly(&adc,sizeof(adc)); controlSocket->SendDataOnly(&adc,sizeof(adc));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret!=FAIL) if (ret==FAIL){
controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
else {
controlSocket->ReceiveDataOnly(mess,sizeof(mess)); controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl; std::cout<< "Detector returned error: " << mess << std::endl;
} }
@ -4590,13 +4594,11 @@ int slsDetector::configureMAC(int adc){
} }
}else }else
std::cout << "cannot connect to detector" << endl; std::cout << "cannot connect to detector" << endl;
#ifdef VERBOSE
std::cout<< "Configuring MAC - returned "<< retval << std::endl;
#endif
if (ret==FAIL) { if (ret==FAIL) {
std::cout<< "Configuring MAC failed " << std::endl; std::cout<< "Configuring MAC failed " << std::endl;
} }
return retval; return ret;
} }
@ -4962,10 +4964,17 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
switch (thisDetector->myDetectorType) { switch (thisDetector->myDetectorType) {
case GOTTHARD: case GOTTHARD:
names[9]="receiverip"; names[4]= "angdir";
names[5]= "moveflag";
names[6]= "lock";
names[7]= "caldir";
names[8]= "ffdir";
names[9]= "extsig";
names[10]="receivermac"; names[10]="receivermac";
names[11]="servermac"; names[11]="servermac";
nvar=12; names[12]="receiverip";
names[13]="outdir";
nvar=14;
break; break;
case MYTHEN: case MYTHEN:
nsig=4; nsig=4;
@ -5524,12 +5533,6 @@ int slsDetector::startReceiver(){
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
ret=updateReceiver(); ret=updateReceiver();
} }
//configuremac for gotthard
if(ret==OK)
if(thisDetector->myDetectorType==GOTTHARD)
ret=configureMAC();
if(ret==OK) if(ret==OK)
ret=detectorSendToReceiver(true); ret=detectorSendToReceiver(true);
@ -5574,7 +5577,7 @@ int slsDetector::detectorSendToReceiver(bool set){
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Setting detector to send packets via client " << std::endl; std::cout << "Setting detector to send packets via client to: " << set << std::endl;
#endif #endif
if (controlSocket) { if (controlSocket) {
if (controlSocket->Connect()>=0) { if (controlSocket->Connect()>=0) {

1
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2152,6 +2152,7 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
return helpNetworkParameter(narg,args,action); return helpNetworkParameter(narg,args,action);
if (cmd=="receiverip") { if (cmd=="receiverip") {
myDet->setOnline(ONLINE_FLAG);
t=RECEIVER_IP; t=RECEIVER_IP;
} else if (cmd=="receivermac") { } else if (cmd=="receivermac") {
t=RECEIVER_MAC; t=RECEIVER_MAC;

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -547,6 +547,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
/** /**
Saves the detector setup to file Saves the detector setup to file
\param fname file to write to \param fname file to write to