Changeset 1478


Ignore:
Timestamp:
Aug 25, 2014 4:47:28 PM (9 years ago)
Author:
vondreele
Message:

Fix CW & TOF hydrostatic strain calculations & change disply formats
work on TOF size/mustrain calcs.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/GSASIIddataGUI.py

    r1455 r1478  
    420420        except ValueError:
    421421            pass
    422         Obj.SetValue("%.5f"%(UseList[hist]['HStrain'][0][pid]))          #reset in case of error
     422        Obj.SetValue("%.3g"%(UseList[hist]['HStrain'][0][pid]))          #reset in case of error
    423423
    424424    def OnPOVal(event):
    … …  
    690690            hstrainRef.Bind(wx.EVT_CHECKBOX, OnHstrainRef)
    691691            hstrainSizer.Add(hstrainRef,0,WACV)
    692             hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.5f'%(val),style=wx.TE_PROCESS_ENTER)
     692            hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3g'%(val),style=wx.TE_PROCESS_ENTER)
    693693            Indx[hstrainVal.GetId()] = [item,id]
    694694            hstrainVal.Bind(wx.EVT_TEXT_ENTER,OnHstrainVal)

  • trunk/GSASIIstrIO.py

    r1475 r1478  
    16611661        for i,name in enumerate(Hsnames):
    16621662            ptlbls += '%12s' % (name)
    1663             ptstr += '%12.6f' % (hapData[0][i])
     1663            ptstr += '%12.4g' % (hapData[0][i])
    16641664            varstr += '%12s' % (str(hapData[1][i]))
    16651665        print >>pFile,ptlbls
    … …  
    19711971        for i,name in enumerate(Hsnames):
    19721972            ptlbls += '%12s' % (name)
    1973             ptstr += '%12.6g' % (hapData[0][i])
     1973            ptstr += '%12.4g' % (hapData[0][i])
    19741974            if name in strainSig:
    19751975                refine = True
    1976                 sigstr += '%12.6g' % (strainSig[name])
     1976                sigstr += '%12.4g' % (strainSig[name])
    19771977            else:
    19781978                sigstr += 12*' '

  • trunk/GSASIIstrMath.py

    r1475 r1478  
    12001200            cosP,sinP = G2lat.CosSinAngle(H,P,G)
    12011201            Sgam = 1.e-4*parmDict[hfx+'difC']*(parmDict[phfx+'Size;i']*parmDict[phfx+'Size;a'])
    1202             Sgam *= np.sqrt((sinP*parmDict[phfx+'Size;a'])**2+(cosP*parmDict[phfx+'Size;i'])**2)
     1202            Sgam /= np.sqrt((sinP*parmDict[phfx+'Size;a'])**2+(cosP*parmDict[phfx+'Size;i'])**2)
    12031203        else:           #ellipsoidal crystallites
    12041204            Sij =[parmDict[phfx+'Size:%d'%(i)] for i in range(6)]
    … …  
    12081208        #microstrain               
    12091209        if calcControls[phfx+'MustrainType'] == 'isotropic':
    1210             Mgam = 1.e-6*parmDict[hfx+'difC']*parmDict[phfx+'Mustrain;i']
     1210            Mgam = 1.e-6*parmDict[hfx+'difC']*refl[4]*parmDict[phfx+'Mustrain;i']
    12111211        elif calcControls[phfx+'MustrainType'] == 'uniaxial':
    12121212            H = np.array(refl[:3])
    … …  
    12151215            Si = parmDict[phfx+'Mustrain;i']
    12161216            Sa = parmDict[phfx+'Mustrain;a']
    1217             Mgam = 1.e-6*parmDict[hfx+'difC']*Si*Sa/np.sqrt((Si*cosP)**2+(Sa*sinP)**2)
     1217            Mgam = 1.e-6*parmDict[hfx+'difC']*refl[4]*Si*Sa/np.sqrt((Si*cosP)**2+(Sa*sinP)**2)
    12181218        else:       #generalized - P.W. Stephens model
    12191219            pwrs = calcControls[phfx+'MuPwrs']
    … …  
    13051305    else:   #'T'OF
    13061306        if calcControls[phfx+'SizeType'] == 'isotropic':
    1307             Sgam = 1.e-4*parmDict[hfx+'difC']*parmDict[phfx+'Size;i']
    1308             gamDict[phfx+'Size;i'] = 1.e-4*parmDict[hfx+'difC']*parmDict[phfx+'Size;mx']
    1309             sigDict[phfx+'Size;i'] = 1.e-4*parmDict[hfx+'difC']*Sgam*(1.-parmDict[phfx+'Size;mx'])**2/ateln2
     1307            Sgam = 1.e-4*parmDict[hfx+'difC']*refl[4]*parmDict[phfx+'Size;i']
     1308            gamDict[phfx+'Size;i'] = 1.e-4*parmDict[hfx+'difC']*refl[4]*parmDict[phfx+'Size;mx']
     1309            sigDict[phfx+'Size;i'] = 2.e-4*parmDict[hfx+'difC']*refl[4]*Sgam*(1.-parmDict[phfx+'Size;mx'])**2/ateln2
    13101310        elif calcControls[phfx+'SizeType'] == 'uniaxial':
    1311             const = 1.e-4*parmDict[hfx+'difC']
     1311            const = 1.e-4*parmDict[hfx+'difC']*refl[4]
    13121312            H = np.array(refl[:3])
    13131313            P = np.array(calcControls[phfx+'SizeAxis'])
    … …  
    13381338        #microstrain derivatives               
    13391339        if calcControls[phfx+'MustrainType'] == 'isotropic':
    1340             Mgam = 1.e-6*parmDict[hfx+'difC']*parmDict[phfx+'Mustrain;i']
     1340            Mgam = 1.e-6*parmDict[hfx+'difC']*refl[4]*parmDict[phfx+'Mustrain;i']
    13411341            gamDict[phfx+'Mustrain;i'] =  1.e-6*parmDict[hfx+'difC']*parmDict[phfx+'Mustrain;mx']
    13421342            sigDict[phfx+'Mustrain;i'] =  2.e-6*parmDict[hfx+'difC']*Mgam*(1.-parmDict[phfx+'Mustrain;mx'])**2/ateln2       
    … …  
    14251425        return dpdA,dpdZ,dpdDC,dpdDA,dpdDB
    14261426           
    1427 def GetHStrainShift(refl,SGData,phfx,parmDict):
     1427def GetHStrainShift(refl,SGData,phfx,hfx,calcControls,parmDict):
    14281428    'Needs a doc string'
    14291429    laue = SGData['SGLaue']
    … …  
    14521452        Dij = parmDict[phfx+'D11']*h**2+parmDict[phfx+'D22']*k**2+parmDict[phfx+'D33']*l**2+ \
    14531453            parmDict[phfx+'D12']*h*k+parmDict[phfx+'D13']*h*l+parmDict[phfx+'D23']*k*l
    1454     return -Dij*refl[4]**2*tand(refl[5]/2.0)
     1454    if 'C' in calcControls[hfx+'histType']:
     1455        return -180.*Dij*refl[4]**2*tand(refl[5]/2.0)/np.pi
     1456    else:
     1457        return -Dij*parmDict[hfx+'difC']*refl[4]**2/2.
    14551458           
    1456 def GetHStrainShiftDerv(refl,SGData,phfx):
     1459def GetHStrainShiftDerv(refl,SGData,phfx,hfx,calcControls,parmDict):
    14571460    'Needs a doc string'
    14581461    laue = SGData['SGLaue']
    … …  
    14821485        dDijDict = {phfx+'D11':h**2,phfx+'D22':k**2,phfx+'D33':l**2,
    14831486            phfx+'D12':h*k,phfx+'D13':h*l,phfx+'D23':k*l}
    1484     for item in dDijDict:
    1485         dDijDict[item] *= -refl[4]**2*tand(refl[5]/2.0)
     1487    if 'C' in calcControls[hfx+'histType']:
     1488        for item in dDijDict:
     1489            dDijDict[item] *= -180.0*refl[4]**2*tand(refl[5]/2.0)/np.pi
     1490    else:
     1491        for item in dDijDict:
     1492            dDijDict[item] *= -parmDict[hfx+'difC']*refl[4]**2/2.
    14861493    return dDijDict
    14871494   
    … …  
    15831590        gam = parmDict[hfx+'X']*refl[4]+parmDict[hfx+'Y']*refl[4]**2
    15841591        Ssig,Sgam = GetSampleSigGam(refl,0.0,G,GB,hfx,phfx,calcControls,parmDict)
    1585         sig += Ssig     #save peak sigma
     1592        sig += Ssig
    15861593        sig = max(0.001,sig)
    1587         gam += Sgam     #save peak gamma
     1594        gam += Sgam
    15881595        gam = max(0.001,gam)
    15891596        return sig,gam
    … …  
    16361643                refl[5] = GetReflPos(refl,wave,G,hfx,calcControls,parmDict)         #corrected reflection position
    16371644                Lorenz = 1./(2.*sind(refl[5]/2.)**2*cosd(refl[5]/2.))           #Lorentz correction
    1638                 refl[5] += GetHStrainShift(refl,SGData,phfx,parmDict)               #apply hydrostatic strain shift
     1645                refl[5] += GetHStrainShift(refl,SGData,phfx,hfx,calcControls,parmDict)               #apply hydrostatic strain shift
    16391646                refl[6:8] = GetReflSigGamCW(refl,wave,G,GB,phfx,calcControls,parmDict)    #peak sig & gam
    16401647                refl[11:15] = GetIntensityCorr(refl,Uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict)
    … …  
    16711678                refl[5] = GetReflPos(refl,0.0,G,hfx,calcControls,parmDict)         #corrected reflection position
    16721679                Lorenz = sind(parmDict[hfx+'2-theta']/2)*refl[4]**4                                                #TOF Lorentz correction
    1673                 refl[5] += GetHStrainShift(refl,SGData,phfx,parmDict)               #apply hydrostatic strain shift
     1680                refl[5] += GetHStrainShift(refl,SGData,phfx,hfx,calcControls,parmDict)               #apply hydrostatic strain shift
    16741681                refl[6:8] = GetReflSigGamTOF(refl,G,GB,phfx,calcControls,parmDict)    #peak sig & gam
    16751682                refl[12:14] = GetReflAlpBet(refl,hfx,parmDict)
    … …  
    19041911                    if Ka2:
    19051912                        depDerivDict[name][iBeg2:iFin2] += dpdA*dervDict2['pos']
    1906             dDijDict = GetHStrainShiftDerv(refl,SGData,phfx)
     1913            dDijDict = GetHStrainShiftDerv(refl,SGData,phfx,hfx,calcControls,parmDict)
    19071914            for name in dDijDict:
    19081915                if name in varylist:

  • trunk/help/MCSA in GSAS.htm

    r1475 r1478  
    2323  <o:Author>vondreele</o:Author>
    2424  <o:LastAuthor>Von Dreele</o:LastAuthor>
    25   <o:Revision>14</o:Revision>
    26   <o:TotalTime>579</o:TotalTime>
     25  <o:Revision>15</o:Revision>
     26  <o:TotalTime>580</o:TotalTime>
    2727  <o:Created>2014-08-19T14:01:00Z</o:Created>
    28   <o:LastSaved>2014-08-22T13:42:00Z</o:LastSaved>
     28  <o:LastSaved>2014-08-25T14:05:00Z</o:LastSaved>
    2929  <o:Pages>9</o:Pages>
    3030  <o:Words>2418</o:Words>
    … …  
    955955<p class=MsoNormal>In these exercises you will use GSAS-II to solve the
    956956structures of 3-aminoquinoline and &#945;-d-lactose monohydrate from powder
    957 diffraction data via Monte Carlo/Simulated Annealing (MC/SA). The data sets were
    958 kindly provided by Peter Stephens (SUNY <span class=SpellE>StonyBrook</span>)
    959 and were originally collected on NSLS beam line X17b. The MC/SA technique is
     957diffraction data via Monte Carlo/Simulated Annealing (MC/SA). The data sets
     958were kindly provided by Peter Stephens (SUNY <span class=SpellE>StonyBrook</span>)
     959and were originally collected on NSLS beam line X3b1. The MC/SA technique is
    960960needed in these cases because as you will see the data does not extend very far
    961961in 2&#920; so one cannot use charge flipping to solve them. The steps for each
    … …  
    10511051 <v:imagedata src="MCSA%20in%20GSAS_files/image001.png" o:title=""/>
    10521052</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
    1053 src="MCSA%20in%20GSAS_files/image002.gif" v:shapes="_x0000_i1051"><![endif]></span></p>
     1053src="MCSA%20in%20GSAS_files/image031.gif" v:shapes="_x0000_i1051"><![endif]></span></p>
    10541054
    10551055<p class=MsoListParagraph><o:p>&nbsp;</o:p></p>
    … …  
    11721172style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]>Select
    11731173<b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
    1174 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>Sample
    1175 Parameters</span></b> and uncheck refinement of <b style='mso-bidi-font-weight:
    1176 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
    1177 minor-latin;mso-hansi-theme-font:minor-latin'>Histogram scale factor</span></b>.</p>
     1174mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>Sample Parameters</span></b>
     1175and uncheck refinement of <b style='mso-bidi-font-weight:normal'><span
     1176style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
     1177mso-hansi-theme-font:minor-latin'>Histogram scale factor</span></b>.</p>
    11781178
    11791179<p class=MsoListParagraph style='text-indent:-.25in;mso-list:l1 level1 lfo4'><![if !supportLists]><span
    … …  
    12011201 <v:imagedata src="MCSA%20in%20GSAS_files/image003.png" o:title=""/>
    12021202</v:shape><![endif]--><![if !vml]><img border=0 width=621 height=500
    1203 src="MCSA%20in%20GSAS_files/image004.gif" v:shapes="Picture_x0020_2"><![endif]></span></p>
     1203src="MCSA%20in%20GSAS_files/image032.gif" v:shapes="Picture_x0020_2"><![endif]></span></p>
    12041204
    12051205<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    12181218 <v:imagedata src="MCSA%20in%20GSAS_files/image005.png" o:title=""/>
    12191219</v:shape><![endif]--><![if !vml]><img border=0 width=346 height=336
    1220 src="MCSA%20in%20GSAS_files/image006.gif" v:shapes="Picture_x0020_3"><![endif]></span></p>
     1220src="MCSA%20in%20GSAS_files/image033.gif" v:shapes="Picture_x0020_3"><![endif]></span></p>
    12211221
    12221222<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    12331233 <v:imagedata src="MCSA%20in%20GSAS_files/image007.png" o:title=""/>
    12341234</v:shape><![endif]--><![if !vml]><img border=0 width=479 height=500
    1235 src="MCSA%20in%20GSAS_files/image008.gif" v:shapes="Picture_x0020_28"><![endif]></span></p>
     1235src="MCSA%20in%20GSAS_files/image034.gif" v:shapes="Picture_x0020_28"><![endif]></span></p>
    12361236
    12371237<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    12651265 <v:imagedata src="MCSA%20in%20GSAS_files/image009.png" o:title=""/>
    12661266</v:shape><![endif]--><![if !vml]><img border=0 width=450 height=300
    1267 src="MCSA%20in%20GSAS_files/image010.gif" v:shapes="Picture_x0020_5"><![endif]></span></p>
     1267src="MCSA%20in%20GSAS_files/image035.gif" v:shapes="Picture_x0020_5"><![endif]></span></p>
    12681268
    12691269<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    12941294 <v:imagedata src="MCSA%20in%20GSAS_files/image011.png" o:title=""/>
    12951295</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
    1296 src="MCSA%20in%20GSAS_files/image012.gif" v:shapes="Picture_x0020_6"><![endif]></span></p>
     1296src="MCSA%20in%20GSAS_files/image036.gif" v:shapes="Picture_x0020_6"><![endif]></span></p>
    12971297
    12981298<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    13371337 <v:imagedata src="MCSA%20in%20GSAS_files/image013.png" o:title=""/>
    13381338</v:shape><![endif]--><![if !vml]><img border=0 width=536 height=263
    1339 src="MCSA%20in%20GSAS_files/image014.gif" v:shapes="Picture_x0020_7"><![endif]></span></p>
     1339src="MCSA%20in%20GSAS_files/image037.gif" v:shapes="Picture_x0020_7"><![endif]></span></p>
    13401340
    13411341<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    13711371 <v:imagedata src="MCSA%20in%20GSAS_files/image015.png" o:title=""/>
    13721372</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
    1373 src="MCSA%20in%20GSAS_files/image016.gif" v:shapes="Picture_x0020_33"><![endif]></span></p>
     1373src="MCSA%20in%20GSAS_files/image038.gif" v:shapes="Picture_x0020_33"><![endif]></span></p>
    13741374
    13751375<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    13801380<h2><span class=GramE>Step 6.</span> Setup for Monte Carlo/Simulated Annealing</h2>
    13811381
    1382 <p class=MsoNormal>The molecular structure of 3-aminoquinoline is two aromatic
    1383 rings with one N-substituted position and an amino side group</p>
     1382<p class=MsoNormal>The molecular structure of 3-aminoquinoline is two aromatic rings
     1383with one N-substituted position and an amino side group</p>
    13841384
    13851385<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
    … …  
    13891389  cropbottom="17428f" cropleft="9893f" cropright="13874f"/>
    13901390</v:shape><![endif]--><![if !vml]><img border=0 width=190 height=125
    1391 src="MCSA%20in%20GSAS_files/image018.jpg" v:shapes="Picture_x0020_34"><![endif]></span></p>
     1391src="MCSA%20in%20GSAS_files/image039.jpg" v:shapes="Picture_x0020_34"><![endif]></span></p>
    13921392
    13931393<p class=MsoNormal>MC/SA structure solution consists of optimizing the position
    … …  
    14231423 <v:imagedata src="MCSA%20in%20GSAS_files/image019.png" o:title=""/>
    14241424</v:shape><![endif]--><![if !vml]><img border=0 width=400 height=427
    1425 src="MCSA%20in%20GSAS_files/image020.gif" v:shapes="Picture_x0020_35"><![endif]></span></p>
     1425src="MCSA%20in%20GSAS_files/image040.gif" v:shapes="Picture_x0020_35"><![endif]></span></p>
    14261426
    14271427<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    14381438  cropbottom="15961f" cropleft="36898f" cropright="13504f"/>
    14391439</v:shape><![endif]--><![if !vml]><img border=0 width=382 height=312
    1440 src="MCSA%20in%20GSAS_files/image022.jpg" v:shapes="Picture_x0020_1"><![endif]></span></p>
     1440src="MCSA%20in%20GSAS_files/image041.jpg" v:shapes="Picture_x0020_1"><![endif]></span></p>
    14411441
    14421442<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    14541454  cropbottom="16027f" cropleft="37724f" cropright="12673f"/>
    14551455</v:shape><![endif]--><![if !vml]><img border=0 width=384 height=313
    1456 src="MCSA%20in%20GSAS_files/image024.jpg" v:shapes="Picture_x0020_36"><![endif]></span></p>
     1456src="MCSA%20in%20GSAS_files/image042.jpg" v:shapes="Picture_x0020_36"><![endif]></span></p>
    14571457
    14581458<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    14621462necessary. You should change the <b style='mso-bidi-font-weight:normal'><span
    14631463style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1464 mso-hansi-theme-font:minor-latin'>Residue name</span></b> to something
    1465 meaningful, I used <b style='mso-bidi-font-weight:normal'><span
    1466 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1467 mso-hansi-theme-font:minor-latin'>amino</span></b>.</p>
     1464mso-hansi-theme-font:minor-latin'>Residue name</span></b> to something meaningful,
     1465I used <b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
     1466mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>amino</span></b>.</p>
    14681467
    14691468<p class=MsoNormal>Next go to <b style='mso-bidi-font-weight:normal'><span
    … …  
    14841483 <v:imagedata src="MCSA%20in%20GSAS_files/image025.png" o:title=""/>
    14851484</v:shape><![endif]--><![if !vml]><img border=0 width=598 height=335
    1486 src="MCSA%20in%20GSAS_files/image026.gif" v:shapes="Picture_x0020_37"><![endif]></span></p>
     1485src="MCSA%20in%20GSAS_files/image043.gif" v:shapes="Picture_x0020_37"><![endif]></span></p>
    14871486
    14881487<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    14961495  cropbottom="12829f" cropleft="38911f" cropright="11642f"/>
    14971496</v:shape><![endif]--><![if !vml]><img border=0 width=384 height=310
    1498 src="MCSA%20in%20GSAS_files/image027.jpg" v:shapes="Picture_x0020_14"><![endif]></span></p>
     1497src="MCSA%20in%20GSAS_files/image045.jpg" v:shapes="Picture_x0020_14"><![endif]></span></p>
    14991498
    15001499<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    15441543 <v:imagedata src="MCSA%20in%20GSAS_files/image029.png" o:title=""/>
    15451544</v:shape><![endif]--><![if !vml]><img border=0 width=598 height=258
    1546 src="MCSA%20in%20GSAS_files/image028.gif" v:shapes="Picture_x0020_39"><![endif]></span><span
     1545src="MCSA%20in%20GSAS_files/image046.gif" v:shapes="Picture_x0020_39"><![endif]></span><span
    15471546style='mso-spacerun:yes'> </span></p>
    15481547
    … …  
    16181617 <v:imagedata src="MCSA%20in%20GSAS_files/image030.png" o:title=""/>
    16191618</v:shape><![endif]--><![if !vml]><img border=0 width=672 height=500
    1620 src="MCSA%20in%20GSAS_files/image047.gif" v:shapes="Picture_x0020_16"><![endif]></span></p>
     1619src="MCSA%20in%20GSAS_files/image058.gif" v:shapes="Picture_x0020_16"><![endif]></span></p>
    16211620
    16221621<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    16401639 <v:imagedata src="MCSA%20in%20GSAS_files/image048.png" o:title=""/>
    16411640</v:shape><![endif]--><![if !vml]><img border=0 width=747 height=365
    1642 src="MCSA%20in%20GSAS_files/image049.gif" v:shapes="Picture_x0020_19"><![endif]></span></p>
     1641src="MCSA%20in%20GSAS_files/image059.gif" v:shapes="Picture_x0020_19"><![endif]></span></p>
    16431642
    16441643<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    16531652  cropbottom="16530f" cropleft="37715f" cropright="13079f"/>
    16541653</v:shape><![endif]--><![if !vml]><img border=0 width=373 height=325
    1655 src="MCSA%20in%20GSAS_files/image051.jpg" v:shapes="Picture_x0020_20"><![endif]></span></p>
     1654src="MCSA%20in%20GSAS_files/image060.jpg" v:shapes="Picture_x0020_20"><![endif]></span></p>
    16561655
    16571656<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    16911690 <v:imagedata src="MCSA%20in%20GSAS_files/image052.png" o:title=""/>
    16921691</v:shape><![endif]--><![if !vml]><img border=0 width=759 height=380
    1693 src="MCSA%20in%20GSAS_files/image053.gif" v:shapes="Picture_x0020_22"><![endif]></span></p>
     1692src="MCSA%20in%20GSAS_files/image061.gif" v:shapes="Picture_x0020_22"><![endif]></span></p>
    16941693
    16951694<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    17041703  cropbottom="16469f" cropleft="37988f" cropright="12498f"/>
    17051704</v:shape><![endif]--><![if !vml]><img border=0 width=385 height=331
    1706 src="MCSA%20in%20GSAS_files/image055.jpg" v:shapes="Picture_x0020_23"><![endif]></span></p>
     1705src="MCSA%20in%20GSAS_files/image062.jpg" v:shapes="Picture_x0020_23"><![endif]></span></p>
    17071706
    17081707<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    17161715  cropbottom="21852f" cropleft="3509f" cropright="49103f"/>
    17171716</v:shape><![endif]--><![if !vml]><img border=0 width=385 height=301
    1718 src="MCSA%20in%20GSAS_files/image057.jpg" v:shapes="Picture_x0020_24"><![endif]></span></p>
     1717src="MCSA%20in%20GSAS_files/image063.jpg" v:shapes="Picture_x0020_24"><![endif]></span></p>
    17191718
    17201719<p class=MsoNormal><span class=GramE>as</span> drawn by the Mercury program </p>
    … …  
    17351734  cropbottom="15938f" cropleft="37111f" cropright="13377f"/>
    17361735</v:shape><![endif]--><![if !vml]><img border=0 width=384 height=325
    1737 src="MCSA%20in%20GSAS_files/image072.jpg" v:shapes="Picture_x0020_25"><![endif]></span></p>
     1736src="MCSA%20in%20GSAS_files/image065.jpg" v:shapes="Picture_x0020_25"><![endif]></span></p>
    17381737
    17391738<p class=MsoNormal>And they will be listed in the Atoms table.</p>
    … …  
    17441743 <v:imagedata src="MCSA%20in%20GSAS_files/image066.png" o:title=""/>
    17451744</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=300
    1746 src="MCSA%20in%20GSAS_files/image076.gif" v:shapes="Picture_x0020_26"><![endif]></span></p>
     1745src="MCSA%20in%20GSAS_files/image067.gif" v:shapes="Picture_x0020_26"><![endif]></span></p>
    17471746
    17481747<p class=MsoNormal>It is now ready for <span class=SpellE>Rietveld</span>
    … …  
    18371836 <v:imagedata src="MCSA%20in%20GSAS_files/image068.png" o:title=""/>
    18381837</v:shape><![endif]--><![if !vml]><img border=0 width=450 height=291
    1839 src="MCSA%20in%20GSAS_files/image077.gif" v:shapes="Picture_x0020_27"><![endif]></span></p>
     1838src="MCSA%20in%20GSAS_files/image069.gif" v:shapes="Picture_x0020_27"><![endif]></span></p>
    18401839
    18411840<p class=MsoNormal><o:p>&nbsp;</o:p></p>
    … …  
    18591858 <v:imagedata src="MCSA%20in%20GSAS_files/image070.png" o:title=""/>
    18601859</v:shape><![endif]--><![if !vml]><img border=0 width=633 height=280
    1861 src="MCSA%20in%20GSAS_files/image078.gif" v:shapes="Picture_x0020_29"><![endif]></span></p>
     1860src="MCSA%20in%20GSAS_files/image071.gif" v:shapes="Picture_x0020_29"><![endif]></span></p>
    18621861
    18631862<p class=MsoNormal>To refine the rigid body parameters check the <b
    … …  
    18861885 <v:imagedata src="MCSA%20in%20GSAS_files/image073.png" o:title=""/>
    18871886</v:shape><![endif]--><![if !vml]><img border=0 width=633 height=301
    1888 src="MCSA%20in%20GSAS_files/image079.gif" v:shapes="Picture_x0020_32"><![endif]></span></p>
     1887src="MCSA%20in%20GSAS_files/image075.gif" v:shapes="Picture_x0020_32"><![endif]></span></p>
    18891888
    18901889<p class=MsoNormal><span class=GramE>and</span> the profile shows the fit</p>
    … …  
    18951894 <v:imagedata src="MCSA%20in%20GSAS_files/image074.png" o:title=""/>
    18961895</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
    1897 src="MCSA%20in%20GSAS_files/image080.gif" v:shapes="Picture_x0020_31"><![endif]></span></p>
     1896src="MCSA%20in%20GSAS_files/image081.gif" v:shapes="Picture_x0020_31"><![endif]></span></p>
    18981897
    18991898<p class=MsoNormal>This completes the structure analysis for 3-aminoquinoline.

  • trunk/help/MCSA in GSAS_files/filelist.xml

    r1475 r1478  
    66 <o:File HRef="colorschememapping.xml"/>
    77 <o:File HRef="image001.png"/>
    8  <o:File HRef="image002.gif"/>
     8 <o:File HRef="image031.gif"/>
    99 <o:File HRef="image003.png"/>
    10  <o:File HRef="image004.gif"/>
     10 <o:File HRef="image032.gif"/>
    1111 <o:File HRef="image005.png"/>
    12  <o:File HRef="image006.gif"/>
     12 <o:File HRef="image033.gif"/>
    1313 <o:File HRef="image007.png"/>
    14  <o:File HRef="image008.gif"/>
     14 <o:File HRef="image034.gif"/>
    1515 <o:File HRef="image009.png"/>
    16  <o:File HRef="image010.gif"/>
     16 <o:File HRef="image035.gif"/>
    1717 <o:File HRef="image011.png"/>
    18  <o:File HRef="image012.gif"/>
     18 <o:File HRef="image036.gif"/>
    1919 <o:File HRef="image013.png"/>
    20  <o:File HRef="image014.gif"/>
     20 <o:File HRef="image037.gif"/>
    2121 <o:File HRef="image015.png"/>
    22  <o:File HRef="image016.gif"/>
     22 <o:File HRef="image038.gif"/>
    2323 <o:File HRef="image017.png"/>
    24  <o:File HRef="image018.jpg"/>
     24 <o:File HRef="image039.jpg"/>
    2525 <o:File HRef="image019.png"/>
    26  <o:File HRef="image020.gif"/>
     26 <o:File HRef="image040.gif"/>
    2727 <o:File HRef="image021.png"/>
    28  <o:File HRef="image022.jpg"/>
     28 <o:File HRef="image041.jpg"/>
    2929 <o:File HRef="image023.png"/>
    30  <o:File HRef="image024.jpg"/>
     30 <o:File HRef="image042.jpg"/>
    3131 <o:File HRef="image025.png"/>
    32  <o:File HRef="image026.gif"/>
     32 <o:File HRef="image043.gif"/>
    3333 <o:File HRef="image044.png"/>
    34  <o:File HRef="image027.jpg"/>
     34 <o:File HRef="image045.jpg"/>
    3535 <o:File HRef="image029.png"/>
    36  <o:File HRef="image028.gif"/>
     36 <o:File HRef="image046.gif"/>
    3737 <o:File HRef="image030.png"/>
    38  <o:File HRef="image047.gif"/>
     38 <o:File HRef="image058.gif"/>
    3939 <o:File HRef="image048.png"/>
    40  <o:File HRef="image049.gif"/>
     40 <o:File HRef="image059.gif"/>
    4141 <o:File HRef="image050.png"/>
    42  <o:File HRef="image051.jpg"/>
     42 <o:File HRef="image060.jpg"/>
    4343 <o:File HRef="image052.png"/>
    44  <o:File HRef="image053.gif"/>
     44 <o:File HRef="image061.gif"/>
    4545 <o:File HRef="image054.png"/>
    46  <o:File HRef="image055.jpg"/>
     46 <o:File HRef="image062.jpg"/>
    4747 <o:File HRef="image056.png"/>
    48  <o:File HRef="image057.jpg"/>
     48 <o:File HRef="image063.jpg"/>
    4949 <o:File HRef="image064.png"/>
    50  <o:File HRef="image072.jpg"/>
     50 <o:File HRef="image065.jpg"/>
    5151 <o:File HRef="image066.png"/>
    52  <o:File HRef="image076.gif"/>
     52 <o:File HRef="image067.gif"/>
    5353 <o:File HRef="image068.png"/>
    54  <o:File HRef="image077.gif"/>
     54 <o:File HRef="image069.gif"/>
    5555 <o:File HRef="image070.png"/>
    56  <o:File HRef="image078.gif"/>
     56 <o:File HRef="image071.gif"/>
    5757 <o:File HRef="image073.png"/>
    58  <o:File HRef="image079.gif"/>
     58 <o:File HRef="image075.gif"/>
    5959 <o:File HRef="image074.png"/>
    60  <o:File HRef="image080.gif"/>
     60 <o:File HRef="image081.gif"/>
    6161 <o:File HRef="filelist.xml"/>
    6262</xml>

  • trunk/help/MCSA in GSAS_files/props061.xml

    r1475 r1478  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <ds:datastoreItem ds:itemID="{79E00A83-53B5-4915-9D04-0FD6C141C6DA}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
     2<ds:datastoreItem ds:itemID="{D16078EE-2E6A-4236-9DC4-007493B60ADB}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
Note: See TracChangeset for help on using the changeset viewer.