Changeset 1069


Ignore:
Timestamp:
Oct 3, 2017 4:28:37 PM (5 years ago)
Author:
krzywon
Message:

More code cleanup in the NXcanSAS writer.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteHDF5.ipf

    r1068 r1069  
    66 
    77//************************ 
    8 // Vers 1.14 20170928 
     8// Vers 1.15 20171003 
    99// 
    1010//************************ 
     
    359359        Make/O/T/N=5 $(collimationBase + ":attrVals") = {"SAScollimation","NXcollimator"} 
    360360        CreateStrNxCansas(fileID,collimationParent,"","",empty,$(collimationBase + ":attr"),$(collimationBase + ":attrVals")) 
    361         // Create SAScollimation length entry 
    362         Make/O/N=1 $(collimationBase + ":length") = {15.3} // TODO: Get real value 
    363         CreateVarNxCansas(fileID,collimationParent,"sasaperture","length",$(collimationBase + ":length"),units,m) 
    364361        // Create SAScollimation distance entry 
    365362        Make/O/N=1 $(collimationBase + ":distance") = {rw[25]} 
     
    473470        Make/T/N=1 $(base + ":entryAttr") = {""} 
    474471        Make/T/N=1 $(base + ":entryAttrVals") = {""} 
    475         CreateStrNxCansas(fileID,parent,"","definition",NxCansas_strPtToWave("NXcanSAS"),$(base + ":entryAttr"),$(base + ":entryAttrVals")) 
    476 End 
    477  
    478 // 
    479 /////////////////////////////////////////////////////////////////////////// 
    480  
    481 /////////////////////////////////////////////////////////////////////////// 
    482 // Functions to put values into usable form for NxCansas 
    483  
    484 // Convert a number to a string 
    485 Function /WAVE NxCansas_varToWave(number) 
    486         Variable number 
    487         Wave returnWave 
    488         Make/N=1 returnWave = {number} 
    489         return returnWave 
    490 End 
    491  
    492 // Create a single point wave from a string 
    493 Function /WAVE NxCansas_strPtToWave(str) 
    494         String str 
    495         Wave/T returnWave 
    496         Make/T/N=1 returnWave = {str} 
    497         return returnWave 
     472        CreateStrNxCansas(fileID,parent,"","definition",{"NXcanSAS"},$(base + ":entryAttr"),$(base + ":entryAttrVals")) 
    498473End 
    499474 
Note: See TracChangeset for help on using the changeset viewer.