ngscopeclient · Nov 28, 2020
Showing with 9 additions and 8 deletions.

+2 −2 scopehal/DemoOscilloscope.cpp

+2 −1 scopeprotocols/HistogramFilter.cpp

+2 −2 scopeprotocols/JitterSpectrumFilter.cpp

+3 −3 scopeprotocols/VerticalBathtub.cpp
diff --git a/scopehal/DemoOscilloscope.cpp b/scopehal/DemoOscilloscope.cpp
@@ -388,7 +388,7 @@ bool DemoOscilloscope::AcquireData()
 	m_sweepFreq += 1e6;
 	if(m_sweepFreq > 1.5e9)
 		m_sweepFreq = 1.1e9;
-	float sweepPeriod = SECONDS_PER_FS / m_sweepFreq;
+	float sweepPeriod = FS_PER_SECOND / m_sweepFreq;
 
 	//Generate waveforms
 	SequenceSet s;
@@ -403,7 +403,7 @@ bool DemoOscilloscope::AcquireData()
 	float now = GetTime();
 	float tfrac = fmodf(now, 1);
 	time_t start = round(now - tfrac);
-	int64_t fs = round(tfrac * SECONDS_PER_FS);
+	int64_t fs = round(tfrac * FS_PER_SECOND);
 	for(auto it : s)
 	{
 		auto wfm = it.second;

diff --git a/scopeprotocols/HistogramFilter.cpp b/scopeprotocols/HistogramFilter.cpp
@@ -156,7 +156,8 @@ void HistogramFilter::Refresh()
 	}
 
 	//Calculate histogram for our incoming data
-	size_t bins = ceil(range);
+	//For now, 100fs per bin target
+	size_t bins = ceil(range) / 100;
 	auto data = MakeHistogram(din, m_min, m_max, bins);
 
 	//Calculate bin configuration.

diff --git a/scopeprotocols/JitterSpectrumFilter.cpp b/scopeprotocols/JitterSpectrumFilter.cpp
@@ -44,8 +44,8 @@ JitterSpectrumFilter::JitterSpectrumFilter(const string& color)
 	m_yAxisUnit = Unit(Unit::UNIT_FS);
 	m_category = CAT_ANALYSIS;
 
-	m_range = 1;
-	m_offset = -0.5;
+	m_range = 1000;
+	m_offset = -500;
 }
 
 JitterSpectrumFilter::~JitterSpectrumFilter()

diff --git a/scopeprotocols/VerticalBathtub.cpp b/scopeprotocols/VerticalBathtub.cpp
@@ -122,9 +122,9 @@ void VerticalBathtub::Refresh()
 	int64_t timestamp = m_parameters[m_timeName].GetIntVal();
 
 	//Find the eye bin for this column
-	double ps_per_width = 2*eye->m_uiWidth;
-	double ps_per_pixel = ps_per_width / eye->GetWidth();
-	size_t xbin = round( (timestamp + eye->m_uiWidth) / ps_per_pixel );
+	double fs_per_width = 2*eye->m_uiWidth;
+	double fs_per_pixel = fs_per_width / eye->GetWidth();
+	size_t xbin = round( (timestamp + eye->m_uiWidth) / fs_per_pixel );
 
 	/*
 	float ymid = din->GetHeight()/2;