Ignore:
Timestamp:
Oct 14, 2016 12:53:52 PM (6 years ago)
Author:
srkline
Message:

moved the waves and variables for the beam center panel and the mask panel to their own folders, rather than root to avoid conflicts of detector panel display.

File:
1 edited

Legend:

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

    r1005 r1015  
    1111// -- add method to be able to write the values to the local folder / or better, to file on disk 
    1212// -- graphically show the beam center / radius of where it is in relation to the panel 
     13// 
     14// -- move everything into it's own folder, rather than root: 
     15// 
    1316 
    1417 
     
    1619        DoWindow/F PanelFit 
    1720        if(V_flag==0) 
     21         
     22                NewDataFolder/O root:Packages:NIST:VSANS:Globals:BeamCenter 
     23 
    1824                Execute "DetectorPanelFit()" 
    1925        endif 
     
    3945        PopupMenu popup_1,mode=1,popvalue="BroadPeak",value= #"\"BroadPeak;other;\"" 
    4046        PopupMenu popup_2,pos={20,20},size={109,20},title="Data Source"//,proc=SetFldrPopMenuProc 
    41         PopupMenu popup_2,mode=1,popvalue="VCALC",value= #"\"RAW;SAM;VCALC;\"" 
     47        PopupMenu popup_2,mode=1,popvalue="RAW",value= #"\"RAW;SAM;VCALC;\"" 
    4248                 
    4349        Button button_0,pos={486,20},size={80,20},proc=DetFitGuessButtonProc,title="Guess" 
     
    4955 
    5056 
    51  
    52         duplicate/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL:det_FL curDispPanel 
     57        SetDataFolder root:Packages:NIST:VSANS:Globals:BeamCenter 
     58 
     59        duplicate/O root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FL:data curDispPanel 
    5360        SetScale/P x 0,1, curDispPanel 
    5461        SetScale/P y 0,1, curDispPanel 
    5562 
    56  
     63        SetDataFolder root: 
     64         
    5765        // draw the correct images 
    5866        DrawDetPanel("FL") 
     
    156164        Variable nPix_X,nPix_Y,pixSize_X,pixSize_Y 
    157165 
    158          
    159         Wave dispW=root:curDispPanel 
     166 
     167        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel 
    160168        Wave cw = root:coef_PeakPix2D 
    161169 
     
    320328        cw[8] = pixSize_Y*10             
    321329 
     330        SetDataFolder root:Packages:NIST:VSANS:Globals:BeamCenter 
    322331        // generate the new panel display 
    323332        duplicate/O newW curDispPanel 
     
    333342        RenameWindow #,DetData 
    334343        SetActiveSubwindow ##    
     344         
     345        SetDataFolder root: 
     346         
    335347         
    336348                 
     
    392404                case 2: // mouse up 
    393405                        // click code here 
    394                         Wave dispW=root:curDispPanel 
     406                        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel 
    395407                        Wave coefW=root:coef_PeakPix2D 
    396408                         
     
    454466                        // click code here 
    455467                         
    456                         Wave dispW=root:curDispPanel 
     468                        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel 
    457469                        Wave coefW=root:coef_PeakPix2D 
    458470                         
     
    597609// this works if the proper centers are in the file - otherwise, it's a mess     
    598610// "B" is skipped here, as it should be... 
     611 
     612// TODO --?? is this a problem?? 
    599613        SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType 
    600614 
     
    622636Function V_SpreadOutPanels() 
    623637 
     638// TODO ?? is this a problem?? 
    624639        SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType 
    625640 
Note: See TracChangeset for help on using the changeset viewer.