Changeset 906


Ignore:
Timestamp:
Apr 17, 2013 10:00:54 AM (9 years ago)
Author:
srkline
Message:

finishing a consistent renaming of the facility-specific files, and corresponding changes to the loader

Location:
sans/Dev/trunk
Files:
4 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_Igor_Procedures/NCNR_Package_Loader.ipf

    r905 r906  
    197197                         
    198198                case "Load ILL SANS Reduction Macros": 
    199                         Execute/P "INSERTINCLUDE \"Includes_v520_ILL\"" 
     199                        Execute/P "INSERTINCLUDE \"ILL_Includes_v520\"" 
    200200                        Execute/P "COMPILEPROCEDURES " 
    201201                        Execute/P ("Initialize()") 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf

    r890 r906  
    44 
    55 
    6 // to properly set up the template for other facility reduction templates,  
    7 // function NCNR() must exist here in the Includes file. 
    8 // 
    9 Function NCNR() 
    10         //does nothing but define NCNR() 
    11         return(0) 
    12 End 
     6// now just a pass-through to keep from breaking old versions 
     7#include "NCNR_Includes_v520" 
    138 
    149 
    15 //************* 
    16 // the list of files to include in the SANS reduction experiment 
    17 //  - files must be located somewhere in the User Procedures folder 
    18 // or sub-folders 
     10//// to properly set up the template for other facility reduction templates,  
     11//// function NCNR() must exist here in the Includes file. 
     12//// 
     13//Function NCNR() 
     14//      //does nothing but define NCNR() 
     15//      return(0) 
     16//End 
    1917// 
    20 // these procedure files are those used in version 5.0 of the  
    21 // SANS Reduction macros, August 2006 
    22  
    23 #include "AvgGraphics"                  version>=5.0 
    24 #include "Buttons"                              version>=5.0 
    25 #include "CatVSTable"                   version>=5.0 
    26 #include "CircSectAve"                  version>=5.0 
    27 #include "Correct"                              version>=5.0 
    28 #include "DisplayUtils"                 version>=5.0 
    29 #include "FIT_Ops"                              version>=5.0 
    30 #include "Initialize"                   version>=5.0 
    31 #include "MainPanel"                    version>=5.0 
    32 #include "Marquee"                              version>=5.0 
    33 #include "MaskUtils"                    version>=5.0 
    34 #include "Menu"                                 version>=5.0 
    35 #include "MultipleReduce"               version>=5.0 
    36 #include "NSORT"                                        version>=5.0 
    37 #include "PatchFiles"                   version>=5.0 
    38 //#include "PlotUtils"                  version>=5.0 
    39 //AJJ October 2008 - switch to shared file loader 
    40 #include "PlotUtilsMacro_v40" 
    41 #include "NIST_XML_v40" 
    42 //#include "cansasXML" 
    43 #include "USANS_SlitSmearing_v40" 
    44 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
    4518// 
    46 #include "ProDiv"                               version>=5.0 
    47 #include "ProtocolAsPanel"              version>=5.0 
    48 //#include "RawDataReader"              version>=5.0                    //branched 29MAR07 
    49 #include "RawWindowHook"                version>=5.0 
    50 #include "RectAnnulAvg"                 version>=5.0 
    51 #include "Schematic"                    version>=5.0 
    52 #include "Tile_2D"                              version>=5.0 
    53 #include "Transmission"                 version>=5.0 
    54 //#include "VAXFileUtils"                       version>=5.0            //branched 29MAR07 
    55 #include "WorkFileUtils"                version>=5.0 
    56 #include "WriteQIS"                             version>=5.0  
    57 // removed RT button from main panel AUG2006 
    58 // removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
    59 //Add back Real Time for ICE 
    60 #include "RealTimeUpdate_RT"            version>=5.0             
    61 #include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    62  
    63 #include "NCNR_Utils"                                                                   //new in the 29MAR07 branch 
    64 #include "NCNR_DataReadWrite"                                                   //new in the 29MAR07 branch 
    65 #include "SANS_Utilities"                                                               //new in the 29MAR07 branch 
    66  
    67 // new in Jan 2008 
    68 #include "SASCALC" 
    69 #include "CheckVersionFTP"                              //added June 2008 
    70 #include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation 
    71  
    72  
    73 #include "TISANE" 
    74  
    75  
    76 //AJJ Oct 2008 
    77 #include "PlotManager_v40" 
    78  
    79 // SRK JUN2009 
    80 #include "Smear_2D"             //2D resolution calculation and smearing 
    81  
    82 //AJJ Nov 2009 
    83 #include "DataSetHandling" 
    84 #include "WriteModelData_v40" 
    85  
    86 // SRK OCT 2012 - processing of event mode data 
    87 #include "EventModeProcessing" 
    88  
    89 // SRK JAN 2013 - to make simulation easier 
    90 #include "MC_SimulationScripting" 
    91  
    92 // a simple list of items to add to the Beta menu 
    93 // to allow testing of these features 
     19////************* 
     20//// the list of files to include in the SANS reduction experiment 
     21////  - files must be located somewhere in the User Procedures folder 
     22//// or sub-folders 
     23//// 
     24//// these procedure files are those used in version 5.0 of the  
     25//// SANS Reduction macros, August 2006 
    9426// 
    95 // To activate the SANSBeta menu, change "xMenu" to "Menu" 
    96 // and click "compile" at the bottom of this window. The SANSBeta 
    97 // menu will appear in the menubar. 
     27//#include "AvgGraphics"                        version>=5.0 
     28//#include "Buttons"                            version>=5.0 
     29//#include "CatVSTable"                 version>=5.0 
     30//#include "CircSectAve"                        version>=5.0 
     31//#include "Correct"                            version>=5.0 
     32//#include "DisplayUtils"                       version>=5.0 
     33//#include "FIT_Ops"                            version>=5.0 
     34//#include "Initialize"                 version>=5.0 
     35//#include "MainPanel"                  version>=5.0 
     36//#include "Marquee"                            version>=5.0 
     37//#include "MaskUtils"                  version>=5.0 
     38//#include "Menu"                                       version>=5.0 
     39//#include "MultipleReduce"             version>=5.0 
     40//#include "NSORT"                                      version>=5.0 
     41//#include "PatchFiles"                 version>=5.0 
     42////#include "PlotUtils"                        version>=5.0 
     43////AJJ October 2008 - switch to shared file loader 
     44//#include "PlotUtilsMacro_v40" 
     45//#include "NIST_XML_v40" 
     46////#include "cansasXML" 
     47//#include "USANS_SlitSmearing_v40" 
     48//#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     49//// 
     50//#include "ProDiv"                             version>=5.0 
     51//#include "ProtocolAsPanel"            version>=5.0 
     52////#include "RawDataReader"            version>=5.0                    //branched 29MAR07 
     53//#include "RawWindowHook"              version>=5.0 
     54//#include "RectAnnulAvg"                       version>=5.0 
     55//#include "Schematic"                  version>=5.0 
     56//#include "Tile_2D"                            version>=5.0 
     57//#include "Transmission"                       version>=5.0 
     58////#include "VAXFileUtils"                     version>=5.0            //branched 29MAR07 
     59//#include "WorkFileUtils"              version>=5.0 
     60//#include "WriteQIS"                           version>=5.0  
     61//// removed RT button from main panel AUG2006 
     62//// removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
     63////Add back Real Time for ICE 
     64//#include "RealTimeUpdate_RT"          version>=5.0             
     65//#include "Subtract_1D"                                version>=5.0                    //NEW 14MAY03 
    9866// 
    99 xMenu "SANSBeta" 
    100 //      "Help for Beta Operations",DisplayHelpTopic/Z/K=1 "Beta SANS Tools" 
     67//#include "NCNR_Utils"                                                                 //new in the 29MAR07 branch 
     68//#include "NCNR_DataReadWrite"                                                 //new in the 29MAR07 branch 
     69//#include "SANS_Utilities"                                                             //new in the 29MAR07 branch 
     70// 
     71//// new in Jan 2008 
     72//#include "SASCALC" 
     73//#include "CheckVersionFTP"                            //added June 2008 
     74//#include "MultScatter_MonteCarlo_2D"                  //Oct 2008 SRK for SASCALC simulation 
     75// 
     76// 
     77//#include "TISANE" 
     78// 
     79// 
     80////AJJ Oct 2008 
     81//#include "PlotManager_v40" 
     82// 
     83//// SRK JUN2009 
     84//#include "Smear_2D"           //2D resolution calculation and smearing 
     85// 
     86////AJJ Nov 2009 
     87//#include "DataSetHandling" 
     88//#include "WriteModelData_v40" 
     89// 
     90//// SRK OCT 2012 - processing of event mode data 
     91//#include "EventModeProcessing" 
     92// 
     93//// SRK JAN 2013 - to make simulation easier 
     94//#include "MC_SimulationScripting" 
     95// 
     96//// a simple list of items to add to the Beta menu 
     97//// to allow testing of these features 
     98//// 
     99//// To activate the SANSBeta menu, change "xMenu" to "Menu" 
     100//// and click "compile" at the bottom of this window. The SANSBeta 
     101//// menu will appear in the menubar. 
     102//// 
     103//xMenu "SANSBeta" 
     104////    "Help for Beta Operations",DisplayHelpTopic/Z/K=1 "Beta SANS Tools" 
     105////    "-" 
     106////    "FillEMPUsingSelection"         // Transmission utilities have been added directly to the panel 
     107////    "GuessEveryTransFile" 
     108////    "GuessSelectedTransFiles" 
     109////    "ClearSelectedTransAssignments" 
     110////    "-" 
     111//////  "CreateRunNumList" 
     112//////  "TransList" 
     113////    "ScatteringAtSDDList"                   // MRED utilities have been added directly to the panel 
     114//////  "RemoveRunFromList" 
     115////    "FillMREDList" 
     116////    "-" 
     117//////  "Set3NSORTFiles" 
     118////    "CreateTableToCombine"                  //moved to a separate panel available from the 1D Ops tab 
     119////    "DoCombineFiles" 
     120////    "-" 
     121//      "Convert To Lens" 
     122//      "Convert To Pinhole" 
     123//      "Patch Detector Pixel Size" 
     124//      "Read Detector Pixel Size" 
     125//      "Patch User Account Name" 
     126//      "Read User Account Name" 
     127//      "Patch Monitor Count" 
     128//      "Read Monitor Count" 
     129//      "Read Detector Count" 
    101130//      "-" 
    102 //      "FillEMPUsingSelection"         // Transmission utilities have been added directly to the panel 
    103 //      "GuessEveryTransFile" 
    104 //      "GuessSelectedTransFiles" 
    105 //      "ClearSelectedTransAssignments" 
    106 //      "-" 
    107 ////    "CreateRunNumList" 
    108 ////    "TransList" 
    109 //      "ScatteringAtSDDList"                   // MRED utilities have been added directly to the panel 
    110 ////    "RemoveRunFromList" 
    111 //      "FillMREDList" 
    112 //      "-" 
    113 ////    "Set3NSORTFiles" 
    114 //      "CreateTableToCombine"                  //moved to a separate panel available from the 1D Ops tab 
    115 //      "DoCombineFiles" 
    116 //      "-" 
    117         "Convert To Lens" 
    118         "Convert To Pinhole" 
    119         "Patch Detector Pixel Size" 
    120         "Read Detector Pixel Size" 
    121         "Patch User Account Name" 
    122         "Read User Account Name" 
    123         "Patch Monitor Count" 
    124         "Read Monitor Count" 
    125         "Read Detector Count" 
    126         "-" 
    127         "PatchFileNameInHeader" 
    128         "ReadFileNameInHeader" 
    129 //      "-" 
    130 //      "AddALLToLayout"                        //added to tile raw 2d panel 
    131          
    132 End 
     131//      "PatchFileNameInHeader" 
     132//      "ReadFileNameInHeader" 
     133////    "-" 
     134////    "AddALLToLayout"                        //added to tile raw 2d panel 
     135//       
     136//End 
Note: See TracChangeset for help on using the changeset viewer.