##// END OF EJS Templates
Version 2.1.3.1
Miguel Valdez -
r669:350fc0523b69
parent child
Show More
@@ -9,6 +9,7 Prerequisites:
9 9 -paramiko and scp (optional for using SendTFilesToServer)
10 10 -stuffr (optional for using jroIO_hf)
11 11 -PyQt4 (for using GUI)
12 -pyfits (Fits data)
12 13
13 14 Signal Chain Installation:
14 15
@@ -12,4 +12,8 VERSIONS:
12 12 Bug fixed selecting heights by block (selecting profiles instead heights)
13 13 -jroproc_voltage.py: New feature added: decoding data by block using FFT.
14 14 -jroIO_heispectra.py: Bug fixed in FitsReader. Using local Fits object instead schainpy.mode.data.jrodata.Fits object.
15 -jroIO_heispectra.py: Channel index list does not exist. No newline at end of file
15 -jroIO_heispectra.py: Channel index list does not exist.
16
17 2.1.3.1:
18 -GUI: every icon were resized
19 -jroproc_voltage.py: Print a message when "Read from code" option is selected and the code is not defined inside data file
@@ -4,4 +4,4 Created on Feb 7, 2012
4 4 @author $Author$
5 5 @version $Id$
6 6 '''
7 __version__ = "2.1.3" No newline at end of file
7 __version__ = "2.1.3.1" No newline at end of file
@@ -7,7 +7,7 if 'linux' in sys.platform:
7 7 matplotlib.use("TKAgg")
8 8
9 9 if 'darwin' in sys.platform:
10 matplotlib.use("WXAgg")
10 matplotlib.use('GTKAgg')
11 11 #Qt4Agg', 'GTK', 'GTKAgg', 'ps', 'agg', 'cairo', 'MacOSX', 'GTKCairo', 'WXAgg', 'template', 'TkAgg', 'GTK3Cairo', 'GTK3Agg', 'svg', 'WebAgg', 'CocoaAgg', 'emf', 'gdk', 'WX'
12 12 import matplotlib.pyplot
13 13
@@ -647,12 +647,18 class Decoder(Operation):
647 647
648 648 def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0, osamp=None, times=None):
649 649
650 dataOut.flagNoData = True
651
650 652 if dataOut.flagDecodeData:
651 653 print "This data is already decoded, recoding again ..."
652 654
653 655 if not self.isConfig:
654 656
655 657 if code is None:
658 if not dataOut.code:
659 print "Code is not defined"
660 raise ValueError, "Code could not be read from %s object. Enter a value in Code parameter" %dataOut.type
661
656 662 code = dataOut.code
657 663 else:
658 664 code = numpy.array(code).reshape(nCode,nBaud)
@@ -707,6 +713,8 class Decoder(Operation):
707 713
708 714 self.__profIndex += 1
709 715
716 dataOut.flagNoData = False
717
710 718 return 1
711 719 # dataOut.flagDeflipData = True #asumo q la data no esta sin flip
712 720
@@ -27,11 +27,11 setup(name="schainpy",
27 27 'schainpy.gui.viewer.windows'},
28 28 py_modules=['schainpy.serializer.DataTranslate',
29 29 'schainpy.serializer.JROSerializer'],
30 package_data={'schainpy.gui.figures': ['*.jpg', '*.jpeg', '*.png', '*.gif']},
30 package_data={'schainpy.gui.figures': ['*.png']},
31 31 include_package_data=True,
32 32 scripts =['schainpy/gui/schainGUI'],
33 33 install_requires=["numpy >= 1.6.0",
34 "scipy >= 0.11.0",
34 "scipy >= 0.9.0",
35 35 "h5py >= 2.0.1",
36 36 "matplotlib >= 1.0.0"
37 37 ],
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now