Ignore:
Timestamp:
Oct 1, 2009 10:15:08 AM (13 years ago)
Author:
srkline
Message:

A variety of changes...

  • fixed model strings for Sum_Model
  • /Z flag for RTHelp, Transmission help, FIT help, MRED help
  • added help and done buttons to SASCALC
  • added comments in MonteCarlo?
  • restored the 2-line buttons in USANS panels, now supported in Igor 6.1 (COR_Graph and Main_USANS)
  • added simple text notebook of UCALC configuration, and a save of PNG of the whole panel
  • added help and done buttons to UCALC
  • added links in SANS_Reduction_Help to the simluation help file (not added to SVN yet)
Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
6 edited

Legend:

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

    r477 r564  
    115115Proc showFITHelp(ctrlName): ButtonControl 
    116116        String ctrlName 
    117         DisplayHelpTopic/K=1 "SANS Data Reduction Tutorial[Fit Lines to Your Data]" 
     117        DisplayHelpTopic/K=1/Z "SANS Data Reduction Tutorial[Fit Lines to Your Data]" 
    118118        if(V_flag !=0) 
    119119                DoAlert 0,"The SANS Data Reduction Tutorial Help file could not be found" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

    r558 r564  
    1010// 
    1111// 
     12 
     13 
     14 
     15// *** look into erand48() as the (pseudo) random number generator (it's a standard c-lib function, at least on unix) 
     16//     and is apparantly thread safe. drand48() returns values [0.0,1.0) 
     17//http://qnxcs.unomaha.edu/help/product/neutrino/lib_ref/e/erand48.html 
     18 
     19 
     20 
    1221// - Why am I off by a factor of 2.7 - 3.7 (MC too high) relative to real data? 
    1322//   I need to include efficiency (70%?) - do I knock these off before the simulation or do I  
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultipleReduce.ipf

    r412 r564  
    200200        String ctrlName 
    201201 
    202         DisplayHelpTopic/K=1 "SANS Data Reduction Tutorial[Reduce Multiple Files]" 
     202        DisplayHelpTopic/Z/K=1 "SANS Data Reduction Tutorial[Reduce Multiple Files]" 
    203203        if(V_flag !=0) 
    204204                DoAlert 0,"The SANS Data Reduction Tutorial Help file could not be found" 
     
    516516        return outputList 
    517517End 
    518  
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RealTimeUpdate_RT.ipf

    r543 r564  
    188188        String ctrlName 
    189189//      DoAlert 0,"the help file has not been written yet :-(" 
    190         DisplayHelpTopic/K=1 "SANS Data Reduction Tutorial[Real Time Data Display]" 
     190        DisplayHelpTopic/Z/K=1 "SANS Data Reduction Tutorial[Real Time Data Display]" 
    191191End 
    192192 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

    r558 r564  
    379379        PopupMenu popup0_2,pos={108,127},size={55,20},proc=DeltaLambdaPopMenuProc 
    380380        PopupMenu popup0_2,mode=2,value= root:Packages:NIST:SAS:gDeltaLambdaStr 
    381         Button FreezeButton title="Freeze",size={60,20},pos={307,166} 
     381        Button FreezeButton title="Freeze",size={60,20},pos={180,166} 
    382382        Button FreezeButton proc=FreezeButtonProc 
    383         Button ClearButton title="Clear",size={60,20},pos={377,166} 
     383        Button ClearButton title="Clear",size={60,20},pos={250,166} 
    384384        Button ClearButton proc=S_ClearButtonProc 
    385385        GroupBox group0,pos={6,1},size={108,36},title="Instrument" 
     
    395395        CheckBox checkSim,value=0 
    396396         
     397        // help, done buttons 
     398        Button SC_helpButton,pos={340,166},size={25,20},proc=showSASCALCHelp,title="?" 
     399        Button SC_helpButton,help={"Show help file for simulation of SANS Data"} 
     400        Button SC_DoneButton,pos={380,166},size={50,20},proc=SASCALCDoneButton,title="Done" 
     401        Button SC_DoneButton,help={"This button will close the panel"} 
     402 
    397403        // set up a fake dependency to trigger recalculation 
    398404        //root:Packages:NIST:SAS:gCalculate := ReCalculateInten(root:Packages:NIST:SAS:gTouched) 
    399405EndMacro 
     406 
     407//clean up 
     408Proc SASCALCDoneButton(ctrlName): ButtonControl 
     409        String ctrlName 
     410        DoWindow/K SASCALC 
     411        DoWindow/K Trial_Configuration 
     412        DoWindow/K Saved_Configurations 
     413        DoWindow/K MC_SASCALC 
     414        DoWindow/K Sim_1D_Panel 
     415end 
     416 
     417// 
     418Proc showSASCALCHelp(ctrlName): ButtonControl 
     419        String ctrlName 
     420        DisplayHelpTopic/K=1/Z "SASCALC" 
     421        if(V_flag !=0) 
     422                DoAlert 0,"The SANS Simulation Help file could not be found" 
     423        endif 
     424end 
    400425 
    401426// based on the instrument selected... 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Transmission.ipf

    r545 r564  
    10661066Proc ShowTransHelp(ctrlName) : ButtonControl 
    10671067        String ctrlName 
    1068         DisplayHelpTopic/K=1 "SANS Data Reduction Tutorial[Calculate Transmissions]" 
     1068        DisplayHelpTopic/Z/K=1 "SANS Data Reduction Tutorial[Calculate Transmissions]" 
    10691069        if(V_flag !=0) 
    10701070                DoAlert 0,"The SANS Data Reduction Tutorial Help file could not be found" 
Note: See TracChangeset for help on using the changeset viewer.