##// END OF EJS Templates
fixing merge conflicts
fixing merge conflicts

File last commit:

r1074:238914c187b3 merge
r1090:36f30f86830d merge
Show More
__init__.py
20 lines | 407 B | text/x-python | PythonLexer
Miguel Valdez
Merge with branch schain_julia_drifts from rev. 803 to 995....
r568 '''
$Author: murco $
$Id: JRODataIO.py 169 2012-11-19 21:57:03Z murco $
'''
from jroIO_voltage import *
from jroIO_spectra import *
from jroIO_heispectra import *
from jroIO_usrp import *
Jose Chavez
voltage DigitalRFReader funcionando
r973 from jroIO_digitalRF import *
Julio Valdez
Changed name from jroIO_HDF5 to jroIO_param
r848 from jroIO_kamisr import *
from jroIO_param import *
Juan C. Valdez
Version 2.2.5 Fixed several bugs, add jro colormap for spectra/rti, add ParamWriter, TODO: Fix decimation currently disabled
r860 from jroIO_hf import *
ebocanegra
merged into schain_mp
r969
Juan C. Espinoza
Operation MAD2Writer done Task #343
r1021 from jroIO_madrigal import *
Juan C. Espinoza
BLTRParamreader ready
r1010 from bltrIO_param import *
ebocanegra
first commit
r965 from jroIO_bltr import *
from jroIO_mira35c import *