fixed resampling bug in calibrations

- was not resampling the measurements which led to failure when improper numbers of points entered in measurement files.
Nubis-Communications · Apr 27, 2021 · caf1b82 · caf1b82
1 parent a34a2a7
commit caf1b82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py b/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py
@@ -254,7 +254,9 @@ def _CalculateUnknownThruErrorTerms(self,measurements):
                                     else Sestsp[max(n-1,0)],driven,other)
                             Sest=SParameters(self.f,Sestsp)
                             Sest=Sest.LimitImpulseResponseLength(meas.limit)
-                            Sest.WriteToFile('RecoveredThru')
+                            # pragma: silent exclude
+                            #Sest.WriteToFile('RecoveredThru')
+                            # pragma: include
                             measurements[other][driven].append(
                                 ThruCalibrationMeasurement(
                                 meas.Smeasured.FrequencyResponse(1,1),

diff --git a/SignalIntegrity/Lib/Parsers/CalibrationParser.py b/SignalIntegrity/Lib/Parsers/CalibrationParser.py
@@ -65,7 +65,7 @@ def _ProcessCalibrationLine(self,line):
                         if tokenValue == 'None':
                             self.m_spc[tokenValue] = None
                         elif not tokenValue in self.m_spc:
-                            self.m_spc[tokenValue] = SParameterFile(tokenValue)
+                            self.m_spc[tokenValue] = SParameterFile(tokenValue).Resample(self.m_f)
                         measDict['std']=self.m_spc[tokenValue]
                     elif tokenName == 'pn':
                         measDict['driven']=port=int(tokenValue)