Changeset 921


Ignore:
Timestamp:
Sep 12, 2013 10:11:24 AM (9 years ago)
Author:
srkline
Message:

fixed an issue in Invariant where the file loader would fail if it tried to load in a name that was too long and needed to be truncated. Issue was resolved and updated to behave like the main file loader. Another good reason to consolidate the file loaders rather than have them scattered around...

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

    r710 r921  
    627627        //Print S_fileName 
    628628        //Print tempName 
    629          
    630         String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
     629 
     630// if the data loader forced a shorter name, get it now 
     631        String newStr = root:Packages:NIST:gShortNameStr 
     632        String cleanLastFileName 
     633        if(strlen(newStr) > 0) 
     634                 cleanLastFileName = CleanupName(newStr,0) 
     635        else 
     636                 cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
     637        endif 
     638         
    631639        String dataStr = "root:"+cleanLastFileName+":" 
     640 
    632641         
    633642        // keep global copies of the names rather than reading from the popup 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MC_SimulationScripting.ipf

    r905 r921  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2 
     3 
     4 
     5 
     6//************ 
     7// un-comment the Macros menu declaration to provide easier access to the functions 
     8//************ 
     9 
     10 
    211 
    312// this is a file with all of the functions that can be used to 
    413// script the MC simulation of data 
    5 // 1D will also be supported, unless I can find a reason not to support this. 
    6 // 
    7 // there will be a lot of utility functions to "move" the parts of an instrument that 
     14// 
     15// there are a lot of utility functions to "move" the parts of an instrument that 
    816// are "moveable" into different configurations. The aim is to have this appear as 
    917// much like running an experiment as possible. 
     
    542550 
    543551// 
    544 // Important - in the reduction process, set the  dead time correction to something 
     552// Important - in the reduction process, set the dead time correction to something 
    545553// really small, say 10^-15 so that  it won't have any effect (since the detector CR is fictionally high) 
    546554// 
Note: See TracChangeset for help on using the changeset viewer.