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/AvgGraphics.ipf

    r757 r764  
    159159                        QxQy_Export(type,"",1) 
    160160                        break 
     161                case "Sector_PlusMinus": 
     162                        Sector_PlusMinus1D(type) 
     163                        If(doSave) 
     164                                if (useXMLOutput == 1) 
     165                                        WriteXMLWaves_W_Protocol(type,"",1) 
     166                                else 
     167                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog 
     168                                endif 
     169                        Endif 
     170                        break 
    161171                default:                                                 
    162172                        Abort "no case match in average dispatch" 
     
    174184                String/G root:myGlobals:Protocols:gProtoStr = "" 
    175185        Endif 
    176          
    177186         
    178187        return(0) 
     
    226235                case "Circular": 
    227236                case "Sector": 
     237                case "Sector_PlusMinus": 
    228238                case "Rectangular": 
    229239                case "Annular": 
     
    258268                        break 
    259269                case "Sector": 
     270                case "Sector_PlusMinus": 
    260271                        SetVariable Phi_p,disable=no 
    261272                        SetVariable Qctr_p,disable=yes 
     
    301312        PopupMenu av_choice,pos={61,7},size={144,20},proc=AvTypePopMenuProc,title="AverageType" 
    302313        PopupMenu av_choice,help={"Select the type of average to perform, then make the required selections below and click \"DoAverage\" to plot the results"} 
    303         PopupMenu av_choice,mode=1,popvalue="Circular",value= #"\"Circular;Sector;Annular;Rectangular;2D ASCII;QxQy ASCII\"" 
     314        PopupMenu av_choice,mode=1,popvalue="Circular",value= #"\"Circular;Sector;Annular;Rectangular;2D ASCII;QxQy ASCII;Sector_PlusMinus;\"" 
    304315        Button ave_help,pos={260,7},size={25,20},proc=ShowAvePanelHelp,title="?" 
    305316        Button ave_help,help={"Show the help file for averaging options"} 
     
    446457        //else sector or rectangular - draw the lines 
    447458         
    448         //if sector or rectangular, draw the phi line (on the desired side) 
    449         if( (cmpstr(av_type,"Sector")==0) || (cmpstr(av_type,"Rectangular")==0)) 
     459        //if sector, sector_plusminus, or rectangular, draw the phi line (on the desired side) 
     460        if( (cmpstr(av_type,"Sector")==0) || (cmpstr(av_type,"Rectangular")==0) || (cmpstr(av_type,"Sector_PlusMinus")==0)) 
    450461                if( (cmpstr(side,"left")==0) || (cmpstr(side,"both")==0) ) 
    451462                        //draw the phi line on the left side 
     
    467478         
    468479        //if Sector, draw the +/- dphi lines 
    469         if (cmpstr(av_type,"Sector")==0) 
     480        if (cmpstr(av_type,"Sector")==0  || cmpstr(av_type,"Sector_PlusMinus")==0) 
    470481                if( (cmpstr(side,"left")==0) || (cmpstr(side,"both")==0) ) 
    471482                        //draw the deltaPhi lines +/- lines 
Note: See TracChangeset for help on using the changeset viewer.