Changeset 558 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf

@@ -302 +302 @@
 // output is dumped to the command window
 //
-Function DoBoxSum(fileStr,x1,x2,y1,y2)
+Function DoBoxSum(fileStr,x1,x2,y1,y2,type)
         String fileStr
         Variable x1,x2,y1,y2
+        String type
         
         //parse the list of file numbers
@@ -332 +333 @@
 //              String/G root:myGlobals:gDataDisplayType="RAW"
 //              fRawWindowHook()
-                err = Raw_to_work("SAM")
-                String/G root:myGlobals:gDataDisplayType="SAM"  
+                if(cmpstr(type,"SAM")==0)
+                        err = Raw_to_work("SAM")
+                endif
+                String/G root:myGlobals:gDataDisplayType=type
                 fRawWindowHook()
-                cts=SumCountsInBox(x1,x2,y1,y2,"SAM")
+                cts=SumCountsInBox(x1,x2,y1,y2,type)
                 BoxCounts[ii]=cts
                 Print item+" counts = ",cts
@@ -384 +387 @@
         
         String fileStr="",msgStr="Enter a comma-delimited list of run numbers, use dashes for ranges"
+        String type="RAW"
         Prompt fileStr,msgStr
-        DoPrompt "Pick the file range",fileStr
+        Prompt type,"RAW or Normalized (SAM)",popup,"RAW;SAM;"
+        DoPrompt "Pick the file range",fileStr,type
         Print "fileStr = ",fileStr
         printf "(x1,x2) (y1,y2) = (%d,%d) (%d,%d)\r",x1,x2,y1,y2
         
-        DoBoxSum(fileStr,x1,x2,y1,y2)
+        DoBoxSum(fileStr,x1,x2,y1,y2,type)
         
         return(0)