Ignore:
Timestamp:
Nov 24, 2010 4:23:13 PM (12 years ago)
Author:
srkline
Message:
  • fixed a few bugs with GenCurveFit?, and how the reports are generated


  • the DEFAULT.MASK file is automatically loaded when the path is set, if it can be found. this only happens from the main (yellow) panel. Nothing happens if that exact file is not found.


  • a "Sector_PlusMinus" averaging option is added. This defines the LEFT sector as being "negative" q-values. Everything else behaves as a normal sector average. This is from Lionel, a very old ticket #31


  • if sectors or annular regions are drawn on RAW data files, the drawn lines are re-drawn correctly as the data is scrolled using the < and > buttons.


  • a super secret option for a "histogram pair" has been added. May be useful for alignment, may ditch if Jeff and Cedric don't like it. To do this, put cursor A on the 2D image at the center of where you want the vertical and horizontal swath to be. +-5 pixels is hard-wired. draw any marquee(size, location is ignored) and select SANS Histogram, and you get the pair. If cursor A is not on the graph, you get the normal histogram as defined by the marquee.


  • arrow buttons on RAW 2D data display now search +- 10 data files for "next", in case there are missing file numbers.


  • Incorporated Lionel's changes to ILL_* files for his generation of a "DIV" file for D22


  • Added the offset traces checkbox back to the SASCALC panel. previously it was hidden on the simulation panels.


  • loosened the tolerance for SDD matching onn the MRED panel to 0.1 m



File:
1 edited

Legend:

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

    r750 r764  
    3636//                      DRAWING routines only use a subset of the total list, since saving, naming, etc. don't apply 
    3737//              (10) possible keywords, some numerical, some string values 
    38 //              AVTYPE=string           string from set {Circular,Annular,Rectangular,Sector,2D_ASCII,QxQy_ASCII,PNG_Graphic} 
     38//              AVTYPE=string           string from set {Circular,Annular,Rectangular,Sector,2D_ASCII,QxQy_ASCII,PNG_Graphic;Sector_PlusMinus;} 
    3939//              PHI=value                       azimuthal angle (-90,90) 
    4040//              DPHI=value                      +/- angular range around phi for average 
     
    969969        String av_typ,autoSave,AutoName,autoPlot,side 
    970970        Variable phi=0,dphi=10,width=10,Qctr = 0.01,qDelta=10 
    971         Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII;PNG_Graphic" 
     971        Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII;PNG_Graphic;Sector_PlusMinus;" 
    972972// comment out above line in DEMO_MODIFIED version, and uncomment the line below (to disable PNG save) 
    973973//      Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII" 
     
    992992        root:myGlobals:Protocols:gAvgInfoStr += "PLOT=" + autoPlot + ";" 
    993993         
    994         if(cmpstr(av_typ,"Sector")==0) 
     994        if(cmpstr(av_typ,"Sector")==0 || cmpstr(av_typ,"Sector_PlusMinus")==0) 
    995995                root:myGlobals:Protocols:gAvgInfoStr += "SIDE=" + side + ";" 
    996996                root:myGlobals:Protocols:gAvgInfoStr += "PHI=" + num2str(phi) + ";" 
     
    18591859                case "Sector": 
    18601860                        CircularAverageTo1D(activeType) 
     1861                        break 
     1862                case "Sector_PlusMinus": 
     1863                        Sector_PlusMinus1D(activeType) 
    18611864                        break 
    18621865                default:         
     
    22542257         
    22552258        PathInfo/S catPathName 
    2256         fullPath = DoSaveFileDialog("Export Protocol as") 
     2259        fullPath = DoSaveFileDialog("Export Protocol as",fname=Protocol,suffix="") 
    22572260        If(cmpstr(fullPath,"")==0) 
    22582261                //user cancel, don't write out a file 
Note: See TracChangeset for help on using the changeset viewer.