Changes in src/sas/sascalc/calculator/sas_gen.py [952ea1f:144e032a] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/calculator/sas_gen.py
r952ea1f r144e032a 14 14 import numpy as np 15 15 16 from . import _sld2i16 from .core import sld2i as mod 17 17 from .BaseComponent import BaseComponent 18 18 … … 145 145 self.params['Up_frac_out'], 146 146 self.params['Up_theta']) 147 model = _sld2i.new_GenI(*args)147 model = mod.new_GenI(*args) 148 148 if len(qy): 149 149 qx, qy = _vec(qx), _vec(qy) 150 150 I_out = np.empty_like(qx) 151 151 #print("npoints", qx.shape, "npixels", pos_x.shape) 152 _sld2i.genicomXY(model, qx, qy, I_out)152 mod.genicomXY(model, qx, qy, I_out) 153 153 #print("I_out after", I_out) 154 154 else: 155 155 qx = _vec(qx) 156 156 I_out = np.empty_like(qx) 157 _sld2i.genicom(model, qx, I_out)157 mod.genicom(model, qx, I_out) 158 158 vol_correction = self.data_total_volume / self.params['total_volume'] 159 159 result = (self.params['scale'] * vol_correction * I_out … … 304 304 z_dir2 *= z_dir2 305 305 mask = (x_dir2 + y_dir2 + z_dir2) <= 1.0 306 except Exception as exc:307 logger.error( exc)306 except Exception: 307 logger.error(sys.exc_value) 308 308 self.output = MagSLD(self.pos_x[mask], self.pos_y[mask], 309 309 self.pos_z[mask], self.sld_n[mask], … … 600 600 y_lines.append(y_line) 601 601 z_lines.append(z_line) 602 except Exception as exc:603 logger.error( exc)602 except Exception: 603 logger.error(sys.exc_value) 604 604 605 605 output = MagSLD(pos_x, pos_y, pos_z, sld_n, sld_mx, sld_my, sld_mz) … … 691 691 _vol_pix = float(toks[7]) 692 692 vol_pix = np.append(vol_pix, _vol_pix) 693 except Exception as exc:693 except Exception: 694 694 vol_pix = None 695 except Exception as exc:695 except Exception: 696 696 # Skip non-data lines 697 logger.error( exc)697 logger.error(sys.exc_value) 698 698 output = MagSLD(pos_x, pos_y, pos_z, sld_n, 699 699 sld_mx, sld_my, sld_mz)
Note: See TracChangeset
for help on using the changeset viewer.