##// END OF EJS Templates
profile concat parameter
avaldez -
r1247:9ada11315bac
parent child
Show More
@@ -297,6 +297,11 class JROData(GenericData):
297
297
298 def getFmax(self):
298 def getFmax(self):
299 PRF = 1. / (self.ippSeconds * self.nCohInt)
299 PRF = 1. / (self.ippSeconds * self.nCohInt)
300 #print "ippSeconds",self.ippSeconds
301 #print "nCohInt",self.nIncohInt
302 #print PRF
303 #import time
304 #time.sleep(30)
300 fmax = PRF
305 fmax = PRF
301 return fmax
306 return fmax
302
307
@@ -631,7 +636,12 class Spectra(JROData):
631 return freqrange
636 return freqrange
632
637
633 def getAcfRange(self, extrapoints=0):
638 def getAcfRange(self, extrapoints=0):
639 #print "NFFTPoints",self.nFFTPoints
640 #print "IPPFactor", self.ippFactor
634 deltafreq = 10. / ( self.getFmax() / (self.nFFTPoints * self.ippFactor) )
641 deltafreq = 10. / ( self.getFmax() / (self.nFFTPoints * self.ippFactor) )
642 #print "deltafreq",deltafreq
643 #import time
644 #time.sleep(30)
635 freqrange = deltafreq * \
645 freqrange = deltafreq * \
636 (numpy.arange(self.nFFTPoints + extrapoints) -
646 (numpy.arange(self.nFFTPoints + extrapoints) -
637 self.nFFTPoints / 2.) - deltafreq / 2
647 self.nFFTPoints / 2.) - deltafreq / 2
@@ -836,6 +836,7 class ProfileConcat(Operation):
836
836
837 isConfig = False
837 isConfig = False
838 buffer = None
838 buffer = None
839 concat_m =None
839
840
840 def __init__(self, **kwargs):
841 def __init__(self, **kwargs):
841
842
@@ -860,6 +861,7 class ProfileConcat(Operation):
860
861
861 def run(self, dataOut, m):
862 def run(self, dataOut, m):
862
863
864 self.concat_m= m
863 dataOut.flagNoData = True
865 dataOut.flagNoData = True
864
866
865 if not self.isConfig:
867 if not self.isConfig:
@@ -881,6 +883,7 class ProfileConcat(Operation):
881 xf = dataOut.heightList[0] + dataOut.nHeights * deltaHeight * m
883 xf = dataOut.heightList[0] + dataOut.nHeights * deltaHeight * m
882 dataOut.heightList = numpy.arange(dataOut.heightList[0], xf, deltaHeight)
884 dataOut.heightList = numpy.arange(dataOut.heightList[0], xf, deltaHeight)
883 dataOut.ippSeconds *= m
885 dataOut.ippSeconds *= m
886 dataOut.concat_m = int(m)
884
887
885 class ProfileSelector(Operation):
888 class ProfileSelector(Operation):
886
889
@@ -1297,6 +1300,7 class SSheightProfiles(Operation):
1297 dataOut.flagDataAsBlock = False
1300 dataOut.flagDataAsBlock = False
1298 profileIndex = None
1301 profileIndex = None
1299
1302
1303
1300 if not self.isConfig:
1304 if not self.isConfig:
1301 self.setup(dataOut, step=step , nsamples=nsamples)
1305 self.setup(dataOut, step=step , nsamples=nsamples)
1302 self.isConfig = True
1306 self.isConfig = True
@@ -1311,6 +1315,12 class SSheightProfiles(Operation):
1311 profileIndex = self.nsamples
1315 profileIndex = self.nsamples
1312 deltaHeight = dataOut.heightList[1] - dataOut.heightList[0]
1316 deltaHeight = dataOut.heightList[1] - dataOut.heightList[0]
1313 ippSeconds = (deltaHeight*1.0e-6)/(0.15)
1317 ippSeconds = (deltaHeight*1.0e-6)/(0.15)
1318 try:
1319 if dataOut.concat_m is not None:
1320 ippSeconds= ippSeconds/float(dataOut.concat_m)
1321 #print "Profile concat %d"%dataOut.concat_m
1322 except:
1323 pass
1314
1324
1315 dataOut.data = self.sshProfiles
1325 dataOut.data = self.sshProfiles
1316 dataOut.flagNoData = False
1326 dataOut.flagNoData = False
General Comments 0
You need to be logged in to leave comments. Login now