Ignore:
Timestamp:
Nov 22, 2019 10:42:40 AM (3 years ago)
Author:
srkline
Message:

updates to:
how the DIV file is generated. Options for normalization are transparent choices now. Normalizing individually is the correct option to use, others are for testing.

updated what files can be displayed for drawing a mask

updated how the beam stop in place is deciphered

updated which raw data corrections are shown and allowed to be turned on/off on the VSANS preferences.

File:
1 edited

Legend:

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

    r1178 r1227  
    194194        Variable first 
    195195 
     196        String topath = "root:Packages:NIST:VSANS:STO:entry:instrument:detector_" 
     197        String fromPath = "root:Packages:NIST:VSANS:COR:entry:instrument:detector_" 
     198        String detStrList,detStr 
     199        Variable num,ii 
     200         
     201         
    196202        if (cmpstr(carriageStr,"B")==0) 
    197                 V_NormalizeDIV_onePanel(reducedFolderType,"B") 
     203                if(first) 
     204                        V_CopyHDFToWorkFolder("COR","STO") 
     205                else 
     206                        detStr = "B" 
     207                        Duplicate/O $(fromPath+detStr+":data") $(toPath+detStr+":data") 
     208                        Duplicate/O $(fromPath+detStr+":linear_data_error") $(toPath+detStr+":linear_data_error") 
     209                endif 
     210//              V_NormalizeDIV_onePanel(reducedFolderType,"B") 
    198211        else 
    199212                // if it's the first one, copy the whole folder, otherwise just copy over what's needed 
     
    201214                        V_CopyHDFToWorkFolder("COR","STO") 
    202215                else 
    203                         String topath = "root:Packages:NIST:VSANS:STO:entry:instrument:detector_" 
    204                         String fromPath = "root:Packages:NIST:VSANS:COR:entry:instrument:detector_" 
    205                         String detStrList,detStr 
    206                         Variable num,ii 
    207216 
    208217                        if(cmpstr(carriageStr,"F")==0) 
     
    230239// this is called from the button 
    231240// 
    232 Proc V_NormalizeDIV_proc(reducedFolderType,carriageStr) 
    233         String reducedFolderType="COR",carriageStr="F" 
    234          
    235         Vf_NormalizeDIV_proc(reducedFolderType,carriageStr) 
     241Proc V_NormalizeDIV_proc(carriageStr) 
     242        String carriageStr="F" 
     243//      String reducedFolderType="COR",carriageStr="F" 
     244//      Prompt reducedFolderType, "reduced data folder" 
     245        Prompt carriageStr,"panels to group",popup,"All 8;All F All M;Individual;B;" 
     246                 
     247        Vf_NormalizeDIV_proc(carriageStr) 
    236248end 
    237249 
     
    243255// copying to the DIV folder for saving. 
    244256// 
    245 Function Vf_NormalizeDIV_proc(reducedFolderType,carriageStr) 
    246         String reducedFolderType,carriageStr 
     257Function Vf_NormalizeDIV_proc(carriageStr) 
     258        String carriageStr 
    247259 
    248260        if (cmpstr(carriageStr,"B")==0) 
    249                 V_NormalizeDIV_onePanel(reducedFolderType,"B") 
    250         else 
    251                 DoAlert 0,"data for both carriages must already be in STO" 
     261                V_NormalizeDIV_onePanel("STO","B") 
     262                return (0) 
     263        endif 
     264         
     265         
     266        if(cmpstr(carriageStr,"All 8")==0) 
     267//              DoAlert 0,"data for both carriages must already be in STO" 
    252268                V_NormalizeDIV_allEight("STO")                  //forces reduced folder type to STO 
    253         endif 
    254          
    255 //      if (cmpstr(carriageStr,"B")==0) 
    256 //              V_NormalizeDIV_onePanel(reducedFolderType,"B") 
    257 //      elseif (cmpstr(carriageStr,"F")==0) 
     269                return (0) 
     270        endif 
     271 
     272        if(cmpstr(carriageStr,"All F All M")==0) 
    258273//              DoAlert 0,"data for both carriages must already be in STO" 
    259 //              V_NormalizeDIV_allEight("STO")                  //forces reduced folder type to STO 
    260 //       
    261 ////            V_NormalizeDIV_oneCarriage(reducedFolderType,carriageStr) 
    262 // 
    263 ////            V_NormalizeDIV_onePanel(reducedFolderType,"FL") 
    264 ////            V_NormalizeDIV_onePanel(reducedFolderType,"FR") 
    265 ////            V_NormalizeDIV_onePanel(reducedFolderType,"FT") 
    266 ////            V_NormalizeDIV_onePanel(reducedFolderType,"FB") 
    267 //      else 
    268 //       
    269 ////            V_NormalizeDIV_oneCarriage(reducedFolderType,carriageStr) 
    270 //               
    271 ////            V_NormalizeDIV_onePanel(reducedFolderType,"ML") 
    272 ////            V_NormalizeDIV_onePanel(reducedFolderType,"MR") 
    273 ////            V_NormalizeDIV_onePanel(reducedFolderType,"MT") 
    274 ////            V_NormalizeDIV_onePanel(reducedFolderType,"MB")  
    275 //      endif 
     274                V_NormalizeDIV_oneCarriage("STO","F") 
     275                V_NormalizeDIV_oneCarriage("STO","M") 
     276                return (0) 
     277        endif 
     278 
     279        if(cmpstr(carriageStr,"Individual")==0)  
     280                V_NormalizeDIV_onePanel("STO","B") 
     281 
     282                V_NormalizeDIV_onePanel("STO","FL") 
     283                V_NormalizeDIV_onePanel("STO","FR") 
     284                V_NormalizeDIV_onePanel("STO","FT") 
     285                V_NormalizeDIV_onePanel("STO","FB") 
     286         
     287                V_NormalizeDIV_onePanel("STO","ML") 
     288                V_NormalizeDIV_onePanel("STO","MR") 
     289                V_NormalizeDIV_onePanel("STO","MT") 
     290                V_NormalizeDIV_onePanel("STO","MB")      
     291                return(0) 
     292        endif 
    276293         
    277294        return(0) 
Note: See TracChangeset for help on using the changeset viewer.