| @@ -174,7 +174,7 class JROData(GenericData): | |||
|
|
174 | 174 | |
|
|
175 | 175 | # ippSeconds = None |
|
|
176 | 176 | |
|
|
177 | timeInterval = None | |
|
|
177 | # timeInterval = None | |
|
|
178 | 178 | |
|
|
179 | 179 | nCohInt = None |
|
|
180 | 180 | |
| @@ -292,6 +292,10 class JROData(GenericData): | |||
|
|
292 | 292 | ''' |
|
|
293 | 293 | |
|
|
294 | 294 | self.datatype = getDataTypeCode(numpyDtype) |
|
|
295 | ||
|
|
296 | # def getTimeInterval(self): | |
|
|
297 | # | |
|
|
298 | # raise IOError, "This method should be implemented inside each Class" | |
|
|
295 | 299 | |
|
|
296 | 300 | nChannels = property(getNChannels, "I'm the 'nChannel' property.") |
|
|
297 | 301 | channelIndexList = property(getChannelIndexList, "I'm the 'channelIndexList' property.") |
| @@ -301,6 +305,7 class JROData(GenericData): | |||
|
|
301 | 305 | ltctime = property(getltctime, "I'm the 'ltctime' property") |
|
|
302 | 306 | ippSeconds = property(get_ippSeconds, set_ippSeconds) |
|
|
303 | 307 | dtype = property(get_dtype, set_dtype) |
|
|
308 | # timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property") | |
|
|
304 | 309 | |
|
|
305 | 310 | class Voltage(JROData): |
|
|
306 | 311 | |
| @@ -356,6 +361,7 class Voltage(JROData): | |||
|
|
356 | 361 | |
|
|
357 | 362 | self.flagShiftFFT = False |
|
|
358 | 363 | |
|
|
364 | self.flagDataAsBlock = False #Asumo que la data es leida perfil a perfil | |
|
|
359 | 365 | |
|
|
360 | 366 | def getNoisebyHildebrand(self): |
|
|
361 | 367 | """ |
| @@ -380,8 +386,15 class Voltage(JROData): | |||
|
|
380 | 386 | |
|
|
381 | 387 | return 10*numpy.log10(noise) |
|
|
382 | 388 | |
|
|
383 | noise = property(getNoise, "I'm the 'nHeights' property.") | |
|
|
389 | def getTimeInterval(self): | |
|
|
384 | 390 | |
|
|
391 | timeInterval = self.ippSeconds * self.nCohInt | |
|
|
392 | ||
|
|
393 | return timeInterval | |
|
|
394 | ||
|
|
395 | noise = property(getNoise, "I'm the 'nHeights' property.") | |
|
|
396 | timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property") | |
|
|
397 | ||
|
|
385 | 398 | class Spectra(JROData): |
|
|
386 | 399 | |
|
|
387 | 400 | #data es un numpy array de 2 dmensiones (canales, perfiles, alturas) |
| @@ -535,13 +548,20 class Spectra(JROData): | |||
|
|
535 | 548 | |
|
|
536 | 549 | return False |
|
|
537 | 550 | |
|
|
551 | def getTimeInterval(self): | |
|
|
552 | ||
|
|
553 | timeInterval = self.ippSeconds * self.nCohInt * self.nIncohInt * self.nProfiles | |
|
|
554 | ||
|
|
555 | return timeInterval | |
|
|
556 | ||
|
|
538 | 557 | nPairs = property(getNPairs, "I'm the 'nPairs' property.") |
|
|
539 | 558 | pairsIndexList = property(getPairsIndexList, "I'm the 'pairsIndexList' property.") |
|
|
540 | 559 | normFactor = property(getNormFactor, "I'm the 'getNormFactor' property.") |
|
|
541 | 560 | flag_cspc = property(getFlagCspc) |
|
|
542 | 561 | flag_dc = property(getFlagDc) |
|
|
543 | 562 | noise = property(getNoise, "I'm the 'nHeights' property.") |
|
|
544 | ||
|
|
563 | timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property") | |
|
|
564 | ||
|
|
545 | 565 | class SpectraHeis(Spectra): |
|
|
546 | 566 | |
|
|
547 | 567 | data_spc = None |
| @@ -599,7 +619,14 class SpectraHeis(Spectra): | |||
|
|
599 | 619 | |
|
|
600 | 620 | return normFactor |
|
|
601 | 621 | |
|
|
622 | def getTimeInterval(self): | |
|
|
623 | ||
|
|
624 | timeInterval = self.ippSeconds * self.nCohInt * self.nIncohInt | |
|
|
625 | ||
|
|
626 | return timeInterval | |
|
|
627 | ||
|
|
602 | 628 | normFactor = property(getNormFactor, "I'm the 'getNormFactor' property.") |
|
|
629 | timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property") | |
|
|
603 | 630 | |
|
|
604 | 631 | class Fits: |
|
|
605 | 632 | |
| @@ -619,7 +646,7 class Fits: | |||
|
|
619 | 646 | |
|
|
620 | 647 | # ippSeconds = None |
|
|
621 | 648 | |
|
|
622 | timeInterval = None | |
|
|
649 | # timeInterval = None | |
|
|
623 | 650 | |
|
|
624 | 651 | nCohInt = None |
|
|
625 | 652 | |
| @@ -736,6 +763,10 class Fits: | |||
|
|
736 | 763 | |
|
|
737 | 764 | return noise |
|
|
738 | 765 | |
|
|
766 | def getTimeInterval(self): | |
|
|
767 | ||
|
|
768 | raise ValueError, "This method is not implemented yet" | |
|
|
769 | ||
|
|
739 | 770 | datatime = property(getDatatime, "I'm the 'datatime' property") |
|
|
740 | 771 | nHeights = property(getNHeights, "I'm the 'nHeights' property.") |
|
|
741 | 772 | nChannels = property(getNChannels, "I'm the 'nChannel' property.") |
| @@ -743,7 +774,8 class Fits: | |||
|
|
743 | 774 | noise = property(getNoise, "I'm the 'nHeights' property.") |
|
|
744 | 775 | datatime = property(getDatatime, "I'm the 'datatime' property") |
|
|
745 | 776 | ltctime = property(getltctime, "I'm the 'ltctime' property") |
|
|
746 | ||
|
|
777 | timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property") | |
|
|
778 | ||
|
|
747 | 779 | class Correlation(JROData): |
|
|
748 | 780 | |
|
|
749 | 781 | noise = None |
General Comments 0
You need to be logged in to leave comments.
Login now