Ignore:
Timestamp:
Apr 11, 2014 2:16:12 PM (9 years ago)
Author:
srkline
Message:

fixed incorrect units in Beaucage model (B) in model and help file. Calculation was and still is correct.

Changed some of the FFT examples so that they are more easily used.

Added a FFT "GenericModel?" that can be used with the simulator. Whatever is drawn in the matrix is used for the simulatin. There are limitations -- since FFT is used for the calculation, the q-points are interpolated and may not be sufficient for the instrumental q-range. Also, since the FFT q-range is finite, the random deviate calculation is generally unreliable. So scattering power, multiple scattering, are unreliable. Don't expect anything reasonable from the 2D Monte carlo for this reason.

The FFT panel now shows the (real) Qmin and Qmax that you'll get out.

Fixed some issues with updating the 1D graphs in the VCALC panel. Now the SlitSmeared? calculations are plotting properly, although I'd like to now remove the T/B detectors since there's not enough data there.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VCALC_PanelMockUp.ipf

    r935 r936  
    4747        STRUCT WMSetVariableAction sva 
    4848        sva.eventCode = 3 
    49         sva.dval = 0.3 
     49//      sva.dval = 0.3 
    5050 
    5151        V_BDet_SDD_SetVarProc(sva)               

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorBin_Middle.ipf

    r935 r936  
    370370        endif 
    371371 
     372        if(binType==4)          // slit aperture binning - Mt, ML, MR, MB are averaged 
     373                ClearIQIfDisplayed("MLRTB") 
     374                ClearIQIfDisplayed("MLR") 
     375                ClearIQIfDisplayed("MTB") 
     376                 
     377                SetDataFolder root:Packages:NIST:VSANS:VCALC 
     378                CheckDisplayed/W=VCALC#Panels_IQ iBin_qxqy_ML 
     379                 
     380                if(V_flag==0) 
     381                        AppendtoGraph/W=VCALC#Panels_IQ iBin_qxqy_ML vs qBin_qxqy_ML 
     382                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_MR vs qBin_qxqy_MR 
     383                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_MT vs qBin_qxqy_MT 
     384                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_MB vs qBin_qxqy_MB 
     385                        ModifyGraph/W=VCALC#Panels_IQ mode=4 
     386                        ModifyGraph/W=VCALC#Panels_IQ marker=19 
     387                        ModifyGraph/W=VCALC#Panels_IQ rgb(iBin_qxqy_ML)=(65535,0,0),rgb(iBin_qxqy_MB)=(1,16019,65535),rgb(iBin_qxqy_MR)=(65535,0,0),rgb(iBin_qxqy_MT)=(1,16019,65535) 
     388                        ModifyGraph/W=VCALC#Panels_IQ msize=2 
     389                        ModifyGraph/W=VCALC#Panels_IQ muloffset(iBin_qxqy_ML)={0,4},muloffset(iBin_qxqy_MB)={0,2},muloffset(iBin_qxqy_MR)={0,8} 
     390                        ModifyGraph/W=VCALC#Panels_IQ grid=1 
     391                        ModifyGraph/W=VCALC#Panels_IQ log=1 
     392                        ModifyGraph/W=VCALC#Panels_IQ mirror=2 
     393                endif            
     394                         
     395        endif 
    372396        SetDataFolder root: 
    373397EndMacro 
    … …  
    543567        SetDataFolder root:Packages:NIST:VSANS:VCALC 
    544568 
    545         CheckDisplayed/W=VCALC#Panels_IQ iBin_qxqy_B 
    546          
    547         if(V_flag==0) 
    548                 AppendtoGraph/W=VCALC#Panels_IQ iBin_qxqy_B vs qBin_qxqy_B 
    549                 ModifyGraph/W=VCALC#Panels_IQ mode=4 
    550                 ModifyGraph/W=VCALC#Panels_IQ marker=19 
    551                 ModifyGraph/W=VCALC#Panels_IQ rgb(iBin_qxqy_B)=(1,52428,52428) 
    552                 ModifyGraph/W=VCALC#Panels_IQ msize=2 
    553                 ModifyGraph/W=VCALC#Panels_IQ grid=1 
    554                 ModifyGraph/W=VCALC#Panels_IQ log=1 
    555                 ModifyGraph/W=VCALC#Panels_IQ mirror=2 
    556         endif 
     569        Variable binType 
     570         
     571        ControlInfo/W=VCALC popup_b 
     572        binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4 
     573         
     574 
     575        if(binType==1 || binType==2 || binType==3) 
     576                 
     577                SetDataFolder root:Packages:NIST:VSANS:VCALC 
     578                CheckDisplayed/W=VCALC#Panels_IQ iBin_qxqy_B 
     579                 
     580                if(V_flag==0) 
     581                        AppendtoGraph/W=VCALC#Panels_IQ iBin_qxqy_B vs qBin_qxqy_B 
     582                        ModifyGraph/W=VCALC#Panels_IQ mode=4 
     583                        ModifyGraph/W=VCALC#Panels_IQ marker=19 
     584                        ModifyGraph/W=VCALC#Panels_IQ rgb(iBin_qxqy_B)=(1,52428,52428) 
     585                        ModifyGraph/W=VCALC#Panels_IQ msize=2 
     586                        ModifyGraph/W=VCALC#Panels_IQ grid=1 
     587                        ModifyGraph/W=VCALC#Panels_IQ log=1 
     588                        ModifyGraph/W=VCALC#Panels_IQ mirror=2 
     589                endif 
     590        endif 
     591 
     592        //nothing different here since there is ony a single detector to display, but for the future... 
     593        if(binType==4) 
     594                 
     595                SetDataFolder root:Packages:NIST:VSANS:VCALC 
     596                CheckDisplayed/W=VCALC#Panels_IQ iBin_qxqy_B 
     597                 
     598                if(V_flag==0) 
     599                        AppendtoGraph/W=VCALC#Panels_IQ iBin_qxqy_B vs qBin_qxqy_B 
     600                        ModifyGraph/W=VCALC#Panels_IQ mode=4 
     601                        ModifyGraph/W=VCALC#Panels_IQ marker=19 
     602                        ModifyGraph/W=VCALC#Panels_IQ rgb(iBin_qxqy_B)=(1,52428,52428) 
     603                        ModifyGraph/W=VCALC#Panels_IQ msize=2 
     604                        ModifyGraph/W=VCALC#Panels_IQ grid=1 
     605                        ModifyGraph/W=VCALC#Panels_IQ log=1 
     606                        ModifyGraph/W=VCALC#Panels_IQ mirror=2 
     607                endif 
     608        endif 
     609 
     610         
     611 
    557612         
    558613        SetDataFolder root: 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorBinning.ipf

    r935 r936  
    12681268                         
    12691269        endif 
     1270 
     1271 
     1272        if(binType==4)          //slit mode 
     1273                ClearIQIfDisplayed("FLRTB") 
     1274                ClearIQIfDisplayed("FLR") 
     1275                ClearIQIfDisplayed("FTB") 
     1276                 
     1277                SetDataFolder root:Packages:NIST:VSANS:VCALC 
     1278                CheckDisplayed/W=VCALC#Panels_IQ iBin_qxqy_FL 
     1279                 
     1280                if(V_flag==0) 
     1281                        AppendtoGraph/W=VCALC#Panels_IQ iBin_qxqy_FL vs qBin_qxqy_FL 
     1282                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_FR vs qBin_qxqy_FR 
     1283                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_FT vs qBin_qxqy_FT 
     1284                        AppendToGraph/W=VCALC#Panels_IQ iBin_qxqy_FB vs qBin_qxqy_FB 
     1285                        ModifyGraph/W=VCALC#Panels_IQ mode=4 
     1286                        ModifyGraph/W=VCALC#Panels_IQ marker=19 
     1287                        ModifyGraph/W=VCALC#Panels_IQ rgb(iBin_qxqy_FL)=(39321,26208,1),rgb(iBin_qxqy_FB)=(2,39321,1),rgb(iBin_qxqy_FR)=(39321,26208,1),rgb(iBin_qxqy_FT)=(2,39321,1) 
     1288                        ModifyGraph/W=VCALC#Panels_IQ msize=2 
     1289                        ModifyGraph/W=VCALC#Panels_IQ muloffset(iBin_qxqy_FL)={0,4},muloffset(iBin_qxqy_FB)={0,2},muloffset(iBin_qxqy_FR)={0,8} 
     1290                        ModifyGraph/W=VCALC#Panels_IQ grid=1 
     1291                        ModifyGraph/W=VCALC#Panels_IQ log=1 
     1292                        ModifyGraph/W=VCALC#Panels_IQ mirror=2 
     1293                        Label/W=VCALC#Panels_IQ left "Intensity (1/cm)" 
     1294                        Label/W=VCALC#Panels_IQ bottom "Q (1/A)" 
     1295                endif    
     1296                                 
     1297        endif 
     1298 
    12701299         
    12711300        SetDataFolder root: 
Note: See TracChangeset for help on using the changeset viewer.