Add PeakToPeak method for HS64 devices

Author: bparks13

OpenEphys.Onix1.Design/GenericStimulusSequenceDialog.cs

@@ -17,7 +17,6 @@ public partial class GenericStimulusSequenceDialog : Form
         readonly bool UseTable;
 
         internal const double ZeroPeakToPeak = 1e-12;
-        internal double PeakToPeak = 1;
         internal readonly double ChannelScale = 1.1;
 
         [Obsolete("Designer only", true)]
@@ -186,8 +185,6 @@ internal void DrawStimulusWaveform(bool setZoomState = true)
                 return Math.Abs(val).ToString("0");
             };
 
-            DrawScale();
-
             dataGridViewStimulusTable.Refresh();
 
             if (setZoomState && XMin != 0 && XMax != 0)
@@ -198,6 +195,8 @@ internal void DrawStimulusWaveform(bool setZoomState = true)
                 zedGraphWaveform.GraphPane.YAxis.Scale.Max = YMax;
             }
 
+            DrawScale();
+
             zedGraphWaveform.AxisChange();
             zedGraphWaveform.Refresh();
         }

OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorSequenceDialog.cs

@@ -287,14 +287,19 @@ internal override bool CanCloseForm(out DialogResult result)
             }
         }
 
+        internal override double GetPeakToPeakAmplitudeInMicroAmps()
+        {
+            var peakToPeak = (Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)
+                          + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent))) * ChannelScale;
+
+            return peakToPeak == 0 ? ZeroPeakToPeak : peakToPeak;
+        }
+
         internal override PointPairList[] CreateStimulusWaveforms()
         {
             PointPairList[] waveforms = new PointPairList[NumberOfChannels];
 
-            PeakToPeak = (Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)
-                          + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent))) * ChannelScale;
-
-            PeakToPeak = PeakToPeak == 0 ? ZeroPeakToPeak : PeakToPeak;
+            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();
 
             if (ElectricalStimulator != null)
             {
@@ -306,12 +311,12 @@ internal override PointPairList[] CreateStimulusWaveforms()
                     {
                         for (int j = 0; j < ElectricalStimulator.BurstPulseCount; j++)
                         {
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.PhaseOneCurrent / PeakToPeak));
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.PhaseOneDuration, ElectricalStimulator.PhaseOneCurrent / PeakToPeak));
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.InterPhaseCurrent / PeakToPeak));
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.InterPhaseInterval, ElectricalStimulator.InterPhaseCurrent / PeakToPeak));
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.PhaseTwoCurrent / PeakToPeak));
-                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.PhaseTwoDuration, ElectricalStimulator.PhaseTwoCurrent / PeakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.PhaseOneCurrent / peakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.PhaseOneDuration, ElectricalStimulator.PhaseOneCurrent / peakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.InterPhaseCurrent / peakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.InterPhaseInterval, ElectricalStimulator.InterPhaseCurrent / peakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, ElectricalStimulator.PhaseTwoCurrent / peakToPeak));
+                            waveforms[channel].Add(new PointPair(waveforms[channel].Last().X + ElectricalStimulator.PhaseTwoDuration, ElectricalStimulator.PhaseTwoCurrent / peakToPeak));
                             waveforms[channel].Add(new PointPair(waveforms[channel].Last().X, 0));
 
                             if (j != ElectricalStimulator.BurstPulseCount - 1)

OpenEphys.Onix1.Design/Headstage64OpticalStimulatorSequenceDialog.cs

@@ -210,11 +210,16 @@ double GetChannelCurrentScaled(double maxCurrent, double channelPercent, double
             return (GetChannelCurrent(maxCurrent, channelPercent) / 100.0) / scale;
         }
 
+        internal override double GetPeakToPeakAmplitudeInMicroAmps()
+        {
+            return OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent * ChannelScale;
+        }
+
         internal override PointPairList[] CreateStimulusWaveforms()
         {
             PointPairList[] waveforms = new PointPairList[NumberOfChannels];
 
-            PeakToPeak = OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent * ChannelScale;
+            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();
 
             for (int channel = 0; channel < NumberOfChannels; channel++)
             {
@@ -227,7 +232,7 @@ internal override PointPairList[] CreateStimulusWaveforms()
 
                 var stimulusCurrent = offset + GetChannelCurrentScaled(OpticalStimulator.MaxCurrent,
                                                                        channel == 0 ? OpticalStimulator.ChannelOneCurrent : OpticalStimulator.ChannelTwoCurrent,
-                                                                       PeakToPeak);
+                                                                       peakToPeak);
 
                 for (int i = 0; i < OpticalStimulator.BurstsPerTrain; i++)
                 {

OpenEphys.Onix1.Design/Rhs2116StimulusSequenceDialog.cs

@@ -257,15 +257,15 @@ internal override PointPairList[] CreateStimulusWaveforms()
 
             bool plotAllContacts = ChannelDialog.SelectedContacts.All(x => x == false);
 
-            PeakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;
+            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;
 
             for (int i = 0; i < Sequence.Stimuli.Length; i++)
             {
-                var channelOffset = -PeakToPeak * i;
+                var channelOffset = -peakToPeak * i;
 
                 if (ChannelDialog.SelectedContacts[i] || plotAllContacts)
                 {
-                    waveforms[i] = CreateStimulusWaveform(Sequence.Stimuli[i], channelOffset, PeakToPeak);
+                    waveforms[i] = CreateStimulusWaveform(Sequence.Stimuli[i], channelOffset, peakToPeak);
                 }
                 else
                 {