Changeset 684


Ignore:
Timestamp:
Apr 12, 2010 11:19:19 AM (12 years ago)
Author:
srkline
Message:

Fixed bug in CatVSTable for HIFR read.

Updated all of the includes to include the correct (most current) procedures.

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

Legend:

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

    r662 r684  
    223223#else 
    224224//      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
    225         Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides 
     225        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR 
    226226#endif 
    227227 
     
    407407#endif   
    408408 
    409 // number of guides, only for NCNR 
     409// number of guides and sample position, only for NCNR 
    410410#if (exists("NCNR")==6) 
    411411        InsertPoints lastPoint,1,GNumGuides 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_Includes_v520.ipf

    r683 r684  
    4242#include "PlotUtilsMacro_v40" 
    4343#include "NIST_XML_v40" 
    44 #include "cansasXML" 
     44//#include "cansasXML" 
    4545#include "USANS_SlitSmearing_v40" 
    4646#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     
    7272////#include "MultScatter_MonteCarlo_2D"                        //Oct 2008 SRK for SASCALC simulation 
    7373 
    74  
    75 //#include "TISANE" 
    76  
    77  
    7874//AJJ Oct 2008 
    7975#include "PlotManager_v40" 
     
    8278#include "Smear_2D"             //2D resolution calculation and smearing 
    8379 
     80//AJJ Nov 2009 
     81#include "DataSetHandling" 
     82#include "WriteModelData_v40" 
    8483 
    8584// a simple list of items to add to the Beta menu 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_ANSTO.ipf

    r671 r684  
    4141#include "PlotUtilsMacro_v40" 
    4242#include "NIST_XML_v40" 
    43 #include "cansasXML" 
     43//#include "cansasXML" 
    4444#include "USANS_SlitSmearing_v40" 
    4545#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     
    7878#include "Smear_2D"             //2D resolution calculation and smearing 
    7979 
    80  
     80//AJJ Nov 2009 
     81#include "DataSetHandling" 
     82#include "WriteModelData_v40" 
    8183 
    8284 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_Facility.ipf

    r668 r684  
    3737#include "NSORT"                                        version>=5.0 
    3838#include "PatchFiles"                   version>=5.0 
    39 #include "PlotUtils"                    version>=5.0 
     39//#include "PlotUtils"                  version>=5.0 
     40//AJJ October 2008 - switch to shared file loader 
     41#include "PlotUtilsMacro_v40" 
     42#include "NIST_XML_v40" 
     43//#include "cansasXML" 
     44#include "USANS_SlitSmearing_v40" 
     45#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     46// 
    4047#include "ProDiv"                               version>=5.0 
    4148#include "ProtocolAsPanel"              version>=5.0 
     
    5865#include "SANS_Utilities"                                                               //new in the 29MAR07 branch 
    5966 
    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. 
     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 
    6471 
    65 //#include "Analysis_SRK" 
     72 
     73//AJJ Oct 2008 
     74#include "PlotManager_v40" 
     75 
     76// SRK JUN2009 
     77#include "Smear_2D"             //2D resolution calculation and smearing 
     78 
     79//AJJ Nov 2009 
     80#include "DataSetHandling" 
     81#include "WriteModelData_v40" 
     82 
    6683 
    6784 
     
    7390// menu will appear in the menubar. 
    7491// 
    75 Menu "SANSBeta" 
     92xMenu "SANSBeta" 
    7693        "FillEMPUsingSelection" 
    7794        "GuessEveryTransFiles" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520_ILL.ipf

    r671 r684  
    4242#include "PlotUtilsMacro_v40" 
    4343#include "NIST_XML_v40" 
    44 #include "cansasXML" 
     44//#include "cansasXML" 
    4545#include "USANS_SlitSmearing_v40" 
    4646#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     
    6767 
    6868// new in Jan 2008 
    69 #include "SASCALC" 
     69//#include "SASCALC" 
    7070#include "CheckVersionFTP"                              //added June 2008 
    71 #include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation 
     71//#include "MultScatter_MonteCarlo_2D"                  //Oct 2008 SRK for SASCALC simulation 
    7272 
    7373 
    7474//AJJ Oct 2008 
    7575#include "PlotManager_v40" 
     76 
     77// SRK JUN2009 
     78#include "Smear_2D"             //2D resolution calculation and smearing 
     79 
     80//AJJ Nov 2009 
     81#include "DataSetHandling" 
     82#include "WriteModelData_v40" 
    7683 
    7784 
Note: See TracChangeset for help on using the changeset viewer.