Changeset c99e717 in sasview


Ignore:
Timestamp:
Jan 26, 2018 2:39:56 AM (6 years ago)
Author:
GitHub <noreply@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b6f9c9f
Parents:
e110cb0 (diff), 501712f (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.
git-author:
Adam Washington <rprospero@…> (01/26/18 02:39:56)
git-committer:
GitHub <noreply@…> (01/26/18 02:39:56)
Message:

Merge pull request #139 from rprospero/Ticket_997

Remove all instances of \text from the repo (Ticket #977)

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/conf.py

    r3ca67dcf r8cc9048  
    224224\newcommand{\lt}{<}              % HTML needs \lt rather than < 
    225225\newcommand{\gt}{>}              % HTML needs \gt rather than > 
    226 \renewcommand{\AA}{\text{\r{A}}} % Allow \AA in math mode 
     226\renewcommand{\AA}{\mathrm{\r{A}}} % Allow \AA in math mode 
    227227\DeclareUnicodeCharacter {212B} {\AA}                  % Angstrom 
    228228\DeclareUnicodeCharacter {00B7} {\ensuremath{\cdot}}   % cdot 

  • src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst

    r5ed76f8 r3bd58f0  
    2929   careful to note that distances are specified in cm! 
    3030 
    31 4) Enter values for the source wavelength(s), $\lambda$, and its spread (= $\text{FWHM}/\lambda$). 
     314) Enter values for the source wavelength(s), $\lambda$, and its spread (= $\mathrm{FWHM}/\lambda$). 
    3232 
    3333   For monochromatic sources, the inputs are just one value. For TOF sources, 
    … …  
    5858   region near the beam block/stop 
    5959 
    60    [i.e., $Q < (2 \pi \cdot \text{beam block diameter}) / (\text{sample-to-detector distance} \cdot \lambda_\text{min})$] 
     60   [i.e., $Q < (2 \pi \cdot w) / (d_s \cdot \lambda_\mathrm{min})$, where $w$ is the beam block diameter, $d_s$ is the sample-to-detector distance, and $\lambda_\mathrm{min}$ is the minimum wavelength.] 
    6161 
    6262   the variance is slightly under estimated. 

  • src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst

    r1b67f3e r55abe4f  
    8888 
    8989Now let us assume that the angles of the $\vec Q$ vector and the spin-axis ($x'$) 
    90 to the $x$-axis are $\phi$ and $\theta_\text{up}$ respectively (see above). Then, 
     90to the $x$-axis are $\phi$ and $\theta_\mathrm{up}$ respectively (see above). Then, 
    9191depending upon the polarization (spin) state of neutrons, the scattering 
    9292length densities, including the nuclear scattering length density ($\beta_N$) 
    … …  
    107107.. math:: 
    108108 
    109     M_{\perp x'} &= M_{0q_x}\cos\theta_\text{up} + M_{0q_y}\sin\theta_\text{up} \\ 
    110     M_{\perp y'} &= M_{0q_y}\cos\theta_\text{up} - M_{0q_x}\sin\theta_\text{up} \\ 
     109    M_{\perp x'} &= M_{0q_x}\cos\theta_\mathrm{up} + M_{0q_y}\sin\theta_\mathrm{up} \\ 
     110    M_{\perp y'} &= M_{0q_y}\cos\theta_\mathrm{up} - M_{0q_x}\sin\theta_\mathrm{up} \\ 
    111111    M_{\perp z'} &= M_{0z} \\ 
    112112    M_{0q_x} &= (M_{0x}\cos\phi - M_{0y}\sin\phi)\cos\phi \\ 

  • src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

    rad476d1 r501712f  
    188188*   Average Hard Block Thickness :math:`= L_c` 
    189189*   Average Core Thickness :math:`= D_0` 
    190 *   Average Interface Thickness :math:`\text{} = D_{tr}` 
    191 *   Polydispersity :math:`= \Gamma_{\text{min}}/\Gamma_{\text{max}}` 
     190*   Average Interface Thickness :math:`= D_{tr}` 
     191*   Polydispersity :math:`= \Gamma_{\mathrm{min}}/\Gamma_{\mathrm{max}}` 
    192192*   Local Crystallinity :math:`= L_c/L_p` 
    193193 
    … …  
    203203*   Bound Fraction :math:`= <p>` 
    204204*   Second Moment :math:`= \sigma` 
    205 *   Maximum Extent :math:`= \delta_{\text{h}}` 
     205*   Maximum Extent :math:`= \delta_{\mathrm{h}}` 
    206206*   Adsorbed Amount :math:`= \Gamma` 
    207207 

  • installers/installer_generator.py

    r460d3a1 ra0f4768  
    99import sys 
    1010import string 
     11 
     12is_64bit = sys.maxsize > 2**32 
    1113 
    1214root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
    … …  
    2527AppSupportURL = local_config._homepage 
    2628AppUpdatesURL = local_config._homepage 
     29ArchitecturesInstallIn64BitMode = 'x64' 
    2730ChangesEnvironment = 'true' 
    2831DefaultDirName = os.path.join("{pf}" , AppName+Dev) 
    … …  
    343346    TEMPLATE += "AppSupportURL=%s\n" % str(AppSupportURL) 
    344347    TEMPLATE += "AppUpdatesURL=%s \n" % str(AppUpdatesURL) 
     348    if is_64bit: 
     349        TEMPLATE += "ArchitecturesInstallIn64BitMode=%s \n" % str(ArchitecturesInstallIn64BitMode) 
    345350    TEMPLATE += "ChangesEnvironment=%s \n" % str(ChangesEnvironment) 
    346351    TEMPLATE += "DefaultDirName=%s\n" % str(DefaultDirName) 

  • src/sas/sasgui/perspectives/fitting/basepage.py

    reee94bf r58a8f76  
    28122812        if self.model is not None: 
    28132813            name = self.formfactorbox.GetValue() 
    2814             _TreeLocation = 'user/models/' + name.lower()+'.html' 
     2814            _TreeLocation = 'user/models/%s.html' % name 
    28152815            _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, 
    28162816                                              "", name + " Help") 
Note: See TracChangeset for help on using the changeset viewer.