Changeset dce368f in sasview for src/sas/sascalc/calculator


Ignore:
Timestamp:
Jun 16, 2017 1:01:44 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
8f1bb6f
Parents:
e9df8a5 (diff), f2ea95a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ticket-510' into ticket-639-katex

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/calculator/sas_gen.py

    ra1b8fee rf2ea95a  
    913913    def set_sldms(self, sld_mx, sld_my, sld_mz): 
    914914        r""" 
    915         Sets (\|m\|, m_theta, m_phi) 
    916         """ 
     915        Sets mx, my, mz and abs(m). 
     916        """ # Note: escaping 
    917917        if sld_mx.__class__.__name__ == 'float': 
    918918            self.sld_mx = np.ones(len(self.pos_x)) * sld_mx 
Note: See TracChangeset for help on using the changeset viewer.