a check in gotthard server to ensure that it is really gotthard and not moench module

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@527 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-04-26 09:02:40 +00:00
parent 528b34d2b5
commit 671c30f30a
3 changed files with 8 additions and 16 deletions

View File

@ -53,18 +53,6 @@ char mess[1000];
int digitalTestBit = 0;
void check_detector_type(int b){
if (((bus_r(PCB_REV_REG) & DETECTOR_TYPE_MASK)>> DETECTOR_TYPE_OFFSET) == MOENCH_MODULE){
printf("This is a MOENCH detector. Exiting Gotthard Server.\n");
exit(-1);
}
if(b)
printf("***This is a GOTTHARD detector with %d chips per module***\n", NCHIP);
}
int init_detector( int b) {
if (mapCSP0()==FAIL) {
@ -72,12 +60,17 @@ int init_detector( int b) {
exit(-1);
}
check_detector_type(b);
//confirm if it is really gotthard
if (((bus_r(PCB_REV_REG) & DETECTOR_TYPE_MASK)>> DETECTOR_TYPE_OFFSET) == MOENCH_MODULE){
printf("This is a MOENCH detector. Exiting Gotthard Server.\n");
exit(-1);
}
if (b) {
printf("***This is a GOTTHARD detector with %d chips per module***\n", NCHIP);
#ifdef MCB_FUNCS
initDetector();
printf("Initializing Detector\n");
initDetector();
printf("Initializing Detector\n");
#endif
testFpga();
testRAM();

View File

@ -23,7 +23,6 @@ int sockfd;
int function_table();
int decode_function(int);
void check_detector_type(int);
int init_detector(int);
int M_nofunc(int);