Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 932bc1530288
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22a7b227da7a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 9, 2020

  1. Copy the full SHA
    22a7b22 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 scopehal/LeCroyOscilloscope.cpp
2 changes: 1 addition & 1 deletion scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -1320,7 +1320,7 @@ vector<WaveformBase*> LeCroyOscilloscope::ProcessAnalogWaveform(
if(num_per_segment > 1000000)
{
//Round blocks to multiples of 32 samples for clean vectorization
size_t numblocks = omp_get_max_threads() / 2; //don't run on all hyperthreads
size_t numblocks = omp_get_max_threads();
size_t lastblock = numblocks - 1;
size_t blocksize = num_per_segment / numblocks;
blocksize = blocksize - (blocksize % 32);