Ignore:
Timestamp:
Apr 9, 2007 3:42:39 PM (15 years ago)
Author:
srkline
Message:

2nd pass of pulling out NCNR calls. Also cleared a lot of deadwood from the code, removing depricated functions that were mostly already commented out.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/CircSectAve.ipf

    r47 r76  
    329329        DDet = DetectorPixelResolution(fileStr,detStr)          //needs detector type and beamline 
    330330         
    331         //print fileStr 
    332 //      do 
    333 //        if(strsearch(fileStr, "NG5", 0) != -1) 
    334 //          //string was found, it's an NG5 file 
    335 //          DDet = 1.0 
    336 //          break 
    337 //        Endif 
    338 //        if(strsearch(fileStr, "NG3", 0) != -1) 
    339 //          //string was found, it's an NG3 file 
    340 //          DDet = 0.5 
    341 //          break 
    342 //        Endif 
    343 //        if(strsearch(fileStr, "NG7", 0) != -1) 
    344 //          //string was found, it's an NG7 file 
    345 //          DDet = 0.5 
    346 //          break 
    347 //        Endif 
    348 //      while(0) 
    349  
    350331        //Width of annulus used for the average is gotten from the 
    351332        //input dialog before.  This also must be passed to the resolution 
     
    356337 
    357338        ii=0 
    358 //      String res_string="root:myGlobals:Res_vals" 
    359 //      Make/O/D/N=3 $res_string 
    360 //      Wave res_wave=$res_string 
     339 
    361340        Variable ret1,ret2,ret3 
    362341        do 
    363342                getResolution(qval[ii],lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,ddr,ret1,ret2,ret3) 
    364                 sigmaq[ii] = ret1       //res_wave[0] 
    365                 qbar[ii] = ret2         //res_wave[1] 
    366                 fsubs[ii] = ret3                //res_wave[2] 
     343                sigmaq[ii] = ret1        
     344                qbar[ii] = ret2  
     345                fsubs[ii] = ret3         
    367346                ii+=1 
    368347        while(ii<nq) 
     
    374353        //Plot the data in the Plot_1d window 
    375354        Avg_1D_Graph(aveint,qval,sigave) 
    376 //      DoWindow/F Plot_1d 
    377 //      If(V_flag == 1)         //the graph window already exists 
    378 //              //kill the old graph and make a new one 
    379 //              //easier than adjusting the old one 
    380 //              DoWindow/K Plot_1d 
    381 //      Endif 
    382 //      //make a completely new graph 
    383 //      Display /W=(412,51,727,302)/K=1 aveint vs qval 
    384 //      ModifyGraph log=1 
    385 //      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0) 
    386 //      ErrorBars aveint Y,wave=(sigave,sigave) 
    387 //      Label left "Counts";DelayUpdate 
    388 //      Label bottom "q\\U" 
    389 //      SVAR angst = root:myGlobals:gAngstStr 
    390 //      Label bottom "q ("+angst+"\\S-1\\M)" 
    391 //      DoWindow/C Plot_1d 
    392          
     355 
    393356        //get rid of the default mask, if one was created (it is in the current folder) 
    394357        //don't just kill "mask" since it might be pointing to the one in the MSK folder 
     
    493456                //rename the button to reflect "isLin" - the displayed name must have been isLog 
    494457                Button bisLog,title="isLin",rename=bisLin 
    495                  
    496458        Endif 
    497459 
     
    522484        Return 0 
    523485End 
    524 //above is unused function 
Note: See TracChangeset for help on using the changeset viewer.