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/Schematic.ipf

    r70 r76  
    102102        text2 = "Using Protocol: "+protocolName 
    103103        text3 = "Sample file: "+ root:SAM:fileList 
    104         text5 = "T\\BSAM\\M = " + GetTrans("SAM")       //trans and thickness of the sample 
    105         text5 += "   d\\BSAM\\M = " + GetThick("SAM") + " cm" 
    106         text7 = "T\\BEMP\\M = " + GetTrans("EMP")       //transmission of the empty cell 
     104        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample 
     105        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" 
     106        text7 = "T\\BEMP\\M = " + getTransStrFromReals("EMP")   //transmission of the empty cell 
    107107        //attenuators used in sample measurement 
    108108 
    109         text23 = "SAM Attenuator = "+GetAttenNum("SAM") 
     109        text23 = "SAM Attenuator = "+GetAttenNumStrFromReals("SAM") 
    110110         
    111111        text11 = "Final 1-D Dataset" 
     
    433433        text2 = "Using Protocol: "+protocolName 
    434434        text3 = "Sample file: "+ root:SAM:fileList 
    435         text5 = "T\\BSAM\\M = " + GetTrans("SAM")       //trans and thickness of the sample 
    436         text5 += "   d\\BSAM\\M = " + GetThick("SAM") + " cm" 
    437         text7 = "T\\BEMP\\M = " + GetTrans("EMP")       //transmission of the empty cell 
     435        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample 
     436        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" 
     437        text7 = "T\\BEMP\\M = " + getTransStrFromReals("EMP")   //transmission of the empty cell 
    438438        //attenuators used in sample measurement 
    439439 
    440         text23 = "SAM Attenuator = "+GetAttenNum("SAM") 
     440        text23 = "SAM Attenuator = "+GetAttenNumStrFromReals("SAM") 
    441441         
    442442        text11 = "Final 1-D Dataset" 
     
    623623//returns "none" if the value (in RealsRead) cannot be found 
    624624// 
    625 Function/S GetTrans(type) 
     625Function/S getTransStrFromReals(type) 
    626626        String type 
    627627         
     
    639639//returns "none" if the value (in RealsRead) cannot be found 
    640640// 
    641 Function/S GetThick(type) 
     641Function/S getThickStrFromReals(type) 
    642642        String type 
    643643         
     
    655655//returns "none" if the value (in RealsRead) cannot be found 
    656656// 
    657 Function/S GetAttenNum(type) 
     657Function/S GetAttenNumStrFromReals(type) 
    658658        String type 
    659659         
Note: See TracChangeset for help on using the changeset viewer.