Changeset 776

Timestamp:

Dec 17, 2010 5:20:39 PM (12 years ago)

Author:

srkline

Message:

fixed some sloppy logic in converting log/lin data. Now the raw data readers create data (for display) and linear_data (to keep) upon loading.

Updated the Histogram Pair with Cedric's suggestions. width is adjustable, and the cursor is more visible.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• ANSTO_DataReadWrite.ipf (modified) (2 diffs)
• DisplayUtils.ipf (modified) (2 diffs)
• HFIR_DataReadWrite.ipf (modified) (2 diffs)
• ILL_DataReadWrite.ipf (modified) (3 diffs)
• Marquee.ipf (modified) (10 diffs)
• NCNR_DataReadWrite.ipf (modified) (2 diffs)

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

@@ -202 +202 @@
         String/G root:Packages:NIST:RAW:fileList = textw[0]
         
+        Duplicate/O data $"root:Packages:NIST:RAW:linear_data"                  //data read in is on linear scale, copy it now
+
         Return 0
 
@@ -298 +300 @@
         String/G $(curPath + ":fileList") = textw[0]
         
+        Duplicate/O data linear_data                    //data read in is on linear scale, copy it now
+
         //return the data folder to root
         SetDataFolder root:

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

@@ -271 +271 @@
         //check the waves for existence before operating on them
         String msg = ""
-        If(WaveExists($dest+":data") == 0)
-                msg = "data not found in "+folder+" folder. Action aborted."
+        If(WaveExists($dest+":linear_data") == 0)
+                msg = "linear_data not found in "+folder+" folder. Action aborted."
                 DoAlert 0, msg
                 Return (1)      //error
@@ -278 +278 @@
 
         WAVE data=$(dest + ":data")
-        
+        WAVE linear_data=$(dest + ":linear_data")
         // works on a copy of the linear_data, so that the original data is always preserved
         
-        Duplicate/O $(dest + ":data") $(dest + ":linear_data")
-        data = log(data)
+//      Duplicate/O $(dest + ":data") $(dest + ":linear_data")
+        data = log(linear_data)
         
         //Call the procedure that would normally be called if the threshold functions were activated

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

@@ -205 +205 @@
         String/G fileList = textw[0]
         //return the data folder to root
+        
+        WAVE data=$"root:Packages:NIST:RAW:data"
+        Duplicate/O data $"root:Packages:NIST:RAW:linear_data"                  // data is "fresh" and linear scale, so copy it now
+        
+        
         SetDataFolder root:
 
@@ -301 +306 @@
         String/G $(curPath + ":fileList") = textw[0]
 
+        WAVE data=$"root:Packages:NIST:RAW:data"
+        Duplicate/O data $"root:Packages:NIST:RAW:linear_data"                  // data is "fresh" and linear scale, so copy it now
+        
         //return the data folder to root
         SetDataFolder root:

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

@@ -214 +214 @@
         Setdatafolder curpath
         
+        Duplicate/O data $"root:Packages:NIST:RAW:linear_data"                  // data is "fresh" and linear scale, so copy it now
         
         //keep a string with the filename in the RAW folder
@@ -316 +317 @@
                 
         String loadedStr = StringFromList(0,S_waveNames,";")            //then name of the wave loaded
-
-        // if data loaded in is already named "data", don't bother with this step
-        if(exists("data") == 0)
-                duplicate/O $loadedStr,$(curPath+ ":data")
-        endif
-        // if data loaded in is already named "linear_data", don't bother with this step
-        if(exists("linear_data") == 0)
-                duplicate/O $loadedStr,$(curPath+ ":linear_data")
-        endif
-        
+        
+//      data loaded should be named "linear_data" (this is set in the DIV writer)
+
+// so this will generate the log-scaled data wave       
+//      ConvertFolderToLogScale("DIV")
+        Duplicate/O linear_data,data
+        data = log(linear_data)
+
         //keep a string with the filename in the DIV folder
         String/G $(curPath + ":fileList") = textw[0]
@@ -1792 +1791 @@
         
         // should have the linear display.....
-ConvertFolderToLogScale(type)
-        
-        Save/C root:packages:nist:STO:linear_data as "plex.DIV"
-        
+        ConvertFolderToLogScale(type)
+
         // Your file writing function here. Don't try to duplicate the VAX binary format...
         
+        SetDataFolder $("root:Packages:NIST:"+type)
+        Save/C linear_data as "plex.DIV"
+        
+        SetDataFolder root:
         return(0)
 End

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

@@ -438 +438 @@
 End
 
+Function SANS_Histogram_Pair() :  GraphMarquee
+        GetMarquee left,bottom
+        if(V_flag == 0)
+                Abort "There is no Marquee"
+        endif
+        
+        Cursor/W=SANS_Data/F/I A data 64,64
+        Cursor/M/S=2/H=1/L=0/C=(3,52428,1) A
+                                
+        // if cursor A on graph
+        // Do histogram pair
+        Variable aExists= strlen(CsrInfo(A)) > 0        // A is a name, not a string
+        if(aExists)
+                DoHistogramPair(hcsr(A),vcsr(A))
+        else
+                DoHistogramPair(64,64)
+        endif
+        return(0)
+        
+        //
+End
 // generates a histogram of the data as defined by the marquee. The longer dimension of the marquee
 // becomes the x-axis of the histogram (this may need to be changed for some odd case). Pixel range specified
@@ -451 +472 @@
                 Abort "There is no Marquee"
         endif
-        // if cursor A on graph
-        // Do histogram pair
-        Variable aExists= strlen(CsrInfo(A)) > 0        // A is a name, not a string
-        if(aExists)
-                DoHistogramPair(hcsr(A),vcsr(A))
-                return(0)
-        endif
+//      // if cursor A on graph
+//      // Do histogram pair
+//      Variable aExists= strlen(CsrInfo(A)) > 0        // A is a name, not a string
+//      if(aExists)
+//              DoHistogramPair(hcsr(A),vcsr(A))
+//              return(0)
+//      endif
         //
         Variable count,x1,x2,y1,y2,xwidth,ywidth,vsX=1,xx,yy
@@ -558 +579 @@
 End
 
-// if the "A" cursor is on the graph, do +-5 pixels in each direction
-// otherwise, you won't get here
+//
+//
 Function DoHistogramPair(xin,yin)
         Variable xin,yin
@@ -571 +592 @@
         pt2 = 128
                 
-        Make/O/D/N=(pt2-pt1) PositionX,AvgCountsX
-        Make/O/D/N=(pt2-pt1) PositionY,AvgCountsY
+        Make/O/D/N=(pt2-pt1+1) PositionX,AvgCountsX
+        Make/O/D/N=(pt2-pt1+1) PositionY,AvgCountsY
         AvgCountsX=0
         AvgCountsY=0
@@ -584 +605 @@
         
         //do the vertical, then the horizontal
-        xwidth = 5              //+ -
-        ywidth = 5
+        ControlInfo/W=HistoPair setvar0
+//      Print "width = ",V_Value
+        xwidth = V_Value                //+ -
+        ywidth = V_Value
         x1 = xin - xwidth
         x2 = xin + xwidth
@@ -592 +615 @@
         
         KeepSelectionInBounds(x1,x2,y1,y2)
-        Print "x1,x2,y1,y2 (det) =",x1+1,x2+1,y1+1,y2+1
+//      Print "x1,x2,y1,y2 (det) =",x1+1,x2+1,y1+1,y2+1
         
         //Compute the histogram (manually)
@@ -609 +632 @@
                 
         KeepSelectionInBounds(x1,x2,y1,y2)
-        Print "x1,x2,y1,y2 (det) =",x1+1,x2+1,y2+1,y2+1 
+//      Print "x1,x2,y1,y2 (det) =",x1+1,x2+1,y2+1,y2+1 
         for(xx=x1;xx<=x2;xx+=1)         //outer loop is the "x-axis"
                 for(yy=y1;yy<=y2;yy+=1)
@@ -630 +653 @@
 Function Draw_HistoPair()
         PauseUpdate; Silent 1           // building window...
-        Display /W=(253,683,723,950)/K=1 AvgCountsX vs PositionX as "Histogram Pair"
+        Display /W=(432.75,431.75,903,698.75)/K=1 AvgCountsX vs PositionX as "Histogram Pair"
         AppendToGraph/L=leftY/B=bottomY AvgCountsY vs PositionY
         DoWindow/C HistoPair
+        
         ModifyGraph rgb(AvgCountsX)=(21845,21845,21845)
         ModifyGraph hbFill(AvgCountsX)=2
@@ -655 +679 @@
         TextBox/C/N=text0_2/X=84.0/Y=67.0 "LEFT"
         TextBox/C/N=text0_3/X=84.0/Y=5.0 "BOTTOM"
+        
+        ControlBar 40
+//      CheckBox check0,pos={300,11},size={72,14},proc=SH_FreeCursorCheck,title="Free Cursor"
+//      CheckBox check0,value= 0
+        Button button0 title="Update",size={70,20},pos={200,9},proc=SH_RecalcButton
+        SetVariable setvar0,pos={20,11},size={120,16},title="Width (pixels)"
+        SetVariable setvar0,limits={0,64,1},value= _NUM:5
+        
 EndMacro
 
@@ -667 +699 @@
         
 End
+
+
+Function SH_FreeCursorCheck(cba) : CheckBoxControl
+        STRUCT WMCheckboxAction &cba
+
+        switch( cba.eventCode )
+                case 2: // mouse up
+                        Variable checked = cba.checked
+                        
+                                //don't move the cursor
+                                //Cursor/W=SANS_Data/F/M/S=2/H=1/L=0/C=(3,52428,1) A data
+                        
+                                Cursor/W=SANS_Data/F/I A data 64,64
+                                Cursor/M/S=2/H=1/L=0/C=(3,52428,1) A
+                                
+                        break
+        endswitch
+
+        return 0
+End
+
+Function SH_RecalcButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+//                      Print "at = ",hcsr(A,"SANS_Data"),vcsr(A,"SANS_Data")
+                        DoHistogramPair(hcsr(A,"SANS_Data"),vcsr(A,"SANS_Data"))
+                        break
+        endswitch
+
+        return 0
+End

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

@@ -367 +367 @@
         SkipAndDecompressVAX(w,data)
         Redimension/N=(128,128) data                    //NIST raw data is 128x128 - do not generalize
+        
+        Duplicate/O data linear_data                    // at this point, the data is still the raw data, and is linear_data
+        //
         
         //keep a string with the filename in the RAW folder
@@ -822 +825 @@
 
         Redimension/n=(128,128) data
+        
+        Duplicate/O data linear_data                    //data read in is on linear scale, copy it now
         
         //clean up - get rid of w = $"tempGBWave0"