Changeset 1228


Ignore:
Timestamp:
Feb 24, 2014 3:43:15 PM (8 years ago)
Author:
vondreele
Message:

remove diagnostic prints in image calibration stuff
some fine tuning of the image calibration
make CheMin? images "right" way around as requested by Dave Bish
Apply James Hester's fix to Pawley update

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1223 r1228  
    601601        tifType = 'CheMin'
    602602        pixy = [40,40]
    603         image = np.array(Im.open(filename))
     603        image = np.flipud(np.array(Im.open(filename)))*10.
    604604        distance = 18.0
    605         center = [pixy[0]*sizexy[0]/2000,pixy[1]*sizexy[1]/1000]
     605        center = [pixy[0]*sizexy[0]/2000,0]     #the CheMin beam stop is here
    606606        wavelength = 1.78892
    607607    elif 272 in IFD:
     
    620620        else:
    621621            if IFD[258][2][0] == 16:
    622                 print sizexy
    623622                tifType = 'GE'
    624623                pixy = (200,200)
     
    628627                image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
    629628            elif IFD[258][2][0] == 32:
    630                 print sizexy
    631629                tifType = 'CHESS'
    632630                pixy = (200,200)
  • trunk/GSASIIimage.py

    r1222 r1228  
    497497            SGData = G2spc.SpcGroup(sg)[1]
    498498            hkl = G2pwd.getHKLpeak(dmin,SGData,A)
    499             for h in hkl: print h
    500499            HKL += hkl
    501500        else:
    502501            hkl = G2lat.GenHBravais(dmin,bravais,A)
    503             for h in hkl: print h
    504502            HKL += hkl
    505503    HKL = G2lat.sortHKLd(HKL,True,False)
     
    513511    if frame:
    514512        tam = ma.mask_or(tam,MakeFrameMask(data,frame))
    515     for iH,H in enumerate(HKL):
     513    for iH,H in enumerate(HKL):
     514        print H
    516515        dsp = H[3]
    517516        tth = 2.0*asind(wave/(2.*dsp))
     
    529528            continue
    530529        else:                   #no more rings beyond edge of detector
    531             break
     530            continue
     531#            break
    532532    rings = np.concatenate((data['rings']),axis=0)
    533533    if data['DetDepthRef']:
     
    608608            SGData = G2spc.SpcGroup(sg)[1]
    609609            hkl = G2pwd.getHKLpeak(dmin,SGData,A)
    610             for h in hkl: print h
    611610            HKL += hkl
    612611        else:
    613612            hkl = G2lat.GenHBravais(dmin,bravais,A)
    614             for h in hkl: print h
    615613            HKL += hkl
    616614    HKL = G2lat.sortHKLd(HKL,True,False)[skip:]
     
    694692    if data['DetDepthRef']:
    695693        varyList.append('dep')
    696 #    data['rings'] = []
    697 #    data['ellipses'] = []
     694    data['rings'] = []
     695    data['ellipses'] = []
    698696    for i,H in enumerate(HKL):
    699697        dsp = H[3]
     
    723721        else:
    724722            print 'insufficient number of points in this ellipse to fit'
    725             break
     723#            break
    726724    G2plt.PlotImage(self,newImage=True)
    727725    fullSize = len(self.ImageZ)/scalex
  • trunk/GSASIIphsGUI.py

    r1207 r1228  
    48814881        HistoNames = Histograms.keys()
    48824882        PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,HistoNames[0])
    4883         refData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))[PhaseName]
     4883        refData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,  \
     4884            PatternId,'Reflection Lists'))[PhaseName]['RefList']
    48844885        Inv = data['General']['SGData']['SGInv']
    48854886        mult = 0.5
Note: See TracChangeset for help on using the changeset viewer.