Ignore:
Timestamp:
Oct 23, 2008 5:39:12 PM (14 years ago)
Author:
srkline
Message:

A variety of fixes to make some procedures compatible with the new Packages:NIST subfolder structure

Also, some additional changes to include the proper procedures when loading overall packages

File:
1 edited

Legend:

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

    r412 r431  
    147147        tempName = S_path + tempName 
    148148         
    149         //load in the data (into the root directory) 
    150         LoadOneDDataWithName(tempName) 
     149        //load in the data (into the its own folder) 
     150        A_LoadOneDDataWithName(tempName,0) 
    151151        //Print S_fileName 
    152152        //Print tempName 
    153153         
    154         String cleanLastFileName = "root:"+CleanupName(root:myGlobals:gLastFileName,0) 
    155  
    156         tempName=cleanLastFileName+"_q" 
    157         Duplicate/O $tempName xAxisWave 
    158         tempName=cleanLastFileName+"_i" 
    159         Duplicate/O $tempName yAxisWave 
    160         tempName=cleanLastFileName+"_s" 
    161         Duplicate/O $tempName yErrWave 
     154        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
     155 
     156        tempName="root:"+cleanLastFileName+":"+cleanLastFileName 
     157        Duplicate/O $(tempName+"_q") xAxisWave 
     158        //tempName=cleanLastFileName+"_i" 
     159        Duplicate/O $(tempName+"_i") yAxisWave 
     160        //tempName=cleanLastFileName+"_s" 
     161        Duplicate/O $(tempName+"_s") yErrWave 
    162162 
    163163        //Plot, and adjust the scaling to match the axis scaling set by the popups 
     
    248248        //get the filename from the global as it's loaded, rather from the popup - as version numbers 
    249249        // do cause problems here. This global is also used later in this function 
    250         SVAR gLastFileName = root:myGlobals:gLastFileName 
    251          
    252         Wave xw = $( CleanupName((gLastFileName + "_q"),0) ) 
    253         Wave yw = $( CleanupName((gLastFileName + "_i"),0) ) 
    254         Wave ew = $( CleanupName((gLastFileName + "_s"),0) ) 
     250        SVAR gLastFileName = root:Packages:NIST:gLastFileName 
     251        String tempStr = CleanupName(gLastFileName,0) 
     252        String tempName = "root:"+tempStr+":"+tempStr 
     253         
     254        Wave xw = $(tempName+"_q") 
     255        Wave yw = $(tempName+"_i") 
     256        Wave ew = $(tempName+"_s") 
    255257         
    256258        //variables set for each model to control look of graph 
     
    522524        //ystr and xstr are the axis strings - filter with a do-loop 
    523525        String ystr="",xstr="" 
    524         SVAR gLastFileName = root:myGlobals:gLastFileName 
     526        SVAR gLastFileName = root:Packages:NIST:gLastFileName 
    525527        SVAR aStr = root:myGlobals:gAngstStr 
    526          
     528        String tmpStr = CleanupName(gLastFileName,0) 
    527529        //ControlInfo/W=FitPanel ywave 
    528         Wave xw = $( CleanupName((gLastFileName + "_q"),0) ) 
     530        Wave xw = $("root:"+tmpStr+":"+tmpStr+"_q") 
    529531        ControlInfo/W=FitPanel yModel 
    530532        ystr = S_Value 
     
    841843        String ctrlName 
    842844        // 
    843         String cleanLastFileName = "root:"+CleanupName(root:myGlobals:gLastFileName,0) 
    844         String tempName 
    845  
    846         tempName=cleanLastFileName+"_q" 
    847         Duplicate/O $tempName xAxisWave 
    848         tempName=cleanLastFileName+"_i" 
    849         Duplicate/O $tempName yAxisWave 
    850         tempName=cleanLastFileName+"_s" 
    851         Duplicate/O $tempName yErrWave 
    852         Duplicate/O $tempName yWtWave 
    853         Duplicate/O $tempName residWave 
     845        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
     846        String tmpStr = "root:"+cleanLastFileName+":"+cleanLastFileName 
     847 
     848        Duplicate/O $(tmpStr+"_q") xAxisWave 
     849        Duplicate/O $(tmpStr+"_i") yAxisWave 
     850        Duplicate/O $(tmpStr+"_s") yErrWave,yWtWave,residWave 
     851 
    854852        yWtWave = 1/yErrWave 
    855853         
     
    10281026         
    10291027        //load in the data (into the root directory) 
    1030         LoadOneDDataWithName(tempName) 
     1028        A_LoadOneDDataWithName(tempName,0) 
    10311029        //Print S_fileName 
    10321030        //Print tempName 
    10331031         
    1034         String cleanLastFileName = "root:"+CleanupName(root:myGlobals:gLastFileName,0) 
    1035  
    1036         tempName=cleanLastFileName+"_q" 
    1037         Duplicate/o $tempName xAxisWave 
    1038         tempName=cleanLastFileName+"_i" 
    1039         Duplicate/o $tempName yAxisWave 
    1040         tempName=cleanLastFileName+"_s" 
    1041         Duplicate/o $tempName yErrWave 
     1032        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
     1033        String tmpStr = "root:"+cleanLastFileName+":"+cleanLastFileName 
     1034 
     1035        Duplicate/o $(tmpStr+"_q") xAxisWave 
     1036        Duplicate/o $(tmpStr+"_i") yAxisWave 
     1037        Duplicate/o $(tmpStr+"_s") yErrWave 
     1038         
    10421039        Variable xmin, xmax 
    10431040        WaveStats/Q xAxisWave 
Note: See TracChangeset for help on using the changeset viewer.