Changeset 706 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Aug 9, 2012 3:22:11 PM (9 years ago)
Author:
vondreele
Message:

fix sumimage - missing code!
more work on strain fitting

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r701 r706  
    233233            amin = min(amin,a)
    234234            amax = max(amax,a)
    235             ring.append([X,Y,dsp])
     235            if [X,Y,dsp] not in ring:
     236                ring.append([X,Y,dsp])
    236237    delt = amax-amin
    237238    if len(ring) < 20:             #want more than 20 deg
     
    755756    scalex = 1000./pixSize[0]
    756757    scaley = 1000./pixSize[1]
     758    rings = []
    757759
    758     for ring in StrSta['d-zero']:
     760    for ring in StrSta['d-zero']:       #get observed x,y,d points for the d-zeros
    759761        ellipse = GetEllipse(ring['Dset'],StaControls)
    760762        Ring,delt = makeRing(ring['Dset'],ellipse,ring['pixLimit'],ring['cutoff'],scalex,scaley,Image)
    761763        Ring = np.array(Ring).T
    762764        ring['ImxyObs'] = np.array(Ring[:2])      #need to apply masks to this to eliminate bad points
     765        Ring[:2] = GetTthAzm(Ring[0],Ring[1],StaControls)       #convert x,y to tth,azm
     766        Ring[0] /= 2.                                           #convert to theta
     767        if len(rings):
     768            rings = np.concatenate((rings,Ring),axis=1)
     769        else:
     770            rings = np.array(Ring)
     771       
    763772       
    764773
Note: See TracChangeset for help on using the changeset viewer.