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/Analysis
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r668 r693  
    11#pragma rtGlobals=1             // Use modern global access method. 
    2 #pragma version=4.00 
     2#pragma version=4.10 
    33#pragma IgorVersion=6.1 
    44 
     
    99 
    1010Function Init_WrapperPanel() 
     11 
     12        if(itemsinlist(WinList("SA_includes_v400.ipf", ";","INCLUDE:6"),";") != 0) 
     13                //must be opening a v4.00 or earlier template 
     14                DoAlert 0,"This experiment was created with an old version (v4.0) of the macros. I'll try to make this work, but please start new work with a current version" 
     15        endif 
     16         
    1117        //make sure that folders exist - this is the first initialization to be called 
    1218        NewDataFolder/O root:Packages 
     
    1420 
    1521        //Create useful globals 
    16         Variable/G root:Packages:NIST:SANS_ANA_VERSION=4.00 
     22        Variable/G root:Packages:NIST:SANS_ANA_VERSION=4.10 
    1723        String/G root:Packages:NIST:SANS_ANA_EXTENSION="_v40" 
    1824        //Set this variable to 1 to force use of trapezoidal integration routine for USANS smearing 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/SA_includes_v400.ipf

    r665 r693  
    33#pragma IgorVersion=6.1 
    44 
    5 //************* 
    6 // the list of files to include in the SANS reduction experiment 
    7 //  - files must be located somewhere in the User Procedures folder 
    8 // or sub-folders 
     5 
     6// now simply point to the current version of the includes v410 
     7// -- then if this file is open, I'll know the experiment is "old" 
     8#include "SA_includes_v410" 
     9 
     10////************* 
     11//// the list of files to include in the SANS reduction experiment 
     12////  - files must be located somewhere in the User Procedures folder 
     13//// or sub-folders 
     14//// 
    915// 
    10  
    11 //always include the picker 
    12 #include "SANSModelPicker_v40"                  version>=4.00 
    13 //utility procedures 
    14 #include "GaussUtils_v40"                               version>=4.00 
    15 #include "NIST_XML_V40"                                 //added September 2008 
    16 #include "PlotUtilsMacro_v40"                   version>=4.00 
    17 #include "PlotManager_v40"                              version>=4.00 
    18 #include "NCNR_GenFitUtils"                     // April 2009, compiles OK if XOP not present 
    19 #include "NCNR_Utils" 
    20  
    21 #include "USANS_SlitSmearing_v40" 
    22 #include "WriteModelData_v40" 
    23 #include "Wrapper_v40" 
    24 #include "PlotUtils2D_v40" 
    25 #include "GizmoCylinder_v40" 
    26  
    27 #include "CheckVersionFTP"                              //added June 2008 
    28  
    29 #include "DataSetHandling"                                      //added Nov 2009 AJJ 
    30  
    31 Menu "SANS Models" 
    32         "Fit Manager", Init_WrapperPanel() 
    33         "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()" 
    34         "Load and Plot Manager", Show_Plot_Manager() 
    35         "Freeze Model" 
    36         "Write Model Data" 
    37         "ReWrite Experimental Data",ReWrite1DData() 
    38         "1D Arithmetic Panel",MakeDAPanel() 
    39         "-" 
    40         Submenu "Packages" 
    41                 "Sum Two Models",Execute/P "INSERTINCLUDE \"SumSANSModels_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_SumModelPanel()" 
    42                 "Global Fitting",Execute/P "INSERTINCLUDE \"GlobalFit2_NCNR_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "WM_NewGlobalFit1#InitNewGlobalFitPanel()" 
    43                 "Simple Global Fitting",Execute/P "INSERTINCLUDE \"GlobalFit2_NCNR_v40\"";Execute/P "INSERTINCLUDE \"SimpleGlobalFit_NCNR_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_SimpleGlobalFit()" 
    44                 "Determine Invariant",Execute/P "INSERTINCLUDE \"Invariant_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Make_Invariant_Panel()" 
    45                 "Do Linear Fits",Execute/P "INSERTINCLUDE \"LinearizedFits_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "A_OpenFitPanel()" 
    46                 GenOpFlagEnable()+"Genetic Optimization Enabled", Init_GenOp() 
    47                 GenOpFlagDisable()+"Genetic Optimization Disabled", UnSet_GenOp() 
    48         End 
    49         "-" 
    50         Submenu "2D Utilities" 
    51                 "Generate Fake QxQy Data",FakeQxQy() 
    52                 "Show Cylinder Orientation" 
    53                 "Change Angle" 
    54         end 
    55         "-" 
    56         "NCNR Preferences",Show_Preferences_Panel() 
    57         "Feedback or Bug Report",OpenTracTicketPage() 
    58         "Open Help Movie Page",OpenHelpMoviePage() 
    59         "Check for Updates",CheckForLatestVersion() 
    60 End 
    61  
     16////always include the picker 
     17//#include "SANSModelPicker_v40"                        version>=4.00 
     18////utility procedures 
     19//#include "GaussUtils_v40"                             version>=4.00 
     20//#include "NIST_XML_V40"                                       //added September 2008 
     21//#include "PlotUtilsMacro_v40"                 version>=4.00 
     22//#include "PlotManager_v40"                            version>=4.00 
     23//#include "NCNR_GenFitUtils"                   // April 2009, compiles OK if XOP not present 
     24//#include "NCNR_Utils" 
     25// 
     26//#include "USANS_SlitSmearing_v40" 
     27//#include "WriteModelData_v40" 
     28//#include "Wrapper_v40" 
     29//#include "PlotUtils2D_v40" 
     30//#include "GizmoCylinder_v40" 
     31// 
     32//#include "CheckVersionFTP"                            //added June 2008 
     33// 
     34//#include "DataSetHandling"                                    //added Nov 2009 AJJ 
     35// 
     36//Menu "SANS Models" 
     37//      "Fit Manager", Init_WrapperPanel() 
     38//      "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()" 
     39//      "Load and Plot Manager", Show_Plot_Manager() 
     40//      "Freeze Model" 
     41//      "Write Model Data" 
     42//      "ReWrite Experimental Data",ReWrite1DData() 
     43//      "1D Arithmetic Panel",MakeDAPanel() 
     44//      "-" 
     45//      Submenu "Packages" 
     46//              "Sum Two Models",Execute/P "INSERTINCLUDE \"SumSANSModels_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_SumModelPanel()" 
     47//              "Global Fitting",Execute/P "INSERTINCLUDE \"GlobalFit2_NCNR_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "WM_NewGlobalFit1#InitNewGlobalFitPanel()" 
     48//              "Simple Global Fitting",Execute/P "INSERTINCLUDE \"GlobalFit2_NCNR_v40\"";Execute/P "INSERTINCLUDE \"SimpleGlobalFit_NCNR_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Init_SimpleGlobalFit()" 
     49//              "Determine Invariant",Execute/P "INSERTINCLUDE \"Invariant_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Make_Invariant_Panel()" 
     50//              "Do Linear Fits",Execute/P "INSERTINCLUDE \"LinearizedFits_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "A_OpenFitPanel()" 
     51//              GenOpFlagEnable()+"Genetic Optimization Enabled", Init_GenOp() 
     52//              GenOpFlagDisable()+"Genetic Optimization Disabled", UnSet_GenOp() 
     53//      End 
     54//      "-" 
     55//      Submenu "2D Utilities" 
     56//              "Generate Fake QxQy Data",FakeQxQy() 
     57//              "Show Cylinder Orientation" 
     58//              "Change Angle" 
     59//      end 
     60//      "-" 
     61//      "NCNR Preferences",Show_Preferences_Panel() 
     62//      "Feedback or Bug Report",OpenTracTicketPage() 
     63//      "Open Help Movie Page",OpenHelpMoviePage() 
     64//      "Check for Updates",CheckForLatestVersion() 
     65//End 
     66// 
Note: See TracChangeset for help on using the changeset viewer.