Ignore:
Timestamp:
Jan 22, 2018 9:39:17 AM (5 years ago)
Author:
srkline
Message:

some of the changes for smearing calculations.

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

Legend:

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

    r1079 r1080  
    114114        endif 
    115115         
    116         // last, set up the dependency 
    117         Make/O/D/N=1 trimUpdate 
    118         trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts) 
    119          
     116        // last, set up the dependency (but don't set it up twice!) 
     117        if(exists("root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate") == 0) 
     118                Make/O/D/N=1 root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate 
     119                root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts) 
     120        else 
     121                string dependencyStr = GetFormula(root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate) 
     122                if(strlen(dependencyStr)==0) 
     123                        root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts) 
     124                endif 
     125        endif 
    120126         
    121127        SetDataFolder root: 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf

    r1079 r1080  
    13581358        // if the DIV workfile doesn't exist, let the user know,and abort 
    13591359 
    1360         WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data") 
     1360        WAVE/Z div_data_err = V_getDetectorDataErrW("DIV",detStr) 
     1361        WAVE/Z div_data = V_getDetectorDataW("DIV",detStr) 
     1362 
     1363//      WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data") 
    13611364        if(WaveExists(div_data) == 0) 
    13621365                Print "The DIV wave does not exist in V_DIVCorrection()" 
    13631366                Return(1)               //error condition 
    13641367        Endif 
     1368        if(WaveExists(div_data_err) == 0) 
     1369                Print "The DIV error wave does not exist in V_DIVCorrection()" 
     1370                Return(1)               //error condition 
     1371        Endif 
    13651372        //files exist, proceed 
    13661373 
     1374// do the error propagation first, since data is changed by the correction 
     1375        data_err = sqrt(data_err^2/div_data^2 + div_data_err^2 * data^2/div_data^4 ) 
     1376 
     1377// then the correction 
    13671378        data /= div_data 
    13681379 
    1369 // TODO: -- correct the error propagation        
    1370         data_err /= div_data 
    13711380         
    13721381        Return(0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_USANS_SlitSmearing_v40.ipf

    r1079 r1080  
    1818// 
    1919 
     20// 
     21// TODO --this needs to be made completely separate from USANS, or MERGE 
     22//    with USANS if the per-Q definition of dQv is valid for the matrix solution 
     23// 
    2024 
    2125 
Note: See TracChangeset for help on using the changeset viewer.