Changeset 1085


Ignore:
Timestamp:
Feb 15, 2018 3:36:42 PM (4 years ago)
Author:
srkline
Message:

corrections to how the DIV generation operates. Added to the documentation as well.

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

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DIVUtils.ipf

    r1079 r1085  
    5959        Button button0,pos={54.00,10.00},size={120.00,20.00},proc=V_DIVSetupButtonProc,title="Setup Folder" 
    6060        Button button1,pos={54.00,40.00},size={120.00,20.00},proc=V_DIVClearOldButtonProc,title="Clear Old DIV" 
    61  
    62         DrawText 36,110,"Reduce data for one carriage"   
     61        Button button1_2,pos={54.00,70.00},size={120.00,20.00},proc=V_DIVMaskButtonProc,title="Mask for DIV" 
     62 
     63        DrawText 36,130,"Reduce data for one carriage"   
    6364        DrawText 36,200,"Repeat for the other carriage" 
    64         Button button1_2,pos={74.00,130.00},size={120.00,20.00},proc=V_DIVMaskButtonProc,title="Mask for DIV" 
    65         Button button2,pos={74.00,160.00},size={120.00,20.00},proc=V_DIVNormalizeButtonProc,title="Normalize+Copy" 
     65         
     66        Button button2,pos={54.00,145.00},size={120.00,20.00},proc=V_DIVNormalizeButtonProc,title="Normalize+Copy" 
    6667 
    6768        DrawText 36,290,"Once data for both carriages has\rbeen normalized, save the file"       
     
    9899                case 2: // mouse up 
    99100                        // click code here 
    100                         V_KillWavesInFolder("DIV") 
     101                         
     102                        KillDataFolder/Z $"root:Packages:NIST:VSANS:DIV"                        //many subfolders, so Kill all 
     103                        if(V_flag == 0)         // kill DF was OK 
     104                                NewDataFolder root:Packages:NIST:VSANS:DIV 
     105                                Print "DIV folder cleared successfully" 
     106                        else 
     107                                Print "DIV folder in use - could not be cleared" 
     108                        endif 
    101109                        break 
    102110                case -1: // control being killed 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MainPanel.ipf

    r1075 r1085  
    268268        String ctrlName 
    269269 
    270         DIV_Setup_Panel() 
    271         V_Display_DIV_Panels()   
     270        DoWindow/F DIV_Setup_Panel 
     271        if(V_flag == 0) 
     272                DIV_Setup_Panel() 
     273        endif 
     274         
     275        DoWindow/F VSANS_DIVPanels 
     276        if(V_flag == 0) 
     277                V_Display_DIV_Panels()   
     278        endif 
    272279End 
    273280 
Note: See TracChangeset for help on using the changeset viewer.