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

changed a few parameters & nvar for writeConfigurationFile function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@84 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-01-10 14:31:37 +00:00
parent 9a93a5f019
commit 16bfd722b3
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/Makefile
View File

@ -10,7 +10,7 @@ SRC_CLNT= slsDetector/slsDetector.cpp MySocketTCP/MySocketTCP.cxx usersFunctions
SRC_MYTHEN_SVC = mythenDetectorServer/server.c mythenDetectorServer/server_funcs.c mythenDetectorServer/communication_funcs.c mythenDetectorServer/firmware_funcs.c mythenDetectorServer/mcb_funcs.c mythenDetectorServer/trimming_funcs.c SRC_MYTHEN_SVC = mythenDetectorServer/server.c mythenDetectorServer/server_funcs.c mythenDetectorServer/communication_funcs.c mythenDetectorServer/firmware_funcs.c mythenDetectorServer/mcb_funcs.c mythenDetectorServer/trimming_funcs.c
#mythenDetectorServer/sharedmemory.c #mythenDetectorServer/sharedmemory.c
all: package mythenServer doc picassoServer all: package doc #picassoServer #mythenServer
doc: $(SRC_H) $(SRC_CLNT) doc: $(SRC_H) $(SRC_CLNT)
doxygen doxy.config doxygen doxy.config

5
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -478,9 +478,10 @@ enum {
F_SET_PORT, /**< Changes communication port of the server */ F_SET_PORT, /**< Changes communication port of the server */
F_UPDATE_CLIENT /**< Returns all the important parameters to update the shared memory of the client */ F_UPDATE_CLIENT, /**< Returns all the important parameters to update the shared memory of the client */
F_CONFIGURE_MAC /**< Configures MAC for Gotthard readout */
/* Always append functions hereafter!!! */ /* Always append functions hereafter!!! */

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -151,6 +151,8 @@ int function_table() {
flist[F_SET_SPEED]=&set_speed; flist[F_SET_SPEED]=&set_speed;
flist[F_SET_READOUT_FLAGS]=&set_readout_flags; flist[F_SET_READOUT_FLAGS]=&set_readout_flags;
flist[F_EXECUTE_TRIMMING]=&execute_trimming; flist[F_EXECUTE_TRIMMING]=&execute_trimming;
flist[F_CONFIGURE_MAC]=&configure_mac;
#ifdef VERBOSE #ifdef VERBOSE
/* for (i=0;i<256;i++){ /* for (i=0;i<256;i++){
printf("function %d located at %x\n",i,flist[i]); printf("function %d located at %x\n",i,flist[i]);

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6348,6 +6348,10 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
} }
sprintf(answer,"%d", setSpeed(TOT_DUTY_CYCLE)); sprintf(answer,"%d", setSpeed(TOT_DUTY_CYCLE));
return string(answer); return string(answer);
//gotthard
}else if (var=="configuremac") {
configureMAC();
return string("mac configuration completed");
} }
return ("Unknown command"); return ("Unknown command");
@ -7813,7 +7817,7 @@ int slsDetector::readConfigurationFile(string const fname){
int slsDetector::writeConfigurationFile(string const fname){ int slsDetector::writeConfigurationFile(string const fname){
int nvar;
string names[]={ \ string names[]={ \
"hostname", \ "hostname", \
"caldir", \ "caldir", \
@ -7839,12 +7843,16 @@ int slsDetector::writeConfigurationFile(string const fname){
case MYTHEN: case MYTHEN:
names[2]="trimdir"; names[2]="trimdir";
break; break;
case GOTTHARD:
names[3]="outdir";
names[4]="clientip";
names[5]="clientmac";
nvar=6;
break;
default: default:
; nvar=19;
} }
int nvar=19;
ofstream outfile; ofstream outfile;
int iv=0; int iv=0;
char *args[100]; char *args[100];

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -374,6 +374,10 @@ typedef struct sharedSlsDetector {
*/ */
virtual int writeConfigurationFile(string const fname); virtual int writeConfigurationFile(string const fname);
/**
configures mac for gotthard readout
*/
int configureMAC();
/* /*
It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc.