Skip to content

Commit 2e0127f

Browse files
Print removed
1 parent 293e878 commit 2e0127f

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

specsAnalyserApp/src/specsAnalyser.cpp

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,11 @@ void SpecsAnalyser::specsAnalyserTask()
529529
// I beleive its not required any more (SpecsLab 4.30 appears happy without it)
530530
// 3/8/17 This is still causing problems so re-introduced a small delay
531531
// Wait for the dwell time to elapse to guarantee data will be ready to read out.
532-
//double period;
533-
//getDoubleParam(SPECSDataDelayMax_, &period);
534-
//period = fmin(acquireTime,period);
535-
//debug(functionName, "epicsThreadSleep", period);
536-
//epicsThreadSleep(period);
532+
double period;
533+
getDoubleParam(SPECSDataDelayMax_, &period);
534+
period = fmin(acquireTime,period);
535+
debug(functionName, "epicsThreadSleep", period);
536+
epicsThreadSleep(period);
537537
readSpectrumDataInfo(SPECSOrdinateRange);
538538
}
539539

@@ -648,12 +648,6 @@ void SpecsAnalyser::specsAnalyserTask()
648648
}
649649

650650
pImage->pData = image;
651-
/*
652-
pNDImage = (double *)(pImage->pData);
653-
for (int x = 0; x < energyChannels*nonEnergyChannels; x++){
654-
pNDImage[x] = image[x];
655-
}
656-
*/
657651

658652
pImage->dims[0].size = dims[0];
659653
pImage->dims[1].size = dims[1];
@@ -686,15 +680,9 @@ void SpecsAnalyser::specsAnalyserTask()
686680
// Free the image buffer
687681
pImage->release();
688682

689-
//printf("%i,%i\n",dims[0],dims[1]);
690-
//printf("%d\n",pNDImage[0]);
691-
//printf("%d\n",pNDImage[9999]);
692-
//printf(dataType);
693-
694683
if (status != asynError){
695684
// Check to see if acquisition is complete
696685
if (numImagesCounter >= numImages){
697-
printf("Acquisition completed\n");
698686
setIntegerParam(ADAcquire, 0);
699687
debug(functionName, "Acquisition completed");
700688
}
@@ -719,7 +707,6 @@ void SpecsAnalyser::specsAnalyserTask()
719707
}
720708
else {
721709
acquire = 0;
722-
printf("Acquisition Error\n");
723710
setIntegerParam(ADAcquire, 0);
724711
debug(functionName, "Acquisition Error");
725712
callParamCallbacks();

0 commit comments

Comments
 (0)