Changeset 656
- Timestamp:
- Mar 31, 2010 2:54:41 PM (12 years ago)
- Location:
- sans/Dev/trunk/NCNR_User_Procedures
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_Sq_v40.ipf
r570 r656 11 11 // 12 12 // SRK JUL 2009 13 // 14 // Use different volume fraction and radius for hard sphere interaction as Stieger et al. 15 // 16 // 17 // AJJ Feb 2010 18 13 19 14 20 // -
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf
r570 r656 12 12 // 13 13 // SRK JUL 2009 14 // 15 // Include lorentzian term for *high* Q component of the scattering. 16 // 17 // AJJ Feb 2010 18 19 #include "Lorentz_model_v40" 14 20 15 21 Proc PlotFuzzySpheres(num,qmin,qmax) … … 21 27 Make/O/D/N=(num) xwave_fuzz,ywave_fuzz 22 28 xwave_fuzz = alog( log(qmin) + x*((log(qmax)-log(qmin))/num) ) 23 Make/O/D coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6, 0.001}24 make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)"," bkg (cm-1 sr-1)"}29 Make/O/D coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001} 30 make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"} 25 31 Edit parameters_fuzz,coef_fuzz 26 32 … … 49 55 50 56 // Setup parameter table for model function 51 Make/O/D smear_coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6, 0.001}52 make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)"," bkg (cm-1 sr-1)"}57 Make/O/D smear_coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001} 58 make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"} 53 59 Edit smear_parameters_fuzz,smear_coef_fuzz 54 60 … … 92 98 variable xx 93 99 94 Variable scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf 100 Variable scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf,lor_sf,lor_len 95 101 96 102 //set up the coefficient values … … 103 109 rhos=w[5] 104 110 delrho=rho-rhos 105 bkg=w[ 6]111 bkg=w[8] 106 112 107 113 … … 180 186 181 187 inten *= scale 188 189 //Lorentzian term 190 Make/O/N=3 tmp_lor 191 tmp_lor[0] = w[6] 192 tmp_lor[1] = w[7] 193 tmp_lor[2] = 0 194 195 inten+=fLorentz_model(tmp_lor,xx) 196 182 197 inten+=bkg 183 198 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf
r647 r656 57 57 Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Field" 58 58 Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR" //added Mar 2008 59 Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Pos" //added Mar 2010 59 60 #if (exists("ILL_D22")==6) 60 61 Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Reactorpower" //activate for ILL, June 2008, … … 83 84 WAVE Field = $"root:myGlobals:CatVSHeaderInfo:Field" 84 85 WAVE MCR = $"root:myGlobals:CatVSHeaderInfo:MCR" //added Mar 2008 86 WAVE Pos = $"root:myGlobals:CatVSHeaderInfo:Pos" 85 87 86 88 … … 100 102 ModifyTable width(:myGlobals:CatVSHeaderInfo:Field)=50 101 103 ModifyTable width(:myGlobals:CatVSHeaderInfo:MCR)=50 104 ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30 102 105 #if (exists("ILL_D22")==6) 103 106 ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50 //activate for ILL, June 2008 … … 209 212 Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 210 213 Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" //added Mar 2008 211 214 Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 212 215 #if (exists("ILL_D22")==6) 213 216 Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower" //activate for ILL June 2008 ( and the sort line too) 214 Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,G ReactPow217 Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,GReactPow 215 218 #endif 216 219 … … 219 222 Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,gNumGuides 220 223 #else 221 //must be HFIR or ANSTO 222 Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 224 // Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 225 Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides 223 226 #endif 224 227 … … 248 251 Wave Field= $"root:myGlobals:CatVSHeaderInfo:Field" 249 252 Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR" //added Mar 2008 253 Wave Pos = $"root:myGlobals:CatVSHeaderInfo:Pos" 250 254 #if (exists("ILL_D22")==6) 251 255 // for ILL 252 256 Wave ReactorPower = $"root:myGlobals:CatVSHeaderInfo:reactorpower" //activate for ILL, June 08 (+ edit line) 253 Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, ReactorPower as "Data File Catalog"257 Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, Pos, ReactorPower as "Data File Catalog" 254 258 #endif 255 259 … … 258 262 // Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog" 259 263 // with numGuides 260 Edit Filenames, Labels, DateAndTime, SDD, Lambda, numGuides, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog"264 Edit Filenames, Labels, DateAndTime, SDD, Lambda, numGuides, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR, Pos as "Data File Catalog" 261 265 // alternate ordering, put the magnetic information first 262 266 // Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog" … … 304 308 Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field" 305 309 Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR" 310 Wave GPos = $"root:myGlobals:CatVSHeaderInfo:Pos" 306 311 #if (exists("ILL_D22")==6) 307 312 Wave GReactpow = $"root:myGlobals:CatVSHeaderInfo:reactorpower" //activate for ILL, Jne 2008, (+ last insert @ end of function) … … 393 398 InsertPoints lastPoint,1,GMCR 394 399 GMCR[lastPoint] = getMonitorCount(fname)/ctime //total monitor count / total count time 400 401 //Sample Position 402 InsertPoints lastPoint,1,GPos 403 GPos[lastPoint] = getSamplePosition(fname) 395 404 396 405 #if (exists("ILL_D22")==6) -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_DataReadWrite.ipf
r641 r656 1514 1514 1515 1515 return(getRealValueFromHeader(fname,170)) 1516 end 1517 1518 //Sample position in changer 1519 Function getSamplePosition(fname) 1520 String fname 1521 1522 return(getRealValueFromHeader(fname,166)) 1516 1523 end 1517 1524 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/TISANE.ipf
r609 r656 26 26 27 27 Function Init_TISANE() 28 String/G root:MyGlobals:gTISANE_logfile 29 Variable/G root:MyGlobals:AIMTYPE_XY=0 // XY Event 30 Variable/G root:MyGlobals:AIMTYPE_XYM=2 // XY Minor event 31 Variable/G root:MyGlobals:AIMTYPE_MIR=1 // Minor rollover event 32 Variable/G root:MyGlobals:AIMTYPE_MAR=3 // Major rollover event 33 34 Variable/G root:MyGlobals:gTISANE_time_msw = 0 35 Variable/G root:MyGlobals:gTISANE_time_lsw = 0 36 Variable/G root:MyGlobals:gTISANE_t_longest = 0 37 38 Variable/G root:MyGlobals:gTISANE_tsdisp //Displayed slice 39 Variable/G root:MyGlobals:gTISANE_nslices = 10 //Number of time slices 40 Variable/G root:MyGlobals:gTISANE_slicewidth = 1000 //Slicewidth in us 41 42 Variable/G root:MyGlobals:gTISANE_prescan // Do we prescan the file? 43 Variable/G root:MyGlobals:gTISANE_logint = 1 44 45 SetDataFolder root: 46 NewDataFolder/O/S root:TISANE 28 String/G root:Packages:NIST:gTISANE_logfile 29 Variable/G root:Packages:NIST:AIMTYPE_XY=0 // XY Event 30 Variable/G root:Packages:NIST:AIMTYPE_XYM=2 // XY Minor event 31 Variable/G root:Packages:NIST:AIMTYPE_MIR=1 // Minor rollover event 32 Variable/G root:Packages:NIST:AIMTYPE_MAR=3 // Major rollover event 33 34 Variable/G root:Packages:NIST:gTISANE_time_msw = 0 35 Variable/G root:Packages:NIST:gTISANE_time_lsw = 0 36 Variable/G root:Packages:NIST:gTISANE_t_longest = 0 37 38 Variable/G root:Packages:NIST:gTISANE_tsdisp //Displayed slice 39 Variable/G root:Packages:NIST:gTISANE_nslices = 10 //Number of time slices 40 Variable/G root:Packages:NIST:gTISANE_slicewidth = 1000 //Slicewidth in us 41 42 Variable/G root:Packages:NIST:gTISANE_prescan // Do we prescan the file? 43 Variable/G root:Packages:NIST:gTISANE_logint = 1 44 45 NVAR nslices = root:Packages:NIST:gTISANE_nslices 46 47 SetDataFolder root: 48 NewDataFolder/O/S root:Packages:NIST:TISANE 49 50 Make/O/N=(XBINS,YBINS,nslices) slicedData 51 Duplicate/O slicedData logslicedData 52 Duplicate/O slicedData dispsliceData 47 53 48 54 SetDataFolder root: … … 51 57 Proc TISANE() 52 58 PauseUpdate; Silent 1 // building window... 53 NewPanel/K= 1/W=(100,50,600,680)/N=TISANE59 NewPanel/K=2 /W=(100,50,600,680)/N=TISANE 54 60 DoWindow/C TISANE 55 61 ModifyPanel fixedSize=1,noEdit =1 … … 59 65 Button button0,proc=LoadTISANELog_Proc 60 66 SetVariable setvar3,pos= {20,590},size={460,20},title=" ",fSize=12 61 SetVariable setvar3,disable=2,variable=root: myGlobals:gTISANE_logfile67 SetVariable setvar3,disable=2,variable=root:Packages:NIST:gTISANE_logfile 62 68 CheckBox chkbox1,pos={170,15},title="Prescan file? (increases load time)" 63 CheckBox chkbox1,variable = root:myGlobals:gTISANE_prescan 69 CheckBox chkbox1,variable = root:Packages:NIST:gTISANE_prescan 70 Button doneButton,pos={400,10}, size={50,20},title="Done",fSize=12 71 Button doneButton,proc=TISANEDone_Proc 64 72 65 73 //DrawLine 10,35,490,35 … … 67 75 Button button1,proc=ProcessLog_Proc 68 76 SetVariable setvar1,pos={170,50},size={160,20},title="Number of slices",fSize=12 69 SetVariable setvar1,value=root: myGlobals:gTISANE_nslices77 SetVariable setvar1,value=root:Packages:NIST:gTISANE_nslices 70 78 SetVariable setvar2,pos={330,50},size={160,20},title="Slice Width (us)",fSize=12 71 SetVariable setvar2,value=root: myGlobals:gTISANE_slicewidth79 SetVariable setvar2,value=root:Packages:NIST:gTISANE_slicewidth 72 80 //DrawLine 10,65,490,65 73 81 74 82 CheckBox chkbox2,pos={20,95},title="Log Intensity",value=1 75 CheckBox chkbox2,variable=root: myGlobals:gTISANE_logint,proc=LogInt_Proc83 CheckBox chkbox2,variable=root:Packages:NIST:gTISANE_logint,proc=LogInt_Proc 76 84 SetVariable setvar0,pos={320,90},size={160,20},title="Display Time Slice",fSize=12 77 SetVariable setvar0,value= root: myGlobals:gTISANE_tsdisp85 SetVariable setvar0,value= root:Packages:NIST:gTISANE_tsdisp 78 86 SetVariable setvar0,proc=sliceSelect_Proc 79 87 Display/W=(20,120,480,580)/HOST=TISANE/N=TISANE_slicegraph 80 AppendImage/W=TISANE#TISANE_slicegraph/T :TISANE:dispsliceData88 AppendImage/W=TISANE#TISANE_slicegraph/T root:Packages:NIST:TISANE:dispsliceData 81 89 ModifyImage/W=TISANE#TISANE_slicegraph ''#0 ctab= {*,*,Rainbow,0} 82 90 ModifyImage/W=TISANE#TISANE_slicegraph ''#0 ctabAutoscale=3 … … 98 106 99 107 Variable fileref 100 SVAR filename = root: MyGlobals:gTISANE_logfile101 NVAR prescan = root: MyGlobals:gTISANE_prescan102 NVAR slicewidth = root: MyGlobals:gTISANE_slicewidth103 NVAR nslices = root: MyGlobals:gTISANE_nslices104 NVAR t_longest = root: MyGlobals:gTISANE_t_longest108 SVAR filename = root:Packages:NIST:gTISANE_logfile 109 NVAR prescan = root:Packages:NIST:gTISANE_prescan 110 NVAR slicewidth = root:Packages:NIST:gTISANE_slicewidth 111 NVAR nslices = root:Packages:NIST:gTISANE_nslices 112 NVAR t_longest = root:Packages:NIST:gTISANE_t_longest 105 113 106 114 Open/R/D fileref … … 115 123 End 116 124 125 Function TISANEDone_Proc(ba) : ButtonControl 126 STRUCT WMButtonAction &ba 127 128 String win = ba.win 129 switch (ba.eventCode) 130 case 2: 131 DoWindow/K TISANE 132 break 133 endswitch 134 135 End 136 117 137 Function ProcessLog_Proc(ctrlName) : ButtonControl 118 138 String ctrlName 119 139 120 NVAR slicewidth = root: MyGlobals:gTISANE_slicewidth121 NVAR nslices = root: MyGlobals:gTISANE_nslices140 NVAR slicewidth = root:Packages:NIST:gTISANE_slicewidth 141 NVAR nslices = root:Packages:NIST:gTISANE_nslices 122 142 123 143 ProcessLog(nslices,slicewidth) … … 129 149 Variable checked 130 150 131 SetDataFolder root: TISANE151 SetDataFolder root:Packages:NIST:TISANE 132 152 if(checked) 133 153 Duplicate/O logslicedData dispsliceData … … 145 165 String varName 146 166 147 NVAR nslices = root: MyGlobals:gTISANE_nslices148 NVAR selectedslice = root: MyGlobals:gTISANE_tsdisp167 NVAR nslices = root:Packages:NIST:gTISANE_nslices 168 NVAR selectedslice = root:Packages:NIST:gTISANE_tsdisp 149 169 150 170 if(varNum < 0) … … 163 183 Variable nslices,slicewidth 164 184 165 NVAR time_msw = root: MyGlobals:gTISANE_time_msw166 NVAR time_lsw = root: MyGlobals:gTISANE_time_lsw167 NVAR t_longest = root: MyGlobals:gTISANE_t_longest168 169 NVAR logint = root: MyGlobals:gTISANE_logint170 171 SVAR filepathstr = root: MyGlobals:gTISANE_logfile172 SetDataFolder root: TISANE185 NVAR time_msw = root:Packages:NIST:gTISANE_time_msw 186 NVAR time_lsw = root:Packages:NIST:gTISANE_time_lsw 187 NVAR t_longest = root:Packages:NIST:gTISANE_t_longest 188 189 NVAR logint = root:Packages:NIST:gTISANE_logint 190 191 SVAR filepathstr = root:Packages:NIST:gTISANE_logfile 192 SetDataFolder root:Packages:NIST:TISANE 173 193 174 194 //Create bin lookup … … 258 278 Variable nticks,nslices 259 279 260 WAVE t_lookup = root: TISANE:t_lookup280 WAVE t_lookup = root:Packages:NIST:TISANE:t_lookup 261 281 262 282 Variable i … … 275 295 Function PreProcessLog() 276 296 277 NVAR time_msw = root: MyGlobals:gTISANE_time_msw278 NVAR time_lsw = root: MyGlobals:gTISANE_time_lsw279 NVAR t_longest = root: MyGlobals:gTISANE_t_longest280 281 SVAR filepathstr = root: MyGlobals:gTISANE_logfile282 SetDataFolder root: TISANE297 NVAR time_msw = root:Packages:NIST:gTISANE_time_msw 298 NVAR time_lsw = root:Packages:NIST:gTISANE_time_lsw 299 NVAR t_longest = root:Packages:NIST:gTISANE_t_longest 300 301 SVAR filepathstr = root:Packages:NIST:gTISANE_logfile 302 SetDataFolder root:Packages:NIST:TISANE 283 303 284 304 Variable fileref
Note: See TracChangeset
for help on using the changeset viewer.