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

some more change

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-27 08:28:30 +02:00
parent 3c646c3545
commit 7541c2bcf0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.1
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@ -136,24 +136,24 @@ int init_detector(int b) {
printf("\nPowering on the chip\n");
bus_w(POWER_ON_REG,0x1);
printf("\nResetting ADC\n");
printf("Resetting ADC\n");
writeADC(ADCREG1,0x3); writeADC(ADCREG1,0x0);
writeADC(ADCREG2,0x40);
writeADC(ADCREG3,0xf);
writeADC(ADCREG4,0x3f);
printf("\nConfiguring Vrefs\n");
printf("Configuring Vrefs\n");
writeADC(ADCREG_VREFS,0x2);
printf("\nSetting ADC Inversion\n");// (by trial and error)
printf("Setting ADC Inversion\n");// (by trial and error)
bus_w(ADC_INVERSION_REG,0x453b2a9c);
adcPipeline(HALFSPEED_ADC_PIPELINE);
dbitPipeline(HALFSPEED_DBIT_PIPELINE);
adcPhase(HALFSPEED_ADC_PHASE); //set adc_clock_phase in unit of 1/(52) clock period (by trial and error)
printf("\nReset mem machine fifos\n");
printf("Reset mem machine fifos\n");
bus_w(MEM_MACHINE_FIFOS_REG,0x4000);
bus_w(MEM_MACHINE_FIFOS_REG,0x0);
printf("\nReset run control\n");
printf("Reset run control\n");
bus_w(MEM_MACHINE_FIFOS_REG,0x0400);
bus_w(MEM_MACHINE_FIFOS_REG,0x0);
initSpeedConfGain(HALFSPEED_CONF);

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5579,7 +5579,8 @@ char* slsDetector::setReceiver(string receiverIP){
setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
setDynamicRange(thisDetector->dynamicRange);
activate(-1);
if(thisDetector->myDetectorType == EIGER)
activate(-1);
//std::cout << "***********************************dataStreaming:" << parentDet->enableDataStreamingFromReceiver(-1) << endl << endl;
//parentDet->enableDataStreamingFromReceiver(parentDet->enableDataStreamingFromReceiver(-1));
//set scan tag