Ignore:
Timestamp:
May 30, 2013 3:04:05 PM (10 years ago)
Author:
srkline
Message:

Added Auto-Fit (Batch fitting) to the Macros menu as a beta item

Updated broken links in Model_Docs

Added Auto-Fit help to the Analysis Help file as a new package

Updated the current version to 7.20, a new release for the web site

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Auto_Fit.ipf

    r911 r912  
    3232// x- need a help button to link to the help file 
    3333// -- Comprehensive instructions (after features are finalized) 
     34// 
     35// -- add a way to save the setup and guesses. May be tough if the file list changes... 
    3436 
    3537 
     
    301303        String/G holdStr = "Enter 0 to fit\rEnter 1 to hold" 
    302304        String/G constStr = "Enter low and\rhigh range as:\rlow;high\rfor each parameter\rLeave blank if\rno constraints" 
    303         String/G rangeStr = "Enter the point\rrange as:\rfirst pt in 1st row\rlast pt in 2nd row\rLeave blank to\r fit all data" 
     305        String/G rangeStr = "Enter the point\rrange as:\rfirst pt in 1st row\rlast pt in 2nd row\rLeave zero to\rfit all data" 
    304306         
    305307         
     
    374376        Button GuessCoefB,pos={198,440},size={50,20},title="Guess",proc=UseCoefAsGuess 
    375377        Button GuessHoldB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseHoldAsGuess 
    376         Button GuessConstrB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseConstraintsAsGuess 
     378//      Button GuessConstrB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseConstraintsAsGuess 
    377379         
    378380        TitleBox infoTitleBox pos={180,470},fixedSize=1,size={96,130},variable=root:AutoFit:guessStr 
     
    401403                case 2: // mouse up 
    402404                        // click code here 
    403                         DisplayHelpTopic/Z/K=1 "Auto Fit" 
     405                        DisplayHelpTopic/Z/K=1 "Auto Fit (or Batch fitting)" 
    404406                        if(V_flag !=0) 
    405407                                DoAlert 0,"The Auto Fit Help file could not be found" 
     
    480482         
    481483        Button FillAllConstrButton disable= (tab!=2) 
    482         Button GuessConstrB disable=(tab!=2) 
     484//      Button GuessConstrB disable=(tab!=2) 
    483485        ListBox ConstrBox disable=(tab!=2) 
    484486         
     
    16021604Proc Layout_PNGS(pStr) 
    16031605        String pStr="" 
    1604         Prompt pStr,"wave of PNGs to use",popup,WaveList("PNG_f*", ";", "") 
     1606        Prompt pStr,"wave of PNGs to use",popup,WaveList("PNG*", ";", "") 
    16051607                 
    16061608        String List=TextWave2List($pStr,";") 
     
    21102112        String ctrlName 
    21112113         
    2112 //      String wStr = "hold_" 
    2113 //      SVAR ext=root:AutoFit:gExt 
    2114 //      FillHoldGuess(wStr+ext) 
    2115 //      DisplayGuess() 
     2114        String wStr = "hold_" 
     2115        SVAR ext=root:AutoFit:gExt 
     2116        FillHoldGuess(wStr+ext) 
     2117        DisplayGuess() 
    21162118        return(0) 
    21172119End 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r891 r912  
    13201320// from 2013 Simulation 
    13211321//      list = RemoveFromList("EC_Empirical;SmearedEC_Empirical;",list,";") 
     1322        list = RemoveFromList("SAS_XS_Sphere;",list,";") 
    13221323                 
    13231324        list = SortList(list) 
  • sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

    r871 r912  
    1 PACKAGE_VERSION=7.13;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3; 
     1PACKAGE_VERSION=7.20;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3; 
    22 
    33Only the first line of the file is read in. 
     
    66 
    77These are the current versions as of: 
    8 17 OCT 2012 SRK 
     830 MAY 2013 SRK 
    99 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf

    r898 r912  
    15261526         
    15271527// 
     1528//      Print "scan only" 
     1529//      tic() 
     1530//              EventLoadWave/R/N=EventWave/W filepathstr 
     1531//      toc() 
    15281532 
    15291533//// 
Note: See TracChangeset for help on using the changeset viewer.