Ignore:
Timestamp:
Apr 15, 2010 2:25:11 PM (13 years ago)
Author:
srkline
Message:

Corrected the identification of HFIR trans files

Added new includes for analysis and usans, with higher version numbers. the old ones now simply point to the new one. this provides a mechanism for identifying experiments that were generated and saved with an older version of the macros - the old include file will be present. All three packages now display an alert if the experiment was generated from asn old version of the macros.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS
Files:
1 added
2 edited

Legend:

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

    r668 r693  
    4343// 
    4444Proc ShowUSANSPanel() 
     45 
     46        if(itemsinlist(WinList("USANS_Includes.ipf", ";","INCLUDE:6"),";") != 0) 
     47                //must be opening a v2.2 or earlier template 
     48                DoAlert 0,"This experiment was created with an old version (v2.2 or earlier) of the macros. I'll try to make this work, but please start new work with a current template" 
     49        endif 
     50         
    4551        //version number 
    46         Variable/G root:USANS_RED_VERSION=2.21                  //distribution as of Jan 2007 
     52        Variable/G root:USANS_RED_VERSION=2.3                   //distribution as of Jan 2007 
    4753         
    4854        Init_MainUSANS() 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANS_Includes.ipf

    r608 r693  
    33#pragma IgorVersion=6.1 
    44 
    5 //************* 
    6 // the list of files to include in the USANS reduction experiment 
    7 //  - files must be located somewhere in the User Procedures folder 
    8 // or sub-folders 
     5 
     6///point to the current version, so I can recognize old experiments 
     7#include "USANS_Includes_v230" 
     8 
     9 
     10////************* 
     11//// the list of files to include in the USANS reduction experiment 
     12////  - files must be located somewhere in the User Procedures folder 
     13//// or sub-folders 
     14//// 
    915// 
    10  
    11 #include "BT5_Loader",version >= 2.20    
    12 #include "COR_Graph",version >= 2.20                     
    13 #include "Main_USANS",version >= 2.20    
    14 #include "PlotUtilsMacro_v40",version >= 2.20 
    15 #include "NIST_XML_v40" 
    16 #include "USANS_SlitSmearing_v40"        
    17 #include "WriteUSANSData",version >= 2.20        
    18 #include "LakeDesmearing_JB",version >= 2.20     
    19 #include "USANSCatNotebook",version >= 2.20      
    20 #include "CheckVersionFTP"                              //added June 2008 
    21 #include "GaussUtils_v40"                               //added Oct 2008 for unified file loading 
    22 #include "BT5_AddFiles"                                 //Oct 2009 to add raw data files 
    23  
    24 // USANS simulation and required procedures 
    25 #include "U_CALC" 
    26 #include "USANS_EmptyWaves" 
    27 #include "MultScatter_MonteCarlo_2D" 
    28 #include "SASCALC" 
    29 #include "NCNR_DataReadWrite" 
    30 #include "SANS_Utilities" 
    31 #include "NCNR_Utils" 
    32 #include "MultipleReduce" 
    33  
    34 //AJJ for data set output? 
    35 //#include "DataSetHandling" 
    36 //#Include "WriteModelData_v40" 
     16//#include "BT5_Loader",version >= 2.20  
     17//#include "COR_Graph",version >= 2.20                   
     18//#include "Main_USANS",version >= 2.20  
     19//#include "PlotUtilsMacro_v40",version >= 2.20 
     20//#include "NIST_XML_v40" 
     21//#include "USANS_SlitSmearing_v40"      
     22//#include "WriteUSANSData",version >= 2.20      
     23//#include "LakeDesmearing_JB",version >= 2.20   
     24//#include "USANSCatNotebook",version >= 2.20    
     25//#include "CheckVersionFTP"                            //added June 2008 
     26//#include "GaussUtils_v40"                             //added Oct 2008 for unified file loading 
     27//#include "BT5_AddFiles"                                       //Oct 2009 to add raw data files 
     28// 
     29//// USANS simulation and required procedures 
     30//#include "U_CALC" 
     31//#include "USANS_EmptyWaves" 
     32//#include "MultScatter_MonteCarlo_2D" 
     33//#include "SASCALC" 
     34//#include "NCNR_DataReadWrite" 
     35//#include "SANS_Utilities" 
     36//#include "NCNR_Utils" 
     37//#include "MultipleReduce" 
     38// 
     39////AJJ for data set output? 
     40////#include "DataSetHandling" 
     41////#Include "WriteModelData_v40" 
Note: See TracChangeset for help on using the changeset viewer.