| @@ -209,12 +209,12 class selectHeights(Operation): | |||||
| 209 | """ |
|
209 | """ | |
| 210 |
|
210 | |||
| 211 | self.dataOut = dataOut |
|
211 | self.dataOut = dataOut | |
| 212 |
|
212 | |||
| 213 | #if minHei and maxHei: |
|
213 | #if minHei and maxHei: | |
| 214 | if 1: |
|
214 | if 1: | |
| 215 | if minHei == None: |
|
215 | if minHei == None: | |
| 216 | minHei = self.dataOut.heightList[0] |
|
216 | minHei = self.dataOut.heightList[0] | |
| 217 |
|
217 | |||
| 218 | if maxHei == None: |
|
218 | if maxHei == None: | |
| 219 | maxHei = self.dataOut.heightList[-1] |
|
219 | maxHei = self.dataOut.heightList[-1] | |
| 220 |
|
220 | |||
| @@ -240,7 +240,7 class selectHeights(Operation): | |||||
| 240 | maxIndex = indb[0][-1] |
|
240 | maxIndex = indb[0][-1] | |
| 241 | except: |
|
241 | except: | |
| 242 | maxIndex = len(heights) |
|
242 | maxIndex = len(heights) | |
| 243 |
|
243 | |||
| 244 | self.selectHeightsByIndex(minIndex, maxIndex) |
|
244 | self.selectHeightsByIndex(minIndex, maxIndex) | |
| 245 | #print(self.dataOut.nHeights) |
|
245 | #print(self.dataOut.nHeights) | |
| 246 |
|
246 | |||
| @@ -309,7 +309,7 class selectHeights(Operation): | |||||
| 309 | self.dataOut.data_spc = data_spc |
|
309 | self.dataOut.data_spc = data_spc | |
| 310 | self.dataOut.data_cspc = data_cspc |
|
310 | self.dataOut.data_cspc = data_cspc | |
| 311 | self.dataOut.data_dc = data_dc |
|
311 | self.dataOut.data_dc = data_dc | |
| 312 |
|
312 | |||
| 313 | self.dataOut.heightList = self.dataOut.heightList[minIndex:maxIndex + 1] |
|
313 | self.dataOut.heightList = self.dataOut.heightList[minIndex:maxIndex + 1] | |
| 314 |
|
314 | |||
| 315 | return 1 |
|
315 | return 1 | |
| @@ -361,8 +361,8 class setOffset(Operation): | |||||
| 361 |
|
361 | |||
| 362 | dataOut.heightList = newHeiRange |
|
362 | dataOut.heightList = newHeiRange | |
| 363 |
|
363 | |||
| 364 |
return dataOut |
|
364 | return dataOut | |
| 365 |
|
365 | |||
| 366 | class setH0(Operation): |
|
366 | class setH0(Operation): | |
| 367 |
|
367 | |||
| 368 | def run(self, dataOut, h0, deltaHeight=None): |
|
368 | def run(self, dataOut, h0, deltaHeight=None): | |
| @@ -1661,7 +1661,7 class CleanCohEchoes(Operation): | |||||
| 1661 |
|
1661 | |||
| 1662 | return modified_z_score > thresh |
|
1662 | return modified_z_score > thresh | |
| 1663 |
|
1663 | |||
| 1664 |
|
1664 | |||
| 1665 |
|
1665 | |||
| 1666 | def removeSpreadF(self,dataOut): |
|
1666 | def removeSpreadF(self,dataOut): | |
| 1667 |
|
1667 | |||
| @@ -2466,7 +2466,7 class NormalizeDPPowerRoberto_V2(Operation): | |||||
| 2466 | cf=temp[i] |
|
2466 | cf=temp[i] | |
| 2467 | return cf |
|
2467 | return cf | |
| 2468 |
|
2468 | |||
| 2469 |
|
2469 | |||
| 2470 | def normalize(self,dataOut): |
|
2470 | def normalize(self,dataOut): | |
| 2471 |
|
2471 | |||
| 2472 | if self.aux==1: |
|
2472 | if self.aux==1: | |
| @@ -2813,7 +2813,7 class DenCorrection(NormalizeDPPowerRoberto_V2): | |||||
| 2813 | y[j]=fitacf_acf2.acf2(wl,tau,dataOut.te2[i],tion,fion,nue,nui,wion,angle,dataOut.ph2[i],dataOut.bfm[i],y[j],three) |
|
2813 | y[j]=fitacf_acf2.acf2(wl,tau,dataOut.te2[i],tion,fion,nue,nui,wion,angle,dataOut.ph2[i],dataOut.bfm[i],y[j],three) | |
| 2814 |
|
2814 | |||
| 2815 | if dataOut.ut_Faraday>11.0 and dataOut.range1[i]>150.0 and dataOut.range1[i]<300.0: |
|
2815 | if dataOut.ut_Faraday>11.0 and dataOut.range1[i]>150.0 and dataOut.range1[i]<300.0: | |
| 2816 |
|
|
2816 | tau=0.0 | |
| 2817 | with suppress_stdout_stderr(): |
|
2817 | with suppress_stdout_stderr(): | |
| 2818 | bline=fitacf_acf2.acf2(wl,tau,tion,tion,fion,nue,nui,wion,angle,dataOut.ph2[i],dataOut.bfm[i],bline,three) |
|
2818 | bline=fitacf_acf2.acf2(wl,tau,tion,tion,fion,nue,nui,wion,angle,dataOut.ph2[i],dataOut.bfm[i],bline,three) | |
| 2819 |
|
2819 | |||
| @@ -2840,7 +2840,7 class DenCorrection(NormalizeDPPowerRoberto_V2): | |||||
| 2840 |
|
2840 | |||
| 2841 | dataOut.ph2[:dataOut.NSHTS]*=aux |
|
2841 | dataOut.ph2[:dataOut.NSHTS]*=aux | |
| 2842 | dataOut.sdp2[:dataOut.NSHTS]*=aux |
|
2842 | dataOut.sdp2[:dataOut.NSHTS]*=aux | |
| 2843 |
|
2843 | |||
| 2844 | def run(self,dataOut,savecf=0): |
|
2844 | def run(self,dataOut,savecf=0): | |
| 2845 | if gmtime(dataOut.utctime).tm_hour < 24. and gmtime(dataOut.utctime).tm_hour >= 11.: |
|
2845 | if gmtime(dataOut.utctime).tm_hour < 24. and gmtime(dataOut.utctime).tm_hour >= 11.: | |
| 2846 | if hasattr(dataOut, 'flagSpreadF') and dataOut.flagSpreadF: |
|
2846 | if hasattr(dataOut, 'flagSpreadF') and dataOut.flagSpreadF: | |
| @@ -3790,9 +3790,9 class SSheightProfiles(Operation): | |||||
| 3790 | self.sshProfiles = numpy.zeros(self.profileShape, dtype=complex) |
|
3790 | self.sshProfiles = numpy.zeros(self.profileShape, dtype=complex) | |
| 3791 |
|
3791 | |||
| 3792 | def run(self, dataOut, step, nsamples, code = None, repeat = None): |
|
3792 | def run(self, dataOut, step, nsamples, code = None, repeat = None): | |
| 3793 |
dataOut.flagNoData = True |
|
3793 | dataOut.flagNoData = True | |
| 3794 | profileIndex = None |
|
3794 | profileIndex = None | |
| 3795 |
dataOut.flagDataAsBlock = False |
|
3795 | dataOut.flagDataAsBlock = False | |
| 3796 |
|
3796 | |||
| 3797 | if not self.isConfig: |
|
3797 | if not self.isConfig: | |
| 3798 | self.setup(dataOut, step=step , nsamples=nsamples) |
|
3798 | self.setup(dataOut, step=step , nsamples=nsamples) | |
General Comments 0
You need to be logged in to leave comments.
Login now