Changeset 902
 Timestamp:
 Mar 18, 2013 10:10:23 AM (9 years ago)
 Location:
 sans/Dev/trunk/NCNR_User_Procedures
 Files:

 7 edited
Legend:
 Unmodified
 Added
 Removed

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Auto_Fit.ipf
r901 r902 310 310 // SetVariable fitTol,pos={80,208},size={80,15},title="Fit Tol" 311 311 // SetVariable fitTol,limits={0.0001,0.1,0},value= root:AutoFit:fitTol 312 // CheckBox epsilonCheck,pos={180,208},size={32,14},value=0,title="Use Epsilon Wave?"312 CheckBox epsilonCheck,pos={156,335},size={32,14},value=0,title="Use Epsilon Wave?" 313 313 314 314 TabControl tabC,pos={13,371},size={273,244},proc=tabProc,tabLabel(0)="Guess" … … 745 745 //epsilon wave 746 746 epsilonStr = GetEpsilonWave() 747 if(strlen(epsilonStr) > 0) 748 Wave eps=$epsilonStr //in the root folder 749 useEps = 1 750 endif 747 751 748 752 //fit it … … 1003 1007 testStr = "Epsilon_"+extStr 1004 1008 if(waveexists($testStr) != 0) 1005 return(" /E="+testStr) 1009 // return(" /E="+testStr) 1010 return(testStr) 1006 1011 endif 1007 1012 return(retStr) 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CircSectAve.ipf
r886 r902 252 252 var = aveisqavesq 253 253 if(var<=0) 254 sigave[kk1] = small_num 254 // sigave[kk1] = small_num 255 sigave[kk1] = large_num //if there are zero counts, make error large_num to be a warning flag 255 256 else 256 257 sigave[kk1] = sqrt(var/(ncells[kk1]  1)) 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MC_SimulationScripting.ipf
r901 r902 296 296 cw = {1e18,3.346,0,9,0} 297 297 Sim_SetIncohXS(0) // incoh XS = 0 for empty beam 298 Sim_SetThickness(0.1) // thickness (cm) to give proper level of scattering 299 298 300 299 301 totalTime = Sim_RunTrans_2D(confList,ctTimeList,titleStr,runIndex) … … 1010 1012 End 1011 1013 1012 Proc Sim_SetupRunPanel() : Panel1013 PauseUpdate; Silent 1 // building window...1014 NewPanel /W=(399,44,764,386)1015 ModifyPanel cbRGB=(56639,28443,117)1016 ShowTools/A1017 EndMacro1014 //Proc Sim_SetupRunPanel() : Panel 1015 // PauseUpdate; Silent 1 // building window... 1016 // NewPanel /W=(399,44,764,386) 1017 // ModifyPanel cbRGB=(56639,28443,117) 1018 // ShowTools/A 1019 //EndMacro 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf
r901 r902 15 15 //  not for the casual user at all. 16 16 17 17 // 18 //  Mar 2013  modified the 1D simulation to properly account for very low counts. In a real experiment, 2D data 19 // is collected, and there can be lots of zeros on the detector. Then averaging out to 1D, they remain zero. Arbitrarily 20 // they are assigned an error of 1. Previously, a (low) but nonzero, noninteger count value was assigned to the 21 // 1D intensity. Then when noise was added, the resulting I(q) could be negative. Now the negative intensities are 22 // replaced with zero, with an error of 1 (1e10 was previously used as the error, but this put a ridiculous 23 // weighting on that point during fitting, making any fit impossible)  But is this correct? 24 // 25 //  so take it back out for now ?? Search for MAR 2013 in Simulate_1D()  two places there 26 // 27 // 18 28 19 29 // the RNG issue is really not worth the effort. multiple copies with different RNG is as good as I need. Plus, … … 716 726 if(xPixel != 1 && yPixel != 1) 717 727 //if(index==1) // only the single scattering events 718 if( xPixel > 127  yPixel > 127 )719 print "error XY =",xPixel,yPixel728 if( xPixel > 127  yPixel > 127  xPixel < 0  yPixel < 0) 729 print "error XY loc2 =",xPixel,yPixel 720 730 endif 721 731 MC_linear_data[xPixel][yPixel] += 1 //this is the total scattering, including multiple scattering … … 900 910 // passed in, xCtr and yCtr are in detector coordinates 901 911 // 912 // everything passed in is in cm, excepty lam, in A 913 // 902 914 ThreadSafe Function FindPixel(testQ,testPhi,lam,yg_d,sdd,pixSize,xCtr,yCtr,xPixel,yPixel) 903 915 Variable testQ,testPhi,lam,yg_d,sdd,pixSize,xCtr,yCtr,&xPixel,&yPixel 904 916 905 Variable theta,dy,dx,qx,qy,qz 906 907 t heta = 2*asin(testQ*lam/4/pi)917 Variable theta,dy,dx,qx,qy,qz,theta_qy,theta_qx,two_theta,dist 918 919 two_theta = 2*asin(testQ*lam/4/pi) 908 920 909 921 //decompose to qx,qy 910 qx = testQ*cos(theta/2)*cos(testPhi)911 qy = testQ*cos(theta/2)*sin(testPhi)912 qz = testQ*sin(theta/2)922 // qx = testQ*cos(theta/2)*cos(testPhi) 923 // qy = testQ*cos(theta/2)*sin(testPhi) 924 // qz = testQ*sin(theta/2) 913 925 914 926 // correct qy for gravity 915 927 // qy = 4*pi/lam * (theta/2) 916 qy += 4*pi/lam*(yg_d/sdd/2) 917 918 919 //convert qx,qy to pixel locations relative to # of pixels x, y from center 920 theta = 2*asin(qy*lam/4/pi) 921 dy = sdd*tan(theta) 922 // dy += 923 yPixel = round(yCtr + dy/pixSize) 924 925 theta = 2*asin(qx*lam/4/pi) 926 dx = sdd*tan(theta) 927 xPixel = round(xCtr + dx/pixSize) 928 // qy += 4*pi/lam*(yg_d/sdd/2) 929 930 931 dist = sdd*tan(two_theta) //hypot in xy plane 932 933 dx = dist*cos(testPhi) 934 dy = dist*sin(testPhi) 935 936 xPixel = dx/pixSize + xCtr 937 yPixel = dy/pixSize + yCtr + yg_d/pixSize //shift down due to gravity 938 939 xPixel = round(xPixel) 940 yPixel = round(yPixel) 941 942 // //convert qx,qy to pixel locations relative to # of pixels x, y from center 943 // theta = 2*asin(qy*lam/4/pi) 944 // dy = sdd*tan(theta) 945 // yPixel = abs(round(yCtr + dy/pixSize)) 946 // 947 // theta = 2*asin(qx*lam/4/pi) 948 // dx = sdd*tan(theta) 949 // xPixel = abs(round(xCtr + dx/pixSize)) 928 950 929 951 NVAR pixelsX = root:myGlobals:gNPixelsX 930 952 NVAR pixelsY = root:myGlobals:gNPixelsY 931 953 954 // convert the detector pixel coordinates to [0,127] before passing back... 932 955 xPixel = 1 933 956 yPixel = 1 … … 935 958 936 959 //if on detector, return xPix and yPix values, otherwise 1 937 if(yPixel >= pixelsY  yPixel < 0) 960 // > 127 or < 0 == off detector, no good 961 if(yPixel > pixelsY1  yPixel < 0) 938 962 yPixel = 1 939 963 endif 940 if(xPixel > = pixelsX xPixel < 0)964 if(xPixel > pixelsX1  xPixel < 0) 941 965 xPixel = 1 942 966 endif … … 945 969 End 946 970 971 972 // 973 // this is the original version before I messed with it. 974 // 947 975 //// xCtr and yCtr here are the "optical" center of the detector ~(64,64) and the full fall due to 948 976 //// gravity is calculated from this horizontal axis … … 1600 1628 YG_d = 0.5*g*SDD*(SSD+SDD)*(wavelength/vz_1)^2 // fall in cm (negative value) 1601 1629 1602 xCtr = 64 .5+ round(2*rw[19]) // I'm always off by one for some reason, so start at 65.5?1603 yCtr = 6 5+ yg_d/0.5 // this will lower the beam center1630 xCtr = 64 + round(2*rw[19]) // I'm always off by one for some reason, so start at 65.5? 1631 yCtr = 64 + yg_d/0.5 // this will lower the beam center 1604 1632 // rw[16] = xCtr 1605 1633 // rw[17] = yCtr … … 1614 1642 WAVE tmp_mask = root:Packages:NIST:SAS:tmp_mask 1615 1643 1616 tmp_mask = (sqrt((pxCtr )^2+(qyCtr)^2) < rad) ? 0 : 1 //behind beamstop = 0, away = 11644 tmp_mask = (sqrt((pxCtr+1)^2+(qyCtr+1)^2) < rad) ? 0 : 1 //behind beamstop = 0, away = 1 1617 1645 1618 1646 linear_data *= tmp_mask … … 2207 2235 sigave = sqrt(aveint/nCells) // corrected based on John's memo, from 8/9/99 2208 2236 2237 2209 2238 // add in random error in aveint based on the sigave 2239 2240 /// ?? MAR 2013 do I replace the negative intensities with zero? 2241 // if the resulting value is less than zero, replace with zero. This is what would happen if the 2242 // data came from 2D. Then if any of the aveint points are zero, set the associated error to == 1. This is 2243 // done after all of the other scaling... 2210 2244 if(addNoise) 2211 2245 aveint += gnoise(sigave) 2246 aveint = (aveint[p] < 0) ? 0 : aveint[p] // MAR 2013  is this the right thing to do 2212 2247 endif 2213 2248 … … 2225 2260 sigave /= detectorEff 2226 2261 endif 2227 2262 2263 /// ?? MAR 2013 do I replace the "zero" intensity error with 1? 2264 if(addNoise) 2265 sigave = (aveint[p] == 0) ? 1 : sigave[p] 2266 endif 2228 2267 2229 2268 // Simulate_1D_EmptyCell("TwoLevel_EC",aveint,qval,sigave,sigmaq,qbar,fsubs) 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf
r898 r902 1958 1958 String path=S_Path 1959 1959 1960 //////// Make/O/D/N=(numpnts(lowW)) scale_4m 1961 NVAR scale12 = root:myGlobals:NSORT:gScale1_2 1962 1960 1963 1961 1964 // this variable must exist and be set to 1 to be able to automatically name files … … 1994 1997 WriteNSORTFileButton("") 1995 1998 1999 ////// scale_4m[ii] = scale12 2000 1996 2001 Print "wrote file : ",path+saveW[ii] 1997 2002 ii+=1 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RectAnnulAvg.ipf
r886 r902 252 252 var = aveisqavesq 253 253 if(var<=0) 254 sigave[kk1] = small_num 254 // sigave[kk1] = small_num 255 sigave[kk1] = large_num //if there are zero counts, make error large_num to be a warning flag 255 256 else 256 257 sigave[kk1] = sqrt(var/(ncells[kk1]  1)) 
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf
r901 r902 1597 1597 var = aveisqavesq 1598 1598 if(var<=0) 1599 sigave[kk1] = small_num 1599 // sigave[kk1] = small_num 1600 sigave[kk1] = large_num //if there are zero counts, make error large_num to be a warning flag 1600 1601 else 1601 1602 sigave[kk1] = sqrt(var/(ncells[kk1]  1))
Note: See TracChangeset
for help on using the changeset viewer.