Changes in src/sas/sascalc/dataloader/readers/sesans_reader.py [b5db35d:9525358] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/readers/sesans_reader.py
rb5db35d r9525358 8 8 import numpy 9 9 import os 10 from sas.sascalc.dataloader.data_info import Data1D10 from sas.sascalc.dataloader.data_info import SESANSData1D 11 11 12 12 # Check whether we have a converter available … … 59 59 raise RuntimeError, "sesans_reader: cannot open %s" % path 60 60 buff = input_f.read() 61 # print buff 61 62 lines = buff.splitlines() 63 # print lines 64 #Jae could not find python universal line spliter: 65 #keep the below for now 66 # some ascii data has \r line separator, 67 # try it when the data is on only one long line 68 # if len(lines) < 2 : 69 # lines = buff.split('\r') 70 62 71 x = numpy.zeros(0) 63 72 y = numpy.zeros(0) … … 74 83 tdlam = numpy.zeros(0) 75 84 tdx = numpy.zeros(0) 76 output = Data1D(x=x, y=y, lam=lam, dy=dy, dx=dx, dlam=dlam, isSesans=True) 85 # print "all good" 86 output = SESANSData1D(x=x, y=y, lam=lam, dy=dy, dx=dx, dlam=dlam) 87 # print output 77 88 self.filename = output.filename = basename 78 89 90 # #Initialize counters for data lines and header lines. 91 # is_data = False # Has more than 5 lines 92 # # More than "5" lines of data is considered as actual 93 # # data unless that is the only data 94 # mum_data_lines = 5 95 # # To count # of current data candidate lines 96 # i = -1 97 # # To count total # of previous data candidate lines 98 # i1 = -1 99 # # To count # of header lines 100 # j = -1 101 # # Helps to count # of header lines 102 # j1 = -1 103 # #minimum required number of columns of data; ( <= 4). 104 # lentoks = 2 79 105 paramnames=[] 80 106 paramvals=[] … … 85 111 Pvals=[] 86 112 dPvals=[] 87 113 # print x 114 # print zvals 88 115 for line in lines: 89 116 # Initial try for CSV (split on ,) … … 95 122 if len(toks)>5: 96 123 zvals.append(toks[0]) 97 dzvals.append(toks[ 3])98 lamvals.append(toks[ 4])99 dlamvals.append(toks[ 5])100 Pvals.append(toks[ 1])101 dPvals.append(toks[ 2])124 dzvals.append(toks[1]) 125 lamvals.append(toks[2]) 126 dlamvals.append(toks[3]) 127 Pvals.append(toks[4]) 128 dPvals.append(toks[5]) 102 129 else: 103 130 continue … … 113 140 default_z_unit = "A" 114 141 data_conv_P = None 115 default_p_unit = " " # Adjust unit for axis (L^-3)142 default_p_unit = " " 116 143 lam_unit = lam_header[1].replace("[","").replace("]","") 117 if lam_unit == 'AA':118 lam_unit = 'A'119 144 varheader=[zvals[0],dzvals[0],lamvals[0],dlamvals[0],Pvals[0],dPvals[0]] 120 145 valrange=range(1, len(zvals)) … … 136 161 output.x, output.x_unit = self._unit_conversion(x, lam_unit, default_z_unit) 137 162 output.y = y 138 output.y_unit = '\AA^{-2} cm^{-1}' # output y_unit added139 163 output.dx, output.dx_unit = self._unit_conversion(dx, lam_unit, default_z_unit) 140 164 output.dy = dy … … 142 166 output.dlam, output.dlam_unit = self._unit_conversion(dlam, lam_unit, default_z_unit) 143 167 144 output.xaxis( "\\rm{z}", output.x_unit)145 output.yaxis( "\\rm{ln(P)/(t \lambda^2)}", output.y_unit) # Adjust label to ln P/(lam^2 t), remove lam column refs168 output.xaxis(r"\rm{z}", output.x_unit) 169 output.yaxis(r"\rm{P/P0}", output.y_unit) 146 170 # Store loading process information 147 171 output.meta_data['loader'] = self.type_name 148 #output.sample.thickness = float(paramvals[6])172 output.sample.thickness = float(paramvals[6]) 149 173 output.sample.name = paramvals[1] 150 174 output.sample.ID = paramvals[0] 151 175 zaccept_unit_split = paramnames[7].split("[") 152 176 zaccept_unit = zaccept_unit_split[1].replace("]","") 153 if zaccept_unit.strip() == '\AA^-1' or zaccept_unit.strip() == '\A^-1':177 if zaccept_unit.strip() == r'\AA^-1': 154 178 zaccept_unit = "1/A" 155 179 output.sample.zacceptance=(float(paramvals[7]),zaccept_unit) 156 output.vars =varheader180 output.vars=varheader 157 181 158 182 if len(output.x) < 1:
Note: See TracChangeset
for help on using the changeset viewer.