Ignore:
Timestamp:
Sep 23, 2009 12:56:57 PM (13 years ago)
Author:
srkline
Message:

Added UCALC window to list of windows is package loader

Box Sum (from the marquee) asks for normalized (SAM) or RAW data

SASCALC uses real beamstop size rather than projected sizewhen doing simulation

Fake1DDataFolder() in MultiScatter_MonteCarlo ipf bug fixed where a bogus beamstop diameter (not 1"-4") would cause oddities in the resolution wave, and an (obviously) incorrect smearing of the simulation.

Fixed range 7 defaults in UCALC panel.

File:
1 edited

Legend:

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

    r482 r558  
    302302// output is dumped to the command window 
    303303// 
    304 Function DoBoxSum(fileStr,x1,x2,y1,y2) 
     304Function DoBoxSum(fileStr,x1,x2,y1,y2,type) 
    305305        String fileStr 
    306306        Variable x1,x2,y1,y2 
     307        String type 
    307308         
    308309        //parse the list of file numbers 
     
    332333//              String/G root:myGlobals:gDataDisplayType="RAW" 
    333334//              fRawWindowHook() 
    334                 err = Raw_to_work("SAM") 
    335                 String/G root:myGlobals:gDataDisplayType="SAM"   
     335                if(cmpstr(type,"SAM")==0) 
     336                        err = Raw_to_work("SAM") 
     337                endif 
     338                String/G root:myGlobals:gDataDisplayType=type 
    336339                fRawWindowHook() 
    337                 cts=SumCountsInBox(x1,x2,y1,y2,"SAM") 
     340                cts=SumCountsInBox(x1,x2,y1,y2,type) 
    338341                BoxCounts[ii]=cts 
    339342                Print item+" counts = ",cts 
     
    384387         
    385388        String fileStr="",msgStr="Enter a comma-delimited list of run numbers, use dashes for ranges" 
     389        String type="RAW" 
    386390        Prompt fileStr,msgStr 
    387         DoPrompt "Pick the file range",fileStr 
     391        Prompt type,"RAW or Normalized (SAM)",popup,"RAW;SAM;" 
     392        DoPrompt "Pick the file range",fileStr,type 
    388393        Print "fileStr = ",fileStr 
    389394        printf "(x1,x2) (y1,y2) = (%d,%d) (%d,%d)\r",x1,x2,y1,y2 
    390395         
    391         DoBoxSum(fileStr,x1,x2,y1,y2) 
     396        DoBoxSum(fileStr,x1,x2,y1,y2,type) 
    392397         
    393398        return(0) 
Note: See TracChangeset for help on using the changeset viewer.