Changeset 1091 for sans


Ignore:
Timestamp:
Mar 16, 2018 3:38:18 PM (5 years ago)
Author:
srkline
Message:

a number of changes, mostly to allow everything to compile.

added conditional compile to ensure that XML code would not be compiled if VSANS was present, since it's not XML-aware.

modified V_MainPanel to avoid conflicts with the SANS version. There still may be some functions hidden in procedures that do not have the V_ prefix yet, but these are either for functions that should point to a common file, or procedures that have been hidden from the VSANS panel

modified saving of VSANS mask files so that they can still be saved from teh deom version where home path is not defined.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_SuperFormula.ipf

    r1089 r1091  
    5555        SetDrawLayer UserBack 
    5656        SetVariable setvar0,pos={37.00,92.00},size={80.00,18.00},title="r",fSize=12 
    57         SetVariable setvar0,limits={-20,20,1},value= _NUM:3,disable=2 
     57        SetVariable setvar0,limits={-20,20,1},value= _NUM:3,disable=1 
    5858        SetVariable setvar1,pos={37.00,118.00},size={80.00,18.00},title="t",fSize=12 
    59         SetVariable setvar1,limits={-20,20,1},value= _NUM:2,disable=2 
     59        SetVariable setvar1,limits={-20,20,1},value= _NUM:2,disable=1 
    6060        SetVariable setvar2,pos={37.00,145.00},size={80.00,18.00},title="s",fSize=12 
    61         SetVariable setvar2,limits={-20,20,1},value= _NUM:4,disable=2 
     61        SetVariable setvar2,limits={-20,20,1},value= _NUM:4,disable=1 
    6262        SetVariable setvar3,pos={37.00,172.00},size={80.00,18.00},title="rad",fSize=12 
    63         SetVariable setvar3,limits={0,50,1},value= _NUM:15,disable=2 
     63        SetVariable setvar3,limits={0,50,1},value= _NUM:15,disable=1 
    6464         
    6565        SetVariable setvar4,pos={162.00,91.00},size={80.00,18.00},title="m",fSize=12 
    … …  
    8888        CheckBox check3,fSize=12,value= 1,mode=1,proc=SuperCheckProc 
    8989 
    90         Button button0,pos={208.00,215.00},size={70.00,20.00},proc=SuperCalcButtonProc,title="Calculate" 
     90        Button button0,pos={190.00,215.00},size={80.00,20.00},proc=SuperCalcButtonProc,title="Calculate" 
     91        Button button1,pos={190.00,245.00},size={80.00,20.00},proc=PointCloudButtonProc,title="Point Cloud" 
     92 
    9193 
    9294End 
    … …  
    113115                                        SetVariable setvar0 disable=0 
    114116                                        SetVariable setvar1 disable=0 
    115                                         SetVariable setvar2 disable=2 
    116                                         SetVariable setvar3 disable=2 
    117                                         SetVariable setvar4 disable=2 
    118                                         SetVariable setvar5 disable=2 
    119                                         SetVariable setvar6 disable=2 
    120                                         SetVariable setvar7 disable=2 
     117                                        SetVariable setvar2 disable=1 
     118                                        SetVariable setvar3 disable=1 
     119                                        SetVariable setvar4 disable=1 
     120                                        SetVariable setvar5 disable=1 
     121                                        SetVariable setvar6 disable=1 
     122                                        SetVariable setvar7 disable=1 
    121123                                         
    122124                                        break 
    … …  
    125127                                        SetVariable setvar0 disable=0 
    126128                                        SetVariable setvar1 disable=0 
    127                                         SetVariable setvar2 disable=2 
     129                                        SetVariable setvar2 disable=1 
    128130                                        SetVariable setvar3 disable=0 
    129                                         SetVariable setvar4 disable=2 
    130                                         SetVariable setvar5 disable=2 
    131                                         SetVariable setvar6 disable=2 
    132                                         SetVariable setvar7 disable=2 
     131                                        SetVariable setvar4 disable=1 
     132                                        SetVariable setvar5 disable=1 
     133                                        SetVariable setvar6 disable=1 
     134                                        SetVariable setvar7 disable=1 
    133135                                        break 
    134136                                case "check2":          // Quadric 
    … …  
    137139                                        SetVariable setvar1 disable=0 
    138140                                        SetVariable setvar2 disable=0 
    139                                         SetVariable setvar3 disable=2 
    140                                         SetVariable setvar4 disable=2 
    141                                         SetVariable setvar5 disable=2 
    142                                         SetVariable setvar6 disable=2 
    143                                         SetVariable setvar7 disable=2 
     141                                        SetVariable setvar3 disable=1 
     142                                        SetVariable setvar4 disable=1 
     143                                        SetVariable setvar5 disable=1 
     144                                        SetVariable setvar6 disable=1 
     145                                        SetVariable setvar7 disable=1 
    144146                                        break 
    145147                                case "check3":          // SuperFormula 
    146148                                        gRadioVal= 4 
    147                                         SetVariable setvar0 disable=2 
    148                                         SetVariable setvar1 disable=2 
    149                                         SetVariable setvar2 disable=2 
    150                                         SetVariable setvar3 disable=2 
     149                                        SetVariable setvar0 disable=1 
     150                                        SetVariable setvar1 disable=1 
     151                                        SetVariable setvar2 disable=1 
     152                                        SetVariable setvar3 disable=1 
    151153                                        SetVariable setvar4 disable=0 
    152154                                        SetVariable setvar5 disable=0 
    … …  
    251253End 
    252254 
    253  
     255Function PointCloudButtonProc(ba) : ButtonControl 
     256        STRUCT WMButtonAction &ba 
     257 
     258        switch( ba.eventCode ) 
     259                case 2: // mouse up 
     260                        // click code here 
     261                        Execute "mat_as_3dCloud()" 
     262                         
     263                        break 
     264                case -1: // control being killed 
     265                        break 
     266        endswitch 
     267 
     268        return 0 
     269End 
    254270 
    255271 
    … …  
    412428// will plot either the 2d or 3d version, whichever was most recently 
    413429// calculated -- the M_parametric wave is plotted 
    414 Window Gizmo_superSurface() : GizmoPlot 
     430Proc Gizmo_superSurface() 
    415431        PauseUpdate; Silent 1           // building window... 
    416432        // Building Gizmo 7 window... 
    … …  
    621637// execute mat = voxW, then the voxelgram can be FFT'd, or Debye's method 
    622638// 
    623 Window Gizmo_superVox() : GizmoPlot 
     639Proc Gizmo_superVox() 
    624640        PauseUpdate; Silent 1           // building window... 
    625641        // Building Gizmo 7 window... 
    … …  
    780796// change the isoValue to plot a different surface 
    781797// 
    782 Window Gizmo_Isosurface() : GizmoPlot 
     798Proc Gizmo_Isosurface() 
    783799        PauseUpdate; Silent 1           // building window... 
    784800        // Building Gizmo 7 window... 
    … …  
    818834// viewed 
    819835// 
    820 Window mat_as_3dCloud() : GizmoPlot 
     836Proc mat_as_3dCloud() : GizmoPlot 
    821837        PauseUpdate; Silent 1           // building window... 
    822838        // Building Gizmo 7 window... 

  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r994 r1091  
    44 
    55 
    6 #if( Exists("XmlOpenFile") ) 
     6//#if( exists("XmlOpenFile") && exists("NCNR_VSANS") ) 
     7#if( exists("XmlOpenFile") && exists("NCNR_VSANS") ) 
    78 
    89#include "cansasXML", version >= 1.10 

  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r1079 r1091  
    12051205        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    12061206        list = RemoveFromList(tmp, list  ,";") 
    1207          
     1207 
     1208 
    12081209        //prototypes that show up if GF is loaded 
    12091210        list = RemoveFromList("GFFitFuncTemplate", list) 
    … …  
    13481349// from 2017-2018 VSANS reduction 
    13491350        list = RemoveFromList("V_BroadPeak_Pix2D;V_BroadPeak_Pix2D_noThread;V_CleanupTimes;V_I_BroadPeak_Pix2D;V_IndexForHistogram;V_MakeFibonacciWave;V_UpdatePix2Mat;xJointHistogram;",list,";") 
    1350                          
     1351 
     1352        tmp = FunctionList("*X_",";","KIND:10")         // dummy functions with "X_" at the end, for vsans (2018) 
     1353        list = RemoveFromList(tmp, list  ,";") 
     1354         
     1355        list = RemoveFromList("Integrate_BuiltIn;intgrnd;V_WB_testKernel;",list,";") 
     1356 
     1357                                 
    13511358        list = SortList(list) 
    13521359        return(list) 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/WriteUSANSData.ipf

    r994 r1091  
    204204///Need to think about consolidation of functions. 
    205205 
    206 #if( Exists("XmlOpenFile") ) 
     206//#if( Exists("XmlOpenFile") ) 
     207#if( exists("XmlOpenFile") && exists("NCNR_VSANS") ) 
     208 
    207209 
    208210Function WriteXMLUSANSWaves(type,fullpath,lo,hi,dialog) 

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

    r1060 r1091  
    365365                case 2: // mouse up 
    366366                        // click code here 
     367                        v_tic() 
     368                        printf "Show rescaled time graph = " 
    367369                        Execute "V_ShowRescaledTimeGraph()" 
     370                        v_toc() 
    368371                        // 
     372                        v_tic() 
     373                        printf "calculate and show differential = " 
    369374                        V_DifferentiatedTime() 
     375                        v_toc() 
    370376                        // 
    371377                        break 
    … …  
    958964         
    959965 
     966Variable t1 = ticks 
    960967        SetDataFolder root:Packages:NIST:VSANS:Event: 
    961968 
    … …  
    10061013//       
    10071014 
    1008 //tic() 
     1015 
    10091016        Wave timePt=timePt 
    10101017        Wave xLoc=xLoc 
    10111018        Wave yLoc=yLoc 
    10121019        V_CleanupTimes(xLoc,yLoc,timePt)                //remove zeroes  
    1013 //toc() 
    10141020         
    10151021        NVAR gResol = root:Packages:NIST:VSANS:Event:gResol             //timeStep in clock frequency (Hz) 
    … …  
    10231029//  -- the time scaling is NOT done. it is still in raw ticks. 
    10241030// 
     1031 
    10251032        if(mode == MODE_STREAM)         // continuous "Stream" mode - start from zero 
     1033        v_tic() 
     1034        printf "Duplicate wave = " 
    10261035                Duplicate/O timePt rescaledTime 
     1036        v_toc() 
     1037        v_tic() 
     1038        printf "rescale time = " 
    10271039                rescaledTime = 1*(timePt-timePt[0])             //convert to nanoseconds and start from zero 
     1040        v_toc() 
     1041        v_tic() 
     1042        printf "find wave Max = " 
    10281043                t_longest = waveMax(rescaledTime)               //should be the last point       
     1044        v_toc() 
    10291045        endif 
     1046 
    10301047         
    10311048        if(mode == MODE_OSCILL)         // oscillatory mode - don't adjust the times, we get periodic t0 to reset t=0 
    … …  
    10511068        SetDataFolder root: 
    10521069 
     1070Variable t2 = ticks 
     1071 
    10531072        STRUCT WMButtonAction ba 
    10541073        ba.eventCode = 2 
    10551074        V_ShowEventDataButtonProc(ba) 
    10561075 
     1076Variable t3 = ticks 
     1077 
     1078        Print "load and process (s) = ",(t2-t1)/60.15 
     1079        Print "Overall including graphs (s) = ",(t3-t1)/60.15 
    10571080        return(0) 
    10581081End 

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

    r1075 r1091  
    10901090         
    10911091        Variable fileID 
    1092         HDF5CreateFile/P=home /O /Z fileID as filename 
     1092        PathInfo home 
     1093        if(V_flag == 1) 
     1094                HDF5CreateFile/P=home /O /Z fileID as filename 
     1095        else 
     1096                HDF5CreateFile /O/I /Z fileID as filename 
     1097        endif 
    10931098        if (V_flag != 0) 
    10941099                Print "HDF5CreateFile failed" 

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

    r1082 r1091  
    114114                Main_VSANS_Panel() 
    115115        Endif 
    116 //      ResizeCmdWindow() 
     116//      V_ResizeCmdWindow() 
    117117 
    118118// TODO - be sure that NCNR is defined correctly         
    … …  
    362362// command window is always visible at startup of the macros. No need for a hook function 
    363363// 
    364 Function ResizeCmdWindow() 
     364Function V_ResizeCmdWindow() 
    365365 
    366366        String str=IgorInfo(0),rect="",platform=igorinfo(2) 

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

    r1086 r1091  
    2424// x- there could be a default mask, or look for the mask that is speficied in the 
    2525// next file that is read in from the path 
    26 Proc PickPath_MainButtonProc(ctrlName) : ButtonControl 
     26Proc V_PickPath_MainButtonProc(ctrlName) : ButtonControl 
    2727        String ctrlName 
    2828         
    … …  
    4545End 
    4646 
    47 Proc DrawMask_MainButtonProc(ctrlName) : ButtonControl 
     47Proc V_DrawMask_MainButtonProc(ctrlName) : ButtonControl 
    4848        String ctrlName 
    4949         
    … …  
    5555// this will only load the data into RAW, overwriting whatever is there. no copy is put in rawVSANS 
    5656// 
    57 Proc DisplayMainButtonProc(ctrlName) : ButtonControl 
     57Proc V_DisplayMainButtonProc(ctrlName) : ButtonControl 
    5858        String ctrlName 
    5959 
    … …  
    7474End 
    7575 
    76 Proc PatchMainButtonProc(ctrlName) : ButtonControl 
     76Proc V_PatchMainButtonProc(ctrlName) : ButtonControl 
    7777        String ctrlName 
    7878 
    … …  
    8080End 
    8181 
    82 Proc Patch_XY_MainButtonProc(ctrlName) : ButtonControl 
     82Proc V_Patch_XY_MainButtonProc(ctrlName) : ButtonControl 
    8383        String ctrlName 
    8484 
    … …  
    8686End 
    8787 
    88 Proc Patch_DeadTime_MainButtonProc(ctrlName) : ButtonControl 
     88Proc V_Patch_DeadTime_MainButtonProc(ctrlName) : ButtonControl 
    8989        String ctrlName 
    9090 
    … …  
    9292End 
    9393 
    94 Proc Patch_Calib_MainButtonProc(ctrlName) : ButtonControl 
     94Proc V_Patch_Calib_MainButtonProc(ctrlName) : ButtonControl 
    9595        String ctrlName 
    9696 
    … …  
    9999 
    100100 
    101 Proc TransMainButtonProc(ctrlName) : ButtonControl 
     101Proc V_TransMainButtonProc(ctrlName) : ButtonControl 
    102102        String ctrlName 
    103103 
    … …  
    105105End 
    106106 
    107 Proc BuildProtocol_MainButtonProc(ctrlName) : ButtonControl 
     107Proc V_BuildProtocol_MainButtonProc(ctrlName) : ButtonControl 
    108108        String ctrlName 
    109109 
    … …  
    111111End 
    112112 
    113 Proc ReduceAFile_MainButtonProc(ctrlName) : ButtonControl 
     113Proc V_ReduceAFile_MainButtonProc(ctrlName) : ButtonControl 
    114114        String ctrlName 
    115115 
    … …  
    118118End 
    119119 
    120 Proc ReduceMultiple_MainButtonProc(ctrlName) : ButtonControl 
     120Proc V_ReduceMultiple_MainButtonProc(ctrlName) : ButtonControl 
    121121        String ctrlName 
    122122 
    … …  
    124124End 
    125125 
    126 Proc Plot1D_MainButtonProc(ctrlName) : ButtonControl 
     126Proc V_Plot1D_MainButtonProc(ctrlName) : ButtonControl 
    127127        String ctrlName 
    128128 
    … …  
    131131End 
    132132 
    133 Proc Sort1D_MainButtonProc(ctrlName) : ButtonControl 
     133Proc V_Sort1D_MainButtonProc(ctrlName) : ButtonControl 
    134134        String ctrlName 
    135135 
    … …  
    138138End 
    139139 
    140 Proc Combine1D_MainButtonProc(ctrlName) : ButtonControl 
     140Proc V_Combine1D_MainButtonProc(ctrlName) : ButtonControl 
    141141        String ctrlName 
    142142 
    … …  
    146146 
    147147 
    148 Proc Fit1D_MainButtonProc(ctrlName) : ButtonControl 
     148Proc V_Fit1D_MainButtonProc(ctrlName) : ButtonControl 
    149149        String ctrlName 
    150150 
    … …  
    154154End 
    155155 
    156 //Proc FitRPA_MainButtonProc(ctrlName) : ButtonControl 
     156//Proc V_FitRPA_MainButtonProc(ctrlName) : ButtonControl 
    157157//      String ctrlName 
    158158// 
    … …  
    160160//End 
    161161 
    162 Proc Subtract1D_MainButtonProc(ctrlName) : ButtonControl 
     162Proc V_Subtract1D_MainButtonProc(ctrlName) : ButtonControl 
    163163        String ctrlName 
    164164 
    … …  
    166166End 
    167167 
    168 Proc Arithmetic1D_MainButtonProc(ctrlName) : ButtonControl 
     168Proc V_Arithmetic1D_MainButtonProc(ctrlName) : ButtonControl 
    169169        String ctrlName 
    170170 
    … …  
    174174End 
    175175 
    176 Proc DisplayInterm_MainButtonProc(ctrlName) : ButtonControl 
     176Proc V_DisplayInterm_MainButtonProc(ctrlName) : ButtonControl 
    177177        String ctrlName 
    178178 
    … …  
    182182//  
    183183// - fill in with a proper reader that will display the mask(s) 
    184 Proc ReadMask_MainButtonProc(ctrlName) : ButtonControl 
     184Proc V_ReadMask_MainButtonProc(ctrlName) : ButtonControl 
    185185        String ctrlName 
    186186 
    … …  
    189189End 
    190190 
    191 Proc Draw3D_MainButtonProc(ctrlName) : ButtonControl 
     191Proc V_Draw3D_MainButtonProc(ctrlName) : ButtonControl 
    192192        String ctrlName 
    193193 
    … …  
    199199 
    200200////on Misc Ops tab, generates a notebook 
    201 //Proc CatShort_MainButtonProc(ctrlName) : ButtonControl 
     201//Proc V_CatShort_MainButtonProc(ctrlName) : ButtonControl 
    202202//      String ctrlName 
    203203// 
    … …  
    206206 
    207207//button is labeled "File Catalog" 
    208 Proc CatVShort_MainButtonProc(ctrlName) : ButtonControl 
     208Proc V_CatVShort_MainButtonProc(ctrlName) : ButtonControl 
    209209        String ctrlName 
    210210 
    … …  
    212212End 
    213213 
    214 Proc CatSort_MainButtonProc(ctrlName) : ButtonControl 
     214Proc V_CatSort_MainButtonProc(ctrlName) : ButtonControl 
    215215        String ctrlName 
    216216         
    … …  
    218218End 
    219219 
    220 Proc ShowCatShort_MainButtonProc(ctrlName) : ButtonControl 
     220Proc V_ShowCatShort_MainButtonProc(ctrlName) : ButtonControl 
    221221        String ctrlName 
    222222 
    … …  
    224224End 
    225225 
    226 Proc ShowSchematic_MainButtonProc(ctrlName) : ButtonControl 
     226Proc V_ShowSchematic_MainButtonProc(ctrlName) : ButtonControl 
    227227        String ctrlName 
    228228         
    … …  
    235235End 
    236236 
    237 Proc ShowAvePanel_MainButtonProc(ctrlName) : ButtonControl 
     237Proc V_ShowAvePanel_MainButtonProc(ctrlName) : ButtonControl 
    238238        String ctrlName 
    239239 
    … …  
    241241End 
    242242 
    243 Proc HelpMainButtonProc(ctrlName) : ButtonControl 
     243Proc V_HelpMainButtonProc(ctrlName) : ButtonControl 
    244244        String ctrlName 
    245245        DisplayHelpTopic/Z/K=1 "VSANS Data Reduction Tutorial" 
    … …  
    249249End 
    250250 
    251 Proc ShowTilePanel_MainButtonProc(ctrlName) : ButtonControl 
     251Proc V_ShowTilePanel_MainButtonProc(ctrlName) : ButtonControl 
    252252        String ctrlName 
    253253         
    … …  
    260260End 
    261261 
    262 Proc NonLinTubes_MainButtonProc(ctrlName) : ButtonControl 
     262Proc V_NonLinTubes_MainButtonProc(ctrlName) : ButtonControl 
    263263        String ctrlName 
    264264 
    … …  
    266266End 
    267267 
    268 Proc CopyWork_MainButtonProc(ctrlName) : ButtonControl 
     268Proc V_CopyWork_MainButtonProc(ctrlName) : ButtonControl 
    269269        String ctrlName 
    270270 
    … …  
    272272End 
    273273 
    274 Proc PRODIV_MainButtonProc(ctrlName) : ButtonControl 
     274Proc V_PRODIV_MainButtonProc(ctrlName) : ButtonControl 
    275275        String ctrlName 
    276276 
    … …  
    287287 
    288288 
    289 Proc WorkMath_MainButtonProc(ctrlName) : ButtonControl 
     289Proc V_WorkMath_MainButtonProc(ctrlName) : ButtonControl 
    290290        String ctrlName 
    291291 
    … …  
    293293End 
    294294 
    295 //Proc TISANE_MainButtonProc(ctrlName) : ButtonControl 
     295//Proc V_TISANE_MainButtonProc(ctrlName) : ButtonControl 
    296296//      String ctrlName 
    297297//       
    … …  
    305305//End 
    306306 
    307 Proc Event_MainButtonProc(ctrlName) : ButtonControl 
     307Proc V_Event_MainButtonProc(ctrlName) : ButtonControl 
    308308        String ctrlName 
    309309         
    … …  
    317317End 
    318318 
    319 Proc Raw2ASCII_MainButtonProc(ctrlName) : ButtonControl 
     319Proc V_Raw2ASCII_MainButtonProc(ctrlName) : ButtonControl 
    320320        String ctrlName 
    321321 
    … …  
    323323End 
    324324 
    325 Proc RealTime_MainButtonProc(ctrlName) : ButtonControl 
     325Proc V_RealTime_MainButtonProc(ctrlName) : ButtonControl 
    326326        String ctrlName 
    327327 
    … …  
    330330                DoAlert 0,"This operation is not available in this set of macros" 
    331331        else 
    332                 Show_RealTime_Panel() 
    333         endif 
    334 End 
    335  
    336 Proc RTReduce_MainButtonProc(ctrlName) : ButtonControl 
     332                V_Show_RealTime_Panel() 
     333        endif 
     334End 
     335 
     336Proc V_RTReduce_MainButtonProc(ctrlName) : ButtonControl 
    337337        String ctrlName 
    338338 
    … …  
    340340End 
    341341 
    342 Proc Preferences_MainButtonProc(ctrlName) : ButtonControl 
     342Proc V_Preferences_MainButtonProc(ctrlName) : ButtonControl 
    343343        String ctrlName 
    344344 
    … …  
    347347 
    348348 
    349 Proc DataTree_MainButtonProc(ctrlName) : ButtonControl 
     349Proc V_DataTree_MainButtonProc(ctrlName) : ButtonControl 
    350350        String ctrlName 
    351351 
    … …  
    370370////// 
    371371//on main portion of panel 
    372         Button MainButtonA,pos={8,8},size={80,20},title="Pick Path",proc=PickPath_MainButtonProc 
     372        Button MainButtonA,pos={8,8},size={80,20},title="Pick Path",proc=V_PickPath_MainButtonProc 
    373373        Button MainButtonA,help={"Pick the local data folder that contains the VSANS data"} 
    374         Button MainButtonB,pos={100,8},size={90,20},proc=CatVShort_MainButtonProc,title="File Catalog" 
     374        Button MainButtonB,pos={100,8},size={90,20},proc=V_CatVShort_MainButtonProc,title="File Catalog" 
    375375        Button MainButtonB,help={"This will generate a condensed CATalog table of all files in a specified local folder"} 
    376         Button MainButtonC,pos={250,8},size={50,20},proc=HelpMainButtonProc,title="Help" 
     376        Button MainButtonC,pos={250,8},size={50,20},proc=V_HelpMainButtonProc,title="Help" 
    377377        Button MainButtonC,help={"Display the help file"} 
    378         Button MainButtonD,pos={320,8},size={80,20},proc=SR_OpenTracTicketPage,title="Feedback" 
     378        Button MainButtonD,pos={320,8},size={80,20},proc=V_SR_OpenTracTicketPage,title="Feedback" 
    379379        Button MainButtonD,help={"Submit bug reports or feature requests"} 
    380380         
    381         TabControl MainTab,pos={7,49},size={410,202},tabLabel(0)="Raw Data",proc=MainTabProc 
     381        TabControl MainTab,pos={7,49},size={410,202},tabLabel(0)="Raw Data",proc=V_MainTabProc 
    382382        TabControl MainTab,tabLabel(1)="Reduction",tabLabel(2)="1-D Ops",tabLabel(3)="2-D Ops",tabLabel(4)="Misc Ops" 
    383383        TabControl MainTab,value=0 
    … …  
    386386         
    387387//on tab(0) - Raw Data - initially visible 
    388         Button MainButton_0a,pos={15,90},size={130,20},proc=DisplayMainButtonProc,title="Display Raw Data" 
     388        Button MainButton_0a,pos={15,90},size={130,20},proc=V_DisplayMainButtonProc,title="Display Raw Data" 
    389389        Button MainButton_0a,help={"Display will load and plot a single 2-D raw data file"} 
    390         Button MainButton_0b,pos={15,120},size={70,20},proc=PatchMainButtonProc,title="Patch" 
     390        Button MainButton_0b,pos={15,120},size={70,20},proc=V_PatchMainButtonProc,title="Patch" 
    391391        Button MainButton_0b,help={"Patch will update incorrect information in raw data headers"} 
    392         Button MainButton_0c,pos={15,150},size={110,20},proc=TransMainButtonProc,title="Transmission" 
     392        Button MainButton_0c,pos={15,150},size={110,20},proc=V_TransMainButtonProc,title="Transmission" 
    393393        Button MainButton_0c,help={"Shows the panel which allows calculation of sample transmissions and patching values into raw data headers"} 
    394         Button MainButton_0d,pos={15,180},size={130,20},proc=RealTime_MainButtonProc,title="RealTime Display" 
     394        Button MainButton_0d,pos={15,180},size={130,20},proc=V_RealTime_MainButtonProc,title="RealTime Display" 
    395395        Button MainButton_0d,help={"Shows the panel for control of the RealTime data display. Only used during data collection"} 
    396         Button MainButton_0e,pos={15,210},size={130,20},proc=CatSort_MainButtonProc,title="Sort Catalog" 
     396        Button MainButton_0e,pos={15,210},size={130,20},proc=V_CatSort_MainButtonProc,title="Sort Catalog" 
    397397        Button MainButton_0e,help={"Sort the Data Catalog, courtesy of ANSTO"} 
    398         Button MainButton_0f,pos={300,90},size={90,20},proc=DataTree_MainButtonProc,title="Data Tree" 
     398        Button MainButton_0f,pos={300,90},size={90,20},proc=V_DataTree_MainButtonProc,title="Data Tree" 
    399399        Button MainButton_0f,help={"Show the header and data tree"} 
    400         Button MainButton_0g,pos={170,180},size={110,20},proc=RTReduce_MainButtonProc,title="RT Reduction" 
     400        Button MainButton_0g,pos={170,180},size={110,20},proc=V_RTReduce_MainButtonProc,title="RT Reduction" 
    401401        Button MainButton_0g,help={"Reduce live (incomplete) data files during acquisition"} 
    402         Button MainButton_0h,pos={170,90},size={90,20},proc=Patch_XY_MainButtonProc,title="Patch XY" 
     402        Button MainButton_0h,pos={170,90},size={90,20},proc=V_Patch_XY_MainButtonProc,title="Patch XY" 
    403403        Button MainButton_0h,help={"Easy patching of XY beam center to multiple files"} 
    404         Button MainButton_0i,pos={170,120},size={110,20},proc=Patch_DeadTime_MainButtonProc,title="Patch DeadTime" 
     404        Button MainButton_0i,pos={170,120},size={110,20},proc=V_Patch_DeadTime_MainButtonProc,title="Patch DeadTime" 
    405405        Button MainButton_0i,help={"Easy patching of dead time tables to multiple files"} 
    406         Button MainButton_0j,pos={170,150},size={90,20},proc=Patch_Calib_MainButtonProc,title="Patch Calib" 
     406        Button MainButton_0j,pos={170,150},size={90,20},proc=V_Patch_Calib_MainButtonProc,title="Patch Calib" 
    407407        Button MainButton_0j,help={"Easy patching of nonlinear calibration tables to multiple files"} 
    408408 
    409409//on tab(1) - Reduction 
    410         Button MainButton_1a,pos={15,90},size={110,20},proc=BuildProtocol_MainButtonProc,title="Build Protocol" 
     410        Button MainButton_1a,pos={15,90},size={110,20},proc=V_BuildProtocol_MainButtonProc,title="Build Protocol" 
    411411        Button MainButton_1a,help={"Shows a panel where the CATalog window is used as input for creating a protocol. Can also be used for standard reductions"} 
    412 //      Button MainButton_1b,pos={15,120},size={110,20},proc=ReduceAFile_MainButtonProc,title="Reduce a File" 
     412//      Button MainButton_1b,pos={15,120},size={110,20},proc=V_ReduceAFile_MainButtonProc,title="Reduce a File" 
    413413//      Button MainButton_1b,help={"Presents a questionnare for creating a reduction protocol, then reduces a single file"} 
    414         Button MainButton_1c,pos={15,150},size={160,20},proc=ReduceMultiple_MainButtonProc,title="Reduce Multiple Files" 
     414        Button MainButton_1c,pos={15,150},size={160,20},proc=V_ReduceMultiple_MainButtonProc,title="Reduce Multiple Files" 
    415415        Button MainButton_1c,help={"Use for reducing multiple raw datasets after protocol(s) have been created"} 
    416 //      Button MainButton_1d,pos={15,180},size={110,20},proc=ShowCatShort_MainButtonProc,title="Show CAT Table" 
     416//      Button MainButton_1d,pos={15,180},size={110,20},proc=V_ShowCatShort_MainButtonProc,title="Show CAT Table" 
    417417//      Button MainButton_1d,help={"This button will bring the CATalog window to the front, if it exists"} 
    418418        Button MainButton_1a,disable=1 
    … …  
    422422 
    423423//on tab(2) - 1-D operations 
    424         Button MainButton_2a,pos={15,90},size={60,20},proc=Plot1D_MainButtonProc,title="Plot" 
     424        Button MainButton_2a,pos={15,90},size={60,20},proc=V_Plot1D_MainButtonProc,title="Plot" 
    425425        Button MainButton_2a,help={"Loads and plots a 1-D dataset in the format expected by \"FIT\""} 
    426 //      Button MainButton_2b,pos={15,120},size={60,20},proc=Sort1D_MainButtonProc,title="Sort" 
     426//      Button MainButton_2b,pos={15,120},size={60,20},proc=V_Sort1D_MainButtonProc,title="Sort" 
    427427//      Button MainButton_2b,help={"Sorts and combines 2 or 3 separate 1-D datasets into a single file. Use \"Plot\" button to import 1-D data files"} 
    428         Button MainButton_2c,pos={15,150},size={60,20},proc=Fit1D_MainButtonProc,title="FIT" 
     428        Button MainButton_2c,pos={15,150},size={60,20},proc=V_Fit1D_MainButtonProc,title="FIT" 
    429429        Button MainButton_2c,help={"Shows panel for performing a variety of linearized fits to 1-D data files. Use \"Plot\" button to import 1-D data files"} 
    430 //      Button MainButton_2d,pos={15,180},size={60,20},proc=FITRPA_MainButtonProc,title="FIT/RPA" 
     430//      Button MainButton_2d,pos={15,180},size={60,20},proc=V_FITRPA_MainButtonProc,title="FIT/RPA" 
    431431//      Button MainButton_2d,help={"Shows panel for performing a fit to a polymer standard."} 
    432 //      Button MainButton_2e,pos={120,90},size={90,20},proc=Subtract1D_MainButtonProc,title="Subtract 1D" 
     432//      Button MainButton_2e,pos={120,90},size={90,20},proc=V_Subtract1D_MainButtonProc,title="Subtract 1D" 
    433433//      Button MainButton_2e,help={"Shows panel for subtracting two 1-D data sets"} 
    434         Button MainButton_2e,pos={120,90},size={110,20},proc=Arithmetic1D_MainButtonProc,title="1D Arithmetic" 
     434        Button MainButton_2e,pos={120,90},size={110,20},proc=V_Arithmetic1D_MainButtonProc,title="1D Arithmetic" 
    435435        Button MainButton_2e,help={"Shows panel for doing arithmetic on 1D data sets"} 
    436         Button MainButton_2f,pos={120,120},size={130,20},proc=Combine1D_MainButtonProc,title="Combine 1D Files" 
     436        Button MainButton_2f,pos={120,120},size={130,20},proc=V_Combine1D_MainButtonProc,title="Combine 1D Files" 
    437437        Button MainButton_2f,help={"Shows panel for selecting points to trim before combining files"} 
    438438        Button MainButton_2a,disable=1 
    … …  
    446446 
    447447//on tab(3) - 2-D Operations 
    448         Button MainButton_3a,pos={15,90},size={90,20},proc=DisplayInterm_MainButtonProc,title="Display 2D" 
     448        Button MainButton_3a,pos={15,90},size={90,20},proc=V_DisplayInterm_MainButtonProc,title="Display 2D" 
    449449        Button MainButton_3a,help={"Display will plot a 2-D work data file that has previously been created during data reduction"} 
    450         Button MainButton_3b,pos={15,120},size={90,20},title="Draw Mask",proc=DrawMask_MainButtonProc 
     450        Button MainButton_3b,pos={15,120},size={90,20},title="Draw Mask",proc=V_DrawMask_MainButtonProc 
    451451        Button MainButton_3b,help={"Draw a mask file and save it."} 
    452         Button MainButton_3c,pos={15,150},size={90,20},proc=ReadMask_MainButtonProc,title="Read Mask" 
     452        Button MainButton_3c,pos={15,150},size={90,20},proc=V_ReadMask_MainButtonProc,title="Read Mask" 
    453453        Button MainButton_3c,help={"Reads a mask file into the proper work folder"} 
    454 //      Button MainButton_3d,pos={15,180},size={100,20},title="Tile RAW 2D",proc=ShowTilePanel_MainButtonProc 
     454//      Button MainButton_3d,pos={15,180},size={100,20},title="Tile RAW 2D",proc=V_ShowTilePanel_MainButtonProc 
    455455//      Button MainButton_3d,help={"Adds selected RAW data files to a layout."} 
    456         Button MainButton_3e,pos={150,90},size={100,20},title="Copy Work",proc=CopyWork_MainButtonProc 
     456        Button MainButton_3e,pos={150,90},size={100,20},title="Copy Work",proc=V_CopyWork_MainButtonProc 
    457457        Button MainButton_3e,help={"Copies WORK data from specified folder to destination folder."} 
    458 //      Button MainButton_3f,pos={150,120},size={110,20},title="WorkFile Math",proc=WorkMath_MainButtonProc 
     458//      Button MainButton_3f,pos={150,120},size={110,20},title="WorkFile Math",proc=V_WorkMath_MainButtonProc 
    459459//      Button MainButton_3f,help={"Perfom simple math operations on workfile data"} 
    460         Button MainButton_3g,pos={150,180},size={100,20},title="Event Data",proc=Event_MainButtonProc 
     460        Button MainButton_3g,pos={150,180},size={100,20},title="Event Data",proc=V_Event_MainButtonProc 
    461461        Button MainButton_3g,help={"Manipulate VSANS Event Mode data"} 
    462462         
    … …  
    470470 
    471471//on tab(4) - Miscellaneous operations 
    472         Button MainButton_4a,pos={15,90},size={80,20},proc=Draw3D_MainButtonProc,title="3D Display" 
     472        Button MainButton_4a,pos={15,90},size={80,20},proc=V_Draw3D_MainButtonProc,title="3D Display" 
    473473        Button MainButton_4a,help={"Plots a 3-D surface of the selected file type"} 
    474 //      Button MainButton_4b,pos={15,120},size={120,20},proc=ShowSchematic_MainButtonProc,title="Show Schematic" 
     474//      Button MainButton_4b,pos={15,120},size={120,20},proc=V_ShowSchematic_MainButtonProc,title="Show Schematic" 
    475475//      Button MainButton_4b,help={"Use this to show a schematic of the data reduction process for a selected sample file and reduction protocol"} 
    476 //      Button MainButton_4c,pos={15,150},size={80,20},proc=ShowAvePanel_MainButtonProc,title="Average" 
     476//      Button MainButton_4c,pos={15,150},size={80,20},proc=V_ShowAvePanel_MainButtonProc,title="Average" 
    477477//      Button MainButton_4c,help={"Shows a panel for interactive selection of the 1-D averaging step"} 
    478 //      Button MainButton_4d,pos={15,180},size={110,20},proc=CatShort_MainButtonProc,title="CAT/Notebook" 
     478//      Button MainButton_4d,pos={15,180},size={110,20},proc=V_CatShort_MainButtonProc,title="CAT/Notebook" 
    479479//      Button MainButton_4d,help={"This will generate a CATalog notebook of all files in a specified local folder"} 
    480         Button MainButton_4e,pos={180,90},size={130,20},proc=NonLinTubes_MainButtonProc,title="Fit NonLinear Tubes" 
     480        Button MainButton_4e,pos={180,90},size={130,20},proc=V_NonLinTubes_MainButtonProc,title="Fit NonLinear Tubes" 
    481481        Button MainButton_4e,help={""} 
    482         Button MainButton_4f,pos={180,120},size={130,20},proc=PRODIV_MainButtonProc,title="Make DIV file" 
     482        Button MainButton_4f,pos={180,120},size={130,20},proc=V_PRODIV_MainButtonProc,title="Make DIV file" 
    483483        Button MainButton_4f,help={"Displays panels and outlines the steps for generating a detector sensitivity file"} 
    484 //      Button MainButton_4g,pos={180,150},size={130,20},proc=Raw2ASCII_MainButtonProc,title="RAW ASCII Export" 
     484//      Button MainButton_4g,pos={180,150},size={130,20},proc=V_Raw2ASCII_MainButtonProc,title="RAW ASCII Export" 
    485485//      Button MainButton_4g,help={"Exports selected RAW (2D) data file(s) as ASCII, either as pixel values or I(Qx,Qy)"} 
    486         Button MainButton_4h,pos={180,180},size={130,20},proc=Preferences_MainButtonProc,title="Preferences" 
     486        Button MainButton_4h,pos={180,180},size={130,20},proc=V_Preferences_MainButtonProc,title="Preferences" 
    487487        Button MainButton_4h,help={"Sets user preferences for selected parameters"} 
    488488         
    … …  
    505505// in this way, buttons will always be drawn correctly.. 
    506506// 
    507 Function MainTabProc(name,tab) 
     507Function V_MainTabProc(name,tab) 
    508508        String name 
    509509        Variable tab 
    … …  
    524524 
    525525// 
    526 Function SR_OpenTracTicketPage(ctrlName) 
     526Function V_SR_OpenTracTicketPage(ctrlName) 
    527527        String ctrlName 
    528528        DoAlert 1,"Your web browser will open to a page where you can submit your bug report or feature request. OK?" 

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

    r1084 r1091  
    671671//that is semicolon delimited, and is suitable for display in a popup menu 
    672672// 
    673 Function/S xGetValidPatchPopupList() 
     673Function/S V_xGetValidPatchPopupList() 
    674674 
    675675        //make sure that path exists 

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

    r1035 r1091  
    3636// - always initialize to make sure that the background task is properly set 
    3737// 
    38 Proc Show_RealTime_Panel() 
     38Proc V_Show_RealTime_Panel() 
    3939        V_Init_RT()             //always init, data folders and globals are created here 
    4040        DoWindow/F VSANS_RT_Panel 

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

    r1090 r1091  
    1111// distribution.  
    1212// 
    13 // using Integrate function --  
     13// using Integrate function -- find the normalization value 
    1414// 
    1515// integral = 20926 (cts*A) for "top" 
    … …  
    1717// integration of interpolated data (100 pts) = 20051 (3 A to 9 A) 
    1818// 
     19// 
     20// gives an average wavelength of 5.302 A 
     21// median ~ 5.97 A 
    1922// 
    2023// 
    … …  
    3437         
    3538        if(lam < 3.84) 
    36                 return(23715 -5649*lam) 
     39                return(23715 - 5649*lam) 
    3740        endif 
    3841         
    39 // the "middle" of the spikes    
     42//// the "middle" of the spikes  
    4043//      if(lam < 4.12) 
    4144//              return(-84962 + 22634*lam) 
    … …  
    4548//      endif 
    4649 
    47 // the "top" of the spikes 
     50//// the "top" of the spikes 
    4851        if(lam < 4.16) 
    4952                return(-84962 + 22634*lam) 

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

    r1090 r1091  
    102102 
    103103// using the "trangular" distribution (cange the function call) 
    104 //      loLim = 4/5.3 
    105 //      upLim = 8/5.3 
     104        loLim = 4/5.3 
     105        upLim = 8/5.3 
    106106         
    107107        answer_Rom_WB = Integrate_BuiltIn(cw,loLim,upLim,qVals) 
Note: See TracChangeset for help on using the changeset viewer.