Changeset 779 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Jan 3, 2011 12:06:23 PM (12 years ago)

Author:

srkline

Message:

fixed a bug in ILL_DataReadWrite that always set the sample aperture diameter to 10 mm. It appears that the raw data files have zero as the aperture diameter, so if zero is found, 10 is returned. Otheriwse, if a value is found, it is returned.

Added a few tweaks to the Histogram Pair procedures on the Marquee.

deleted extra pragma statement from CircSectAve?.ipf

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• CircSectAve.ipf (modified) (2 diffs)
• ILL_DataReadWrite.ipf (modified) (1 diff)
• Marquee.ipf (modified) (3 diffs)

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

@@ -20 +20 @@
 
 
-// this fuction also does sector averaging 
+// this function also does sector averaging 
 //the parameters in the global keyword-string must have already been set somewhere
 //either directly, from the protocol, or from the Average_Panel
 //** the keyword-list has already been "pre-parsed" to send only Circular or Sector
-//averages to this routine. Rectangualr or annular averages get done elsewhere
+//averages to this routine. Rectangular or annular averages get done elsewhere
 // TYPE parameter determines which data folder to work from
 //
@@ -497 +497 @@
 
 
-#pragma rtGlobals=1             // Use modern global access method.
-
-
 // -- seems to work, now I need to give it a name, add it to the list, and 
 // make sure I've thought of all of the cases - then the average can be passed as case "Sector_PlusMinus"

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

@@ -1231 +1231 @@
         // your code returning value
 //      value = getRealValueFromHeader_2(fname,60,28,5,15,3) 
-        value = getRealValueFromHeader(fname,72)
-        
-        value = 10
+        value = getRealValueFromHeader(fname,73)
+        
+        if(value == 0)          //in case no aperture size was written to raw data file
+                value = 10
+        endif
         
         return(value)

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

@@ -660 +660 @@
                 
         // so use a pair of cursors instead (how do I easily get rid of them?) - a "done" button
-        Cursor/W=SANS_Data/K B
-        Cursor/W=SANS_Data/K C
-        
-        Cursor/W=SANS_Data/F/I B data (xin-xwidth), (yin-yWidth)
-        Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) B
-//      Cursor/W=SANS_Data/M/A=0 B
-        
-        Cursor/W=SANS_Data/F/I C data (xin+xwidth), (yin+yWidth)
-        Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) C
-//      Cursor/W=SANS_Data/M/A=0 C
-                        
+        DoWindow SANS_Data
+        if(V_flag)
+                Cursor/W=SANS_Data/K B
+                Cursor/W=SANS_Data/K C
+        
+                Cursor/W=SANS_Data/F/I B data (xin-xwidth), (yin-yWidth)
+                Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) B
+        //      Cursor/W=SANS_Data/M/A=0 B
+                
+                Cursor/W=SANS_Data/F/I C data (xin+xwidth), (yin+yWidth)
+                Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) C
+        //      Cursor/W=SANS_Data/M/A=0 C
+        endif   
         return(0)
 end
@@ -698 +700 @@
         Label left "Counts"
         Label bottom "Pixel (detector coordinates)"
-        SetAxis/A/N=2 left
+        SetAxis/A/N=0 left
         TextBox/C/N=text0/X=5.0/Y=5.0 "TOP"
         TextBox/C/N=text0_1/X=5.0/Y=67.0 "RIGHT"
@@ -767 +769 @@
                         // click code here
                         DoWindow/K HistoPair
-                        Cursor/W=SANS_Data/K A
-                        Cursor/W=SANS_Data/K B
-                        Cursor/W=SANS_Data/K C
+                        
+                        DoWindow SANS_Data
+                        if(V_flag)
+                                Cursor/W=SANS_Data/K A
+                                Cursor/W=SANS_Data/K B
+                                Cursor/W=SANS_Data/K C
+                        endif
                         break
         endswitch