diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c index 27e00df46..b4f505486 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c @@ -1777,13 +1777,13 @@ int Feb_Control_PulseChip(int npulses){ cprintf(RED,"some wait error\n"); } Feb_Control_SetExternalEnableMode(on,1); - counter_bit = ~0; + counter_bit = (on?0:1); printf("counter_bit:%d\n",counter_bit); if(on) - printf("Pulse chip success\n"); + printf("Pulse chip success\n\n"); else - printf("Reset to normal mode success\n"); + printf("Reset to normal mode success\n\n"); return 1; } diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.h b/slsDetectorSoftware/eigerDetectorServer/FebControl.h index 0add63670..dfaf15969 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.h +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.h @@ -172,7 +172,7 @@ int Feb_Control_GetModuleNumber(); //functions for testing /*int Feb_Control_SetTestModeVariable(int on=1);*/ - int Feb_Control_SetTestModeVariable(int on); + int Feb_Control_SetInTestModeVariable(int on); int Feb_Control_GetTestModeVariable(); void Feb_Control_Set_Counter_Bit(int value); diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index fafd82a28..651eb76d7 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer differ diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index f7ac43fb1..580b0c359 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5150,7 +5150,7 @@ int multiSlsDetector::pulseChip(int n) { int ret=-100,ret1; for (int idet=0; idetnumberOfDetectors; idet++) if (detectors[idet]){ - ret1=detectors[idet]->pulsePixelNMove(n); + ret1=detectors[idet]->pulseChip(n); if(detectors[idet]->getErrorMask()) setErrorMask(getErrorMask()|(1<