##// END OF EJS Templates
Bug fixed: Fmax should not be divided by 2.
Miguel Valdez -
r765:1db9f6939de7
parent child
Show More
@@ -95,7 +95,7 def hildebrand_sekhon(data, navg):
95 j += 1
95 j += 1
96
96
97 lnoise = sump /j
97 lnoise = sump /j
98 stdv = numpy.sqrt((sumq - lnoise**2)/(j - 1))
98 # stdv = numpy.sqrt((sumq - lnoise**2)/(j - 1))
99 return lnoise
99 return lnoise
100
100
101 class Beam:
101 class Beam:
@@ -254,6 +254,12 class JROData(GenericData):
254
254
255 return heis
255 return heis
256
256
257 def getDeltaH(self):
258
259 delta = self.heightList[1] - self.heightList[0]
260
261 return delta
262
257 def getltctime(self):
263 def getltctime(self):
258
264
259 if self.useLocalTime:
265 if self.useLocalTime:
@@ -277,11 +283,21 class JROData(GenericData):
277
283
278 return datatime
284 return datatime
279
285
286 def getFmaxTimeResponse(self):
287
288 period = (10**-6)*self.getDeltaH()/(0.15)
289
290 PRF = 1./(period * self.nCohInt)
291
292 fmax = PRF
293
294 return fmax
295
280 def getFmax(self):
296 def getFmax(self):
281
297
282 PRF = 1./(self.ippSeconds * self.nCohInt)
298 PRF = 1./(self.ippSeconds * self.nCohInt)
283
299
284 fmax = PRF/2.
300 fmax = PRF
285
301
286 return fmax
302 return fmax
287
303
@@ -592,7 +608,14 class Spectra(JROData):
592 else:
608 else:
593 noise = self.getNoisebyHildebrand(xmin_index, xmax_index, ymin_index, ymax_index)
609 noise = self.getNoisebyHildebrand(xmin_index, xmax_index, ymin_index, ymax_index)
594 return noise
610 return noise
611
612 def getFreqRangeTimeResponse(self, extrapoints=0):
595
613
614 deltafreq = self.getFmaxTimeResponse() / (self.nFFTPoints*self.ippFactor)
615 freqrange = deltafreq*(numpy.arange(self.nFFTPoints+extrapoints)-self.nFFTPoints/2.) - deltafreq/2
616
617 return freqrange
618
596 def getFreqRange(self, extrapoints=0):
619 def getFreqRange(self, extrapoints=0):
597
620
598 deltafreq = self.getFmax() / (self.nFFTPoints*self.ippFactor)
621 deltafreq = self.getFmax() / (self.nFFTPoints*self.ippFactor)
General Comments 0
You need to be logged in to leave comments. Login now