Ignore:
Timestamp:
Feb 4, 2020 2:09:57 PM (3 years ago)
Author:
srkline
Message:

1) bug fix in the BT5 loader for USANS where an incorrect detector (of the 5) was specified (from B. Maranville). No impact on reduced data.

2) Cleaned up steps of generating DIV files and added file generation time into the DIV file that is saved.

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

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_Loader.ipf

    r1138 r1238  
    154154                        v2 = v2/(1.0-v2*MainDeadTime/countTime)   // Deadtime correction 
    155155                        v3 = v3/(1.0-v3*MainDeadTime/countTime)   // Deadtime correction 
    156                         v4 = v6/(1.0-v4*MainDeadTime/countTime)   // Deadtime correction 
     156                        v4 = v4/(1.0-v4*MainDeadTime/countTime)   // Deadtime correction        // bug fix 1/31/20 from B. Maranville 
    157157                        v5 = v5/(1.0-v5*MainDeadTime/countTime)   // Deadtime correction 
    158158                        v6 = v6/(1.0-v6*MainDeadTime/countTime)   // Deadtime correction 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DIVUtils.ipf

    r1235 r1238  
    179179 
    180180 
    181  
    182  
    183 Proc V_DIVCopy_proc(reducedFolderType,carriageStr,first) 
     181Proc V_DIVCopy_proc(reducedFolderType,carriageStr,firstCopy) 
    184182        String reducedFolderType="COR",carriageStr="F" 
    185         Variable first=1 
     183        String firstCopy="Yes" 
     184 
     185 
     186        Prompt reducedFolderType,"Save files to disk?" 
     187        Prompt carriageStr,"Detector Carriage",popup,"F;M;B;" 
     188        Prompt firstCopy,"First time copying a carriage?",popup,"Yes;No;" 
     189         
     190        Variable first 
     191        if(cmpstr(firstCopy,"Yes")==0) 
     192                first = 1 
     193        else 
     194                first = 0 
     195        endif 
    186196         
    187197        Vf_DIVCopy_proc(reducedFolderType,carriageStr,first) 
     
    193203        String reducedFolderType,carriageStr 
    194204        Variable first 
     205         
    195206 
    196207        String topath = "root:Packages:NIST:VSANS:STO:entry:instrument:detector_" 
     
    698709 
    699710        NewDataFolder/O/S root:VSANS_DIV_file:entry      
    700                 Make/O/T/N=1    title   = "This is a DIV file for VSANS: VSANS_DIV" 
    701                 Make/O/T/N=1    start_date      = "2017-02-28T08:15:30-5:00" 
     711                Make/O/T/N=1    title   = "This is a DIV file for VSANS: VSANS_DIV generated on "+V_CurrentTime_to_ISO8601String(DateTime) 
     712                Make/O/T/N=1    start_date      = V_CurrentTime_to_ISO8601String(DateTime) 
    702713                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument           
    703714                        Make/O/T/N=1    name    = "NG3_VSANS" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_ISO8601_Util.ipf

    r1150 r1238  
    4545 
    4646// 
    47 // Call w/ DateTime as the argument 
     47// Call w/ DateTime as the argument as V_CurrentTime_to_ISO8601String(DateTime) 
    4848// 
    4949// TODO -- verify that this is correct 
Note: See TracChangeset for help on using the changeset viewer.