Changeset 477 for sans/Dev/trunk
- Timestamp:
- Feb 19, 2009 4:41:06 PM (14 years ago)
- Location:
- sans/Dev/trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf
r476 r477 4912 4912 //the text 4913 4913 // -- modify to put in the coefficient labels... 4914 String dataFileStr,funcStr,nameStr,paramStr,suffix,savDF 4914 String dataFileStr,funcStr,nameStr,paramStr,suffix,savDF,tmpindex 4915 4915 Variable num,ii 4916 4916 savDF = GetDataFolder(1) … … 4923 4923 num=numpnts(pw) 4924 4924 4925 //String/G root:beforeStr=GF_resultStr4925 String/G root:beforeStr=GF_resultStr 4926 4926 //SRK clean up text a bit 4927 4927 GF_resultStr = ReplaceString("data set ",GF_resultStr, "", 1) //case-sensitive 4928 4928 4929 for(ii=0;ii<num;ii+=1) 4929 // loop through backwards so that coef_1 does not replace part of coef_10, coef_11, etc. 4930 for(ii=num-1;ii>=0;ii-=1) 4931 // tmpIndex=num2str(ii) 4932 // print "Coef_"+tmpindex 4930 4933 GF_resultStr = ReplaceString("; Coef_"+num2str(ii), GF_resultStr,"") 4931 4934 endfor 4932 4935 //eSRK 4933 for(ii= 0;ii<num;ii+=1)4936 for(ii=num-1;ii>=0;ii-=1) 4934 4937 GF_resultStr = ReplaceString("Coef_"+num2str(ii), GF_resultStr, pw[ii]) 4935 4938 endfor -
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf
r476 r477 1 1 #pragma rtGlobals=1 // Use modern global access method. 2 2 3 4 // panel meant to make it easier to fit two data sets with a single model 5 // typically (but not necessarily) U+S, resolution smeared 6 // 3 7 // Uses a lot of the functionality from the Wrapper Panel - so be careful 4 8 // if the behavior of that panel changes - especially the popup menus 5 //6 //7 // panel meant to make it easier to fit two data sets with a single model8 // typically (but not necessarily) U+S, resolution smeared9 9 // 10 10 // currently unsupported: 11 11 // mask 12 12 // constraints 13 // epsilon (used? but not user-settable?) 13 // epsilon (used, set behind the scenes but is not user-settable) 14 // 15 // ** some of the other assumptions/behaviors are: 16 // - if a global variable is held by one set, it is (must be) held for the other set 17 // even though I don't automatically check the other box 18 // - global parameter values are set from SET A. values in set B are overwritten during 19 // the fit 20 // - upon initialization of the coefficients, coef_A and coef_B are set to those from the 21 // first data set (A). So the appropriate model must be plotted for set A. It does not 22 // need to be plotted for set B, although if you fit the sets separately, each fit can 23 // be used as a good first guess for the global fitting by cut/pase into the table. 24 // - reports are always generated and automatically saved. Beware overwriting. 25 // - weighting waves are automatically selected, as usual, since I know the data sets 26 // - both data sets should be on the top graph. The fit, when finished, will try to append 27 // the results of the fit on the top graph. 14 28 // 15 29 // SRK FEB 2009 … … 101 115 Button button_0,pos={344,13},size={100,20},title="Do Fit" 102 116 Button button_0 proc=SGF_DoFitButtonProc 117 Button button_1,pos={369,173},size={50,20},proc=SaveCheckStateButtonProc,title="Save" 118 Button button_2,pos={429,173},size={70,20},proc=RestoreCheckStateButtonProc,title="Restore" 103 119 104 120 Edit/W=(14,174,348,495)/HOST=# … … 108 124 109 125 EndMacro 126 127 // save the state of the checkboxes 128 Function SaveCheckStateButtonProc(ba) : ButtonControl 129 STRUCT WMButtonAction &ba 130 131 switch( ba.eventCode ) 132 case 2: // mouse up 133 // click code here 134 Duplicate/O root:Packages:NewGlobalFit:selW, root:Packages:NewGlobalFit:selW_saved 135 break 136 endswitch 137 138 return 0 139 End 140 141 //restore the state of the checkboxes if the number of rows is correct 142 Function RestoreCheckStateButtonProc(ba) : ButtonControl 143 STRUCT WMButtonAction &ba 144 145 switch( ba.eventCode ) 146 case 2: // mouse up 147 // click code here 148 Wave sw_cur = root:Packages:NewGlobalFit:selW 149 Wave sw_sav = root:Packages:NewGlobalFit:selW_saved 150 151 Variable num_cur,num_sav 152 num_cur = DimSize(sw_cur,0) 153 num_sav = DimSize(sw_sav,0) 154 155 if(num_cur == num_sav) 156 sw_cur = sw_sav 157 endif 158 159 break 160 endswitch 161 162 return 0 163 End 164 165 166 110 167 111 168 // show the appropriate coefficient waves -
sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf
r461 r477 135 135 AppendToGraph $w1 vs $w0 136 136 ModifyGraph mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1) =(rr,gg,bb),tickUnit=1 137 ErrorBars $w1 Y,wave=($w2,$w2)137 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 138 138 ModifyGraph tickUnit(left)=1 139 139 else … … 142 142 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 143 143 ModifyGraph grid=1,mirror=2,standoff=0 144 ErrorBars $w1 Y,wave=($w2,$w2)144 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 145 145 ModifyGraph tickUnit(left)=1 146 146 Legend … … 151 151 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 152 152 ModifyGraph grid=1,mirror=2,standoff=0 153 ErrorBars $w1 Y,wave=($w2,$w2)153 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 154 154 ModifyGraph tickUnit(left)=1 155 155 Legend … … 251 251 AppendToGraph $w1 vs $w0 252 252 ModifyGraph mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1) =(rr,gg,bb),tickUnit=1 253 ErrorBars $w1 Y,wave=($w2,$w2)253 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 254 254 ModifyGraph tickUnit(left)=1 255 255 else … … 258 258 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 259 259 ModifyGraph grid=1,mirror=2,standoff=0 260 ErrorBars $w1 Y,wave=($w2,$w2)260 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 261 261 ModifyGraph tickUnit(left)=1 262 262 Legend … … 267 267 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 268 268 ModifyGraph grid=1,mirror=2,standoff=0 269 ErrorBars $w1 Y,wave=($w2,$w2)269 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 270 270 ModifyGraph tickUnit(left)=1 271 271 Legend -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf
r472 r477 213 213 ModifyGraph rgb($NameofWave(iw))=(0,0,0) 214 214 ModifyGraph opaque($NameofWave(iw))=1 215 ErrorBars $NameofWave(iw) Y,wave=(sw,sw)215 ErrorBars/T=0 $NameofWave(iw) Y,wave=(sw,sw) 216 216 Legend 217 217 -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf
r379 r477 424 424 If(WinType("A_FitWindow") == 0) 425 425 Display /W=(5,42,480,400)/K=1 yAxisWave vs xAxisWave 426 ModifyGraph mode=3,standoff=0,marker=8 427 ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)426 ModifyGraph mode=3,standoff=0,marker=8,opaque=1 427 ErrorBars/T=0 yAxisWave Y,wave=(yErrWave,yErrWave) 428 428 DoWindow/C A_FitWindow 429 429 else -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf
r420 r477 24 24 End 25 25 26 Window A_Plot_Manager() : Panel26 Window A_Plot_Manager() 27 27 PauseUpdate; Silent 1 // building window... 28 28 NewPanel /W=(658,347,1018,737)/N=Plot_Manager/K=1 as "Plot Manager" … … 131 131 AppendToGraph $iStr vs $qStr 132 132 ModifyGraph log=1,mode($istr)=3,marker($iStr)=19,msize($iStr)=2,rgb($iStr)=(rr,gg,bb) 133 ErrorBars $iStr Y,wave=($eStr,$eStr)133 ErrorBars/T=0 $iStr Y,wave=($eStr,$eStr) 134 134 135 135 SetDataFolder root: … … 169 169 ModifyGraph log=1,mode($istr)=3,marker($iStr)=19,msize($iStr)=2,rgb=(rr,gg,bb) 170 170 ModifyGraph grid=1,mirror=2,standoff=0 171 ErrorBars $iStr Y,wave=($eStr,$eStr)171 ErrorBars/T=0 $iStr Y,wave=($eStr,$eStr) 172 172 ModifyGraph tickUnit=1 173 173 -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf
r474 r477 366 366 AppendToGraph $w1 vs $w0 367 367 ModifyGraph mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1) =(rr,gg,bb),tickUnit=1 368 ErrorBars $w1 Y,wave=($w2,$w2)368 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 369 369 ModifyGraph tickUnit(left)=1 370 370 else … … 374 374 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 375 375 ModifyGraph grid=1,mirror=2,standoff=0 376 ErrorBars $w1 Y,wave=($w2,$w2)376 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 377 377 ModifyGraph tickUnit(left)=1 378 378 Legend … … 383 383 ModifyGraph log=1,mode($w1)=3,marker($w1)=19,msize($w1)=2,rgb($w1)=(rr,gg,bb),tickUnit=1 384 384 ModifyGraph grid=1,mirror=2,standoff=0 385 ErrorBars $w1 Y,wave=($w2,$w2)385 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 386 386 ModifyGraph tickUnit(left)=1 387 387 Legend … … 454 454 AppendToGraph $w2 vs $w1 455 455 ModifyGraph mode($w2)=3,marker($w2)=29,msize($w2)=2,rgb($w2) =(rr,gg,bb),grid=1,mirror=2,tickUnit=1 456 ErrorBars $w2 Y,wave=($w3,$w3)456 ErrorBars/T=0 $w2 Y,wave=($w3,$w3) 457 457 else 458 458 //new graph 459 459 Display $w2 vs $w1 460 460 ModifyGraph standoff=0,mode($w2)=3,marker($w2)=29,msize($w2)=2,rgb($w2)=(rr,gg,bb),grid=1,mirror=2,tickUnit=1 461 ErrorBars $w2 Y,wave=($w3,$w3)461 ErrorBars/T=0 $w2 Y,wave=($w3,$w3) 462 462 Legend 463 463 endif … … 466 466 Display $w2 vs $w1 467 467 ModifyGraph standoff=0,mode($w2)=3,marker($w2)=29,msize($w2)=2,rgb($w2)=(rr,gg,bb),grid=1,mirror=2,tickUnit=1 468 ErrorBars $w2 Y,wave=($w3,$w3)468 ErrorBars/T=0 $w2 Y,wave=($w3,$w3) 469 469 Legend 470 470 endif … … 538 538 AppendToGraph $w1 vs $w0 539 539 ModifyGraph mode=3,marker=29,msize=2,rgb ($w1) =(rr,gg,bb),tickUnit=1,grid=1,mirror=2 540 ErrorBars $w1 Y,wave=($w2,$w2)540 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 541 541 else 542 542 //new graph 543 543 Display $w1 vs $w0 544 544 ModifyGraph log=1,mode=3,marker=29,msize=2,rgb=(rr,gg,bb),tickUnit=1,grid=1,mirror=2 545 ErrorBars $w1 Y,wave=($w2,$w2)545 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 546 546 Legend 547 547 endif … … 550 550 Display $w1 vs $w0 551 551 ModifyGraph log=1,mode=3,marker=29,msize=2,rgb=(rr,gg,bb),tickUnit=1,grid=1,mirror=2 552 ErrorBars $w1 Y,wave=($w2,$w2)552 ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 553 553 Legend 554 554 endif -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/USANS_SlitSmearing_v40.ipf
r418 r477 225 225 Display/W=(9,6,402,305)/HOST=USANS_Slope $(basestr+"_i"+trimStr) vs $(basestr+"_q"+trimStr) 226 226 RenameWindow #,SlopePlot 227 ErrorBars/ W=USANS_Slope#SlopePlot $(basestr+"_i"+trimStr), Y wave=($(basestr+"_s"+trimStr),$(basestr+"_s"+trimStr))227 ErrorBars/T=0/W=USANS_Slope#SlopePlot $(basestr+"_i"+trimStr), Y wave=($(basestr+"_s"+trimStr),$(basestr+"_s"+trimStr)) 228 228 ModifyGraph log=1 229 229 ModifyGraph mode=3,msize=3,marker=1,rgb=(0,0,0) -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf
r418 r477 939 939 String list=TraceNameList("",";", 1) 940 940 String yname=StringFromList(0, list,";") 941 ErrorBars $yname Y,wave=(ew,ew)941 ErrorBars/T=0 $yname Y,wave=(ew,ew) 942 942 ModifyGraph grid=1 943 943 ModifyGraph log=0 … … 1228 1228 1229 1229 End 1230 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/FIT_Ops.ipf
r431 r477 422 422 Display /W=(5,42,480,400)/K=1 yAxisWave vs xAxisWave 423 423 ModifyGraph mode=3,standoff=0,marker=8 424 ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)424 ErrorBars/T=0 yAxisWave Y,wave=(yErrWave,yErrWave) 425 425 ModifyGraph opaque(yAxisWave)=1 426 426 DoWindow/C FitWindow … … 859 859 Display /W=(5,42,480,400)/K=1 yAxisWave vs xAxisWave 860 860 ModifyGraph mode=3,standoff=0,marker=8 861 ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)861 ErrorBars/T=0 yAxisWave Y,wave=(yErrWave,yErrWave) 862 862 DoWindow/C FitWindow 863 863 ShowInfo … … 1048 1048 Display /W=(5,42,480,400)/K=1 yAxisWave vs xAxisWave 1049 1049 ModifyGraph mode=3,standoff=0,marker=8 1050 ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)1050 ErrorBars/T=0 yAxisWave Y,wave=(yErrWave,yErrWave) 1051 1051 TextBox/C/N=textLabel/A=RB "File = "+cleanLastFileName 1052 1052 DoWindow/C FitWindow … … 1161 1161 endif 1162 1162 End 1163 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf
r412 r477 597 597 AppendToGraph $"HighQSet_i" vs $"HighQSet_q" 598 598 ModifyGraph log=1,mode=3,marker($"HighQSet_i")=8,msize=2,rgb($"HighQSet_i")=(0,0,65535),opaque($"HighQSet_i")=1 599 ErrorBars $"HighQSet_i" Y,wave=($"HighQSet_s",$"HighQSet_s")599 ErrorBars/T=0 $"HighQSet_i" Y,wave=($"HighQSet_s",$"HighQSet_s") 600 600 AppendToGraph $"TrimHighQSet_i" vs $"TrimHighQSet_q" 601 601 ModifyGraph mode($"TrimHighQSet_i")=3,marker($"TrimHighQSet_i")=19,msize=2,rgb($"TrimHighQSet_i")=(0,0,65535) … … 610 610 AppendToGraph $"MedQSet_i" vs $"MedQSet_q" 611 611 ModifyGraph log=1,mode=3,marker($"MedQSet_i")=8,msize=2,rgb($"MedQSet_i")=(65535,0,0),opaque($"MedQSet_i")=1 612 ErrorBars $"MedQSet_i" Y,wave=($"MedQSet_s",$"MedQSet_s")612 ErrorBars/T=0 $"MedQSet_i" Y,wave=($"MedQSet_s",$"MedQSet_s") 613 613 AppendToGraph $"TrimMedQSet_i" vs $"TrimMedQSet_q" 614 614 ModifyGraph mode($"TrimMedQSet_i")=3,marker($"TrimMedQSet_i")=19,msize=2,rgb($"TrimMedQSet_i")=(65535,0,0) … … 623 623 AppendToGraph $"LowQSet_i" vs $"LowQSet_q" 624 624 ModifyGraph log=1,mode=3,marker($"LowQSet_i")=8,msize=2,rgb($"LowQSet_i")=(2,39321,1),opaque($"LowQSet_i")=1 625 ErrorBars $"LowQSet_i" Y,wave=($"LowQSet_s",$"LowQSet_s")625 ErrorBars/T=0 $"LowQSet_i" Y,wave=($"LowQSet_s",$"LowQSet_s") 626 626 AppendToGraph $"TrimLowQSet_i" vs $"TrimLowQSet_q" 627 627 ModifyGraph mode($"TrimLowQSet_i")=3,marker($"TrimLowQSet_i")=19,msize=2,rgb($"TrimLowQSet_i")=(2,39321,1) -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Subtract_1D.ipf
r412 r477 309 309 DoWindow/C Plot_Sub1D 310 310 ModifyGraph rgb(ysample)=(65535,0,0) 311 ErrorBars ysample Y,wave=(ssample,ssample)311 ErrorBars/T=0 ysample Y,wave=(ssample,ssample) 312 312 AppendToGraph/L ysolvent vs xsolvent 313 313 ModifyGraph rgb(ysolvent)=(0,0,65535) 314 ErrorBars ysolvent Y,wave=(ssolvent,ssolvent)314 ErrorBars/T=0 ysolvent Y,wave=(ssolvent,ssolvent) 315 315 //AppendToGraph/R yresult vs xresult 316 316 AppendToGraph/L yresult vs xresult 317 317 ModifyGraph rgb(yresult)=(0,65535,0) 318 ErrorBars yresult Y,wave=(sresult,sresult)318 ErrorBars/T=0 yresult Y,wave=(sresult,sresult) 319 319 ModifyGraph mode=3, msize=2, marker=19, mirror=1, tick=2, log(bottom)=1 320 320 Legend/C/N=text0/J/A=LT/X=2/Y=2 "\\s(ysample) Sample\r\\s(ysolvent) Solvent\r\\s(yresult) Result" … … 568 568 endif 569 569 End 570 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf
r472 r477 120 120 ModifyGraph mode(DetCts_SAM)=3,marker(DetCts_SAM)=19,msize(DetCts_SAM)=2 121 121 ModifyGraph tickUnit=1 122 ErrorBars DetCts_SAM Y,wave=(ErrDetCts_SAM,ErrDetCts_SAM)122 ErrorBars/T=0 DetCts_SAM Y,wave=(ErrDetCts_SAM,ErrDetCts_SAM) 123 123 endif 124 124 SetDataFolder root: … … 145 145 ModifyGraph mode(DetCts_EMP)=3,marker(DetCts_EMP)=19 146 146 ModifyGraph tickUnit=1 147 ErrorBars DetCts_EMP Y,wave=(ErrDetCts_EMP,ErrDetCts_EMP)147 ErrorBars/T=0 DetCts_EMP Y,wave=(ErrDetCts_EMP,ErrDetCts_EMP) 148 148 endif 149 149 SetDataFolder root: -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf
r432 r477 961 961 ModifyGraph rgb(I_exp_orig)=(0,0,0) 962 962 ModifyGraph msize=2,grid=1,log=1,mirror=2,standoff=0,tickunit=1 963 ErrorBars I_exp_orig Y,wave=(S_exp_orig,S_exp_orig)963 ErrorBars/T=0 I_exp_orig Y,wave=(S_exp_orig,S_exp_orig) 964 964 Legend/N=text0/J "\\F'Courier'\\s(I_exp_orig) I_exp_orig" 965 965 Label left "Intensity" … … 1022 1022 ModifyGraph mode(I_dsm)=3,marker(I_dsm)=19 1023 1023 ModifyGraph rgb(I_dsm)=(1,16019,65535),msize(I_dsm)=2 1024 ErrorBars I_dsm Y,wave=(S_dsm,S_dsm)1024 ErrorBars/T=0 I_dsm Y,wave=(S_dsm,S_dsm) 1025 1025 setdatafolder root: 1026 1026 endif -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf
r475 r477 219 219 ModifyGraph axisEnab(left3)={0.8,1},gridEnab={0.1,1} 220 220 ModifyGraph axisEnab(bottom1)={0.1,1},gridEnab(bottom1)={0.1,1} 221 ErrorBars DetCts Y,wave=(ErrDetCts,ErrDetCts)221 ErrorBars/T=0 DetCts Y,wave=(ErrDetCts,ErrDetCts) 222 222 TextBox/F=0/E=2/A=MB/Y=2/N=text1 "Angle" 223 223 TextBox/F=0/O=90/E=2/A=LC/X=2/N=text2 "Counts"
Note: See TracChangeset
for help on using the changeset viewer.