Changeset 694 for sans/Dev


Ignore:
Timestamp:
Apr 15, 2010 4:58:03 PM (13 years ago)
Author:
srkline
Message:

pointing old SANS Reduction includes to the new versions. the sets of files in v510 and 500 won't compile on their own since so many function locations and dependencies have changed.

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

Legend:

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

    r412 r694  
    33#pragma IgorVersion=4.0 
    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 
    9 // 
    10 // these procedure files are those used in version 5.0 of the  
    11 // SANS Reduction macros, August 2006 
    125 
    13 #include "AvgGraphics"                  version>=5.0 
    14 #include "Buttons"                              version>=5.0 
    15 #include "CatVSTable"                   version>=5.0 
    16 #include "CircSectAve"                  version>=5.0 
    17 #include "Correct"                              version>=5.0 
    18 #include "DisplayUtils"                 version>=5.0 
    19 #include "FIT_Ops"                              version>=5.0 
    20 #include "Initialize"                   version>=5.0 
    21 #include "MainPanel"                    version>=5.0 
    22 #include "Marquee"                              version>=5.0 
    23 #include "MaskUtils"                    version>=5.0 
    24 #include "Menu"                                 version>=5.0 
    25 #include "MultipleReduce"               version>=5.0 
    26 #include "NSORT"                                        version>=5.0 
    27 #include "PatchFiles"                   version>=5.0 
    28 #include "PlotUtils"                    version>=5.0 
    29 #include "ProDiv"                               version>=5.0 
    30 #include "ProtocolAsPanel"              version>=5.0 
    31 //#include "RawDataReader"              version>=5.0                    //branched 29MAR07 
    32 #include "RawWindowHook"                version>=5.0 
    33 #include "RectAnnulAvg"                 version>=5.0 
    34 #include "Schematic"                    version>=5.0 
    35 #include "Tile_2D"                              version>=5.0 
    36 #include "Transmission"                 version>=5.0 
    37 //#include "VAXFileUtils"                       version>=5.0            //branched 29MAR07 
    38 #include "WorkFileUtils"                version>=5.0 
    39 #include "WriteQIS"                             version>=5.0  
    40 // removed RT button from main panel AUG2006 
    41 // removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
    42 //#include "RealTimeUpdate_RT"          version>=5.0             
    43 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    44 #include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    45  
    46 #include "NCNR_Utils"                                                                   //new in the 29MAR07 branch 
    47 #include "NCNR_DataReadWrite"                                                   //new in the 29MAR07 branch 
    48 #include "SANS_Utilities"                                                               //new in the 29MAR07 branch 
    49  
    50 // new in Jan 2008 
    51 #include "SASCALC" 
    52  
    53 // to include the analysis packages, uncomment the following 
    54 // include statement and click "compile" at the bottom of this window. 
    55 // ** the SANSModels menu will appear, and the packages will be  
    56 // available under the Macros menu as usual. 
    57  
    58 //#include "Analysis_SRK" 
     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 "Includes_v510" 
    599 
    6010 
    61 // a simple list of items to add to the Beta menu 
    62 // to allow testing of these features 
    6311// 
    64 // To activate the SANSBeta menu, change "xMenu" to "Menu" 
    65 // and click "compile" at the bottom of this window. The SANSBeta 
    66 // menu will appear in the menubar. 
     12////************* 
     13//// the list of files to include in the SANS reduction experiment 
     14////  - files must be located somewhere in the User Procedures folder 
     15//// or sub-folders 
     16//// 
     17//// these procedure files are those used in version 5.0 of the  
     18//// SANS Reduction macros, August 2006 
    6719// 
    68 Menu "SANSBeta" 
    69         "FillEMPUsingSelection" 
    70         "GuessEveryTransFile" 
    71         "GuessSelectedTransFiles" 
    72         "ClearSelectedTransAssignments" 
    73         "-" 
    74 ////    "CreateRunNumList" 
    75 ////    "TransList" 
    76         "ScatteringAtSDDList" 
    77 ////    "RemoveRunFromList" 
    78         "FillMREDList" 
    79         "-" 
    80 ////    "Set3NSORTFiles" 
    81         "CreateTableToCombine" 
    82         "DoCombineFiles" 
    83         "-" 
    84         "Convert To Lens" 
    85         "Convert To Pinhole" 
    86         "Patch Detector Pixel Size" 
    87         "Read Detector Pixel Size" 
    88         "-" 
    89         "AddALLToLayout" 
    90          
    91 End 
     20//#include "AvgGraphics"                        version>=5.0 
     21//#include "Buttons"                            version>=5.0 
     22//#include "CatVSTable"                 version>=5.0 
     23//#include "CircSectAve"                        version>=5.0 
     24//#include "Correct"                            version>=5.0 
     25//#include "DisplayUtils"                       version>=5.0 
     26//#include "FIT_Ops"                            version>=5.0 
     27//#include "Initialize"                 version>=5.0 
     28//#include "MainPanel"                  version>=5.0 
     29//#include "Marquee"                            version>=5.0 
     30//#include "MaskUtils"                  version>=5.0 
     31//#include "Menu"                                       version>=5.0 
     32//#include "MultipleReduce"             version>=5.0 
     33//#include "NSORT"                                      version>=5.0 
     34//#include "PatchFiles"                 version>=5.0 
     35//#include "PlotUtils"                  version>=5.0 
     36//#include "ProDiv"                             version>=5.0 
     37//#include "ProtocolAsPanel"            version>=5.0 
     38////#include "RawDataReader"            version>=5.0                    //branched 29MAR07 
     39//#include "RawWindowHook"              version>=5.0 
     40//#include "RectAnnulAvg"                       version>=5.0 
     41//#include "Schematic"                  version>=5.0 
     42//#include "Tile_2D"                            version>=5.0 
     43//#include "Transmission"                       version>=5.0 
     44////#include "VAXFileUtils"                     version>=5.0            //branched 29MAR07 
     45//#include "WorkFileUtils"              version>=5.0 
     46//#include "WriteQIS"                           version>=5.0  
     47//// removed RT button from main panel AUG2006 
     48//// removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
     49////#include "RealTimeUpdate_RT"                version>=5.0             
     50//#include "SANSPreferences"                            version>=5.0            //NEW 05MAY03 
     51//#include "Subtract_1D"                                version>=5.0                    //NEW 14MAY03 
     52// 
     53//#include "NCNR_Utils"                                                                 //new in the 29MAR07 branch 
     54//#include "NCNR_DataReadWrite"                                                 //new in the 29MAR07 branch 
     55//#include "SANS_Utilities"                                                             //new in the 29MAR07 branch 
     56// 
     57//// new in Jan 2008 
     58//#include "SASCALC" 
     59// 
     60//// to include the analysis packages, uncomment the following 
     61//// include statement and click "compile" at the bottom of this window. 
     62//// ** the SANSModels menu will appear, and the packages will be  
     63//// available under the Macros menu as usual. 
     64// 
     65////#include "Analysis_SRK" 
     66// 
     67// 
     68//// a simple list of items to add to the Beta menu 
     69//// to allow testing of these features 
     70//// 
     71//// To activate the SANSBeta menu, change "xMenu" to "Menu" 
     72//// and click "compile" at the bottom of this window. The SANSBeta 
     73//// menu will appear in the menubar. 
     74//// 
     75//Menu "SANSBeta" 
     76//      "FillEMPUsingSelection" 
     77//      "GuessEveryTransFile" 
     78//      "GuessSelectedTransFiles" 
     79//      "ClearSelectedTransAssignments" 
     80//      "-" 
     81//////  "CreateRunNumList" 
     82//////  "TransList" 
     83//      "ScatteringAtSDDList" 
     84//////  "RemoveRunFromList" 
     85//      "FillMREDList" 
     86//      "-" 
     87//////  "Set3NSORTFiles" 
     88//      "CreateTableToCombine" 
     89//      "DoCombineFiles" 
     90//      "-" 
     91//      "Convert To Lens" 
     92//      "Convert To Pinhole" 
     93//      "Patch Detector Pixel Size" 
     94//      "Read Detector Pixel Size" 
     95//      "-" 
     96//      "AddALLToLayout" 
     97//       
     98//End 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v510.ipf

    r658 r694  
    11#pragma rtGlobals=1             // Use modern global access method. 
    2 #pragma version=5.0 
     2#pragma version=5.1 
    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 
    9 // 
    10 // these procedure files are those used in version 5.0 of the  
    11 // SANS Reduction macros, August 2006 
    12  
    13 #include "AvgGraphics"                  version>=5.0 
    14 #include "Buttons"                              version>=5.0 
    15 #include "CatVSTable"                   version>=5.0 
    16 #include "CircSectAve"                  version>=5.0 
    17 #include "Correct"                              version>=5.0 
    18 #include "DisplayUtils"                 version>=5.0 
    19 #include "FIT_Ops"                              version>=5.0 
    20 #include "Initialize"                   version>=5.0 
    21 #include "MainPanel"                    version>=5.0 
    22 #include "Marquee"                              version>=5.0 
    23 #include "MaskUtils"                    version>=5.0 
    24 #include "Menu"                                 version>=5.0 
    25 #include "MultipleReduce"               version>=5.0 
    26 #include "NSORT"                                        version>=5.0 
    27 #include "PatchFiles"                   version>=5.0 
    28 //#include "PlotUtils"                  version>=5.0 
    29 #include "PlotUtilsMacro_v40"           version>=4.0 
    30 #include "ProDiv"                               version>=5.0 
    31 #include "ProtocolAsPanel"              version>=5.0 
    32 //#include "RawDataReader"              version>=5.0                    //branched 29MAR07 
    33 #include "RawWindowHook"                version>=5.0 
    34 #include "RectAnnulAvg"                 version>=5.0 
    35 #include "Schematic"                    version>=5.0 
    36 #include "Tile_2D"                              version>=5.0 
    37 #include "Transmission"                 version>=5.0 
    38 //#include "VAXFileUtils"                       version>=5.0            //branched 29MAR07 
    39 #include "WorkFileUtils"                version>=5.0 
    40 #include "WriteQIS"                             version>=5.0  
    41 // removed RT button from main panel AUG2006 
    42 // removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
    43 //#include "RealTimeUpdate_RT"          version>=5.0             
    44 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    45 #include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    46  
    47 #include "NCNR_Utils"                                                                   //new in the 29MAR07 branch 
    48 #include "NCNR_DataReadWrite"                                                   //new in the 29MAR07 branch 
    49 #include "SANS_Utilities"                                                               //new in the 29MAR07 branch 
    50  
    51 // new in Jan 2008 
    52 #include "SASCALC" 
    53 #include "CheckVersionFTP"                              //added June 2008 
    54  
    55 #include "TISANE" 
    56 #include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation 
    57  
    58 #include "PlotManager_v40"                                              //Oct 2008 as part of unifying the loading routines 
    59 #include "NIST_XML_v40"                                                 // - creates a cascade of dependencies to load files 
    60 #include "cansasXML" 
    61 #include "GaussUtils_v40" 
    62 #include "USANS_SlitSmearing_v40" 
    63  
    64 // to include the analysis packages, uncomment the following 
    65 // include statement and click "compile" at the bottom of this window. 
    66 // ** the SANSModels menu will appear, and the packages will be  
    67 // available under the Macros menu as usual. 
    68  
    69 //#include "Analysis_SRK" 
    705 
    716 
    72 // a simple list of items to add to the Beta menu 
    73 // to allow testing of these features 
     7// now simply point to the current version of the includes v410 
     8// -- then if this file is open, I'll know the experiment is "old" 
     9#include "Includes_v520" 
     10 
     11 
     12////************* 
     13//// the list of files to include in the SANS reduction experiment 
     14////  - files must be located somewhere in the User Procedures folder 
     15//// or sub-folders 
     16//// 
     17//// these procedure files are those used in version 5.0 of the  
     18//// SANS Reduction macros, August 2006 
    7419// 
    75 // To activate the SANSBeta menu, change "xMenu" to "Menu" 
    76 // and click "compile" at the bottom of this window. The SANSBeta 
    77 // menu will appear in the menubar. 
     20//#include "AvgGraphics"                        version>=5.0 
     21//#include "Buttons"                            version>=5.0 
     22//#include "CatVSTable"                 version>=5.0 
     23//#include "CircSectAve"                        version>=5.0 
     24//#include "Correct"                            version>=5.0 
     25//#include "DisplayUtils"                       version>=5.0 
     26//#include "FIT_Ops"                            version>=5.0 
     27//#include "Initialize"                 version>=5.0 
     28//#include "MainPanel"                  version>=5.0 
     29//#include "Marquee"                            version>=5.0 
     30//#include "MaskUtils"                  version>=5.0 
     31//#include "Menu"                                       version>=5.0 
     32//#include "MultipleReduce"             version>=5.0 
     33//#include "NSORT"                                      version>=5.0 
     34//#include "PatchFiles"                 version>=5.0 
     35////#include "PlotUtils"                        version>=5.0 
     36//#include "PlotUtilsMacro_v40"         version>=4.0 
     37//#include "ProDiv"                             version>=5.0 
     38//#include "ProtocolAsPanel"            version>=5.0 
     39////#include "RawDataReader"            version>=5.0                    //branched 29MAR07 
     40//#include "RawWindowHook"              version>=5.0 
     41//#include "RectAnnulAvg"                       version>=5.0 
     42//#include "Schematic"                  version>=5.0 
     43//#include "Tile_2D"                            version>=5.0 
     44//#include "Transmission"                       version>=5.0 
     45////#include "VAXFileUtils"                     version>=5.0            //branched 29MAR07 
     46//#include "WorkFileUtils"              version>=5.0 
     47//#include "WriteQIS"                           version>=5.0  
     48//// removed RT button from main panel AUG2006 
     49//// removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
     50////#include "RealTimeUpdate_RT"                version>=5.0             
     51//#include "SANSPreferences"                            version>=5.0            //NEW 05MAY03 
     52//#include "Subtract_1D"                                version>=5.0                    //NEW 14MAY03 
    7853// 
    79 Menu "SANSBeta" 
    80         "Help for Beta Operations",DisplayHelpTopic/Z/K=1 "Beta SANS Tools" 
    81         "-" 
    82         "FillEMPUsingSelection" 
    83 //      "GuessEveryTransFile" 
    84 //      "GuessSelectedTransFiles" 
    85         "ClearSelectedTransAssignments" 
    86         "-" 
    87 ////    "CreateRunNumList" 
    88 ////    "TransList" 
    89         "ScatteringAtSDDList" 
    90 ////    "RemoveRunFromList" 
    91         "FillMREDList" 
    92         "-" 
    93 ////    "Set3NSORTFiles" 
    94         "CreateTableToCombine" 
    95         "DoCombineFiles" 
    96         "-" 
    97         "Convert To Lens" 
    98         "Convert To Pinhole" 
    99         "Patch Detector Pixel Size" 
    100         "Read Detector Pixel Size" 
    101         "-" 
    102         "AddALLToLayout" 
    103          
    104 End 
     54//#include "NCNR_Utils"                                                                 //new in the 29MAR07 branch 
     55//#include "NCNR_DataReadWrite"                                                 //new in the 29MAR07 branch 
     56//#include "SANS_Utilities"                                                             //new in the 29MAR07 branch 
     57// 
     58//// new in Jan 2008 
     59//#include "SASCALC" 
     60//#include "CheckVersionFTP"                            //added June 2008 
     61// 
     62//#include "TISANE" 
     63//#include "MultScatter_MonteCarlo_2D"                  //Oct 2008 SRK for SASCALC simulation 
     64// 
     65//#include "PlotManager_v40"                                            //Oct 2008 as part of unifying the loading routines 
     66//#include "NIST_XML_v40"                                                       // - creates a cascade of dependencies to load files 
     67//#include "cansasXML" 
     68//#include "GaussUtils_v40" 
     69//#include "USANS_SlitSmearing_v40" 
     70// 
     71//// to include the analysis packages, uncomment the following 
     72//// include statement and click "compile" at the bottom of this window. 
     73//// ** the SANSModels menu will appear, and the packages will be  
     74//// available under the Macros menu as usual. 
     75// 
     76////#include "Analysis_SRK" 
     77// 
     78// 
     79//// a simple list of items to add to the Beta menu 
     80//// to allow testing of these features 
     81//// 
     82//// To activate the SANSBeta menu, change "xMenu" to "Menu" 
     83//// and click "compile" at the bottom of this window. The SANSBeta 
     84//// menu will appear in the menubar. 
     85//// 
     86//Menu "SANSBeta" 
     87//      "Help for Beta Operations",DisplayHelpTopic/Z/K=1 "Beta SANS Tools" 
     88//      "-" 
     89//      "FillEMPUsingSelection" 
     90////    "GuessEveryTransFile" 
     91////    "GuessSelectedTransFiles" 
     92//      "ClearSelectedTransAssignments" 
     93//      "-" 
     94//////  "CreateRunNumList" 
     95//////  "TransList" 
     96//      "ScatteringAtSDDList" 
     97//////  "RemoveRunFromList" 
     98//      "FillMREDList" 
     99//      "-" 
     100//////  "Set3NSORTFiles" 
     101//      "CreateTableToCombine" 
     102//      "DoCombineFiles" 
     103//      "-" 
     104//      "Convert To Lens" 
     105//      "Convert To Pinhole" 
     106//      "Patch Detector Pixel Size" 
     107//      "Read Detector Pixel Size" 
     108//      "-" 
     109//      "AddALLToLayout" 
     110//       
     111//End 
Note: See TracChangeset for help on using the changeset viewer.