Changeset 433

Timestamp:

Oct 29, 2008 1:36:20 PM (14 years ago)

Author:

srkline

Message:

Added a few more windows to the hide/show lists for the loader

Added a log/lin checkbox for the USANS graph that toggles the x-axis only. The y-axis is always log.

Added a display on the USANS graph that shows Trock/Twide?. It is calculated as UpdateTrans? is clicked. If the value is less than 0.9, the display changes to red.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NCNR_Package_Loader.ipf (modified) (10 diffs)
• Reduction/USANS/COR_Graph.ipf (modified) (4 diffs)
• Reduction/USANS/Main_USANS.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

@@ -39 +39 @@
         SVAR gMenuStr1b = root:Packages:NCNRItemStr1b
         
+        String SANSAna_WinList = "wrapperPanel;Procedure_List;"
         strswitch(itemStr)      // string switch
                 case "Load NCNR Analysis Macros":       
@@ -82 +83 @@
                         break
                 case "Hide NCNR Analysis Macros":       
-                        DoWindow wrapperPanel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 wrapperPanel
-                        endif
-                        DoWindow Procedure_List
-                        If(V_Flag)
-                                DoWindow/HIDE=1 Procedure_List
-                        endif
+                        HideShowWindowsInList(SANSAna_WinList,1)        
                 
                         gMenuStr1a = "Show NCNR Analysis Macros"
@@ -97 +91 @@
                         
                         break
-                case "Show NCNR Analysis Macros":       
-                        DoWindow wrapperPanel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 wrapperPanel
-                        endif
-                        DoWindow Procedure_List
-                        If(V_Flag)
-                                DoWindow/HIDE=0 Procedure_List
-                        endif
+                case "Show NCNR Analysis Macros":
+                        HideShowWindowsInList(SANSAna_WinList,0)        
                 
                         gMenuStr1a = "Hide NCNR Analysis Macros"
@@ -134 +121 @@
         SVAR gMenuStr2b = root:Packages:NCNRItemStr2b
         
+        String SANSRed_WinList = "Main_Panel;"
         strswitch(itemStr)      // string switch
                 case "Load NCNR SANS Reduction Macros": 
@@ -161 +149 @@
                         
                         break
-                case "Hide NCNR SANS Reduction Macros": 
-                        DoWindow Main_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 Main_Panel
-                        endif
+                case "Hide NCNR SANS Reduction Macros":
+                        HideShowWindowsInList(SANSRed_WinList,1)
                 
                         gMenuStr2a = "Show NCNR SANS Reduction Macros"
@@ -174 +159 @@
                         break
                 case "Show NCNR SANS Reduction Macros": 
-                        DoWindow Main_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 Main_Panel
-                        endif
+                        HideShowWindowsInList(SANSRed_WinList,0)
                 
                         gMenuStr2a = "Hide NCNR SANS Reduction Macros"
@@ -205 +187 @@
         SVAR gMenuStr3b = root:Packages:NCNRItemStr3b
         
+        String USANS_WinList = "USANS_Panel;COR_Graph;RawDataWin;Desmear_Graph;"
+        
         strswitch(itemStr)      // string switch
                 case "Load NCNR USANS Reduction Macros":        
@@ -233 +217 @@
                         break
                 case "Hide NCNR USANS Reduction Macros":        
-                        DoWindow USANS_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 USANS_Panel
-                        endif
+                        HideShowWindowsInList(USANS_WinList,1)  
                 
                         gMenuStr3a = "Show NCNR USANS Reduction Macros"
@@ -244 +225 @@
                         
                         break
-                case "Show NCNR USANS Reduction Macros":        
-                        DoWindow USANS_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 USANS_Panel
-                        endif
-                
+                case "Show NCNR USANS Reduction Macros":
+                        HideShowWindowsInList(USANS_WinList,0)  
+                        
                         gMenuStr3a = "Hide NCNR USANS Reduction Macros"
 //                      gMenuStr3b = "Unload NCNR USANS Reduction Macros"
@@ -262 +240 @@
 end
 
+// 1 = hide, 0 = show
+Function HideShowWindowsInList(list,hide)
+        String list
+        Variable hide
+        
+        String item
+        Variable ii,num=ItemsinList(list)
+        for(ii=0;ii<num;ii+=1)
+                item = StringFromList(ii, list , ";")
+                DoWindow $item
+                if(V_Flag)
+                        DoWindow/HIDE=(hide) $item
+                endif
+        endfor
+        return(0)
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

@@ -29 +29 @@
         if(V_flag==0)
                 //draw the blank window and the control bar
-                Display /W=(5,42,450,500) /K=1
+                Display /W=(5,42,450,550) /K=1
                 DoWindow/C COR_Graph
-                ControlBar 100
+                ControlBar 150
                 SetVariable gTransWide,pos={210,12},size={135,15},title="Trans - Wide",format="%5.4f"
                 SetVariable gTransWide,help={"Average counts on transmssion detector at wide angles"}
@@ -71 +71 @@
                 ValDisplay valdispEMP,help={"Displays the peak angle the raw EMP data, determined automatically"}
         
+                CheckBox check0 title="Log X-axis",proc=LogLinToggleCheckProc
+                CheckBox check0 pos={12,100},value=0,mode=0
+                SetVariable setvar0,pos={210,100},size={120,20},title="Trock/Twide",format="%5.4f"
+                SetVariable setVar0,help={"fraction of unscattered neutrons"}
+                SetVariable setVar0,limits={0,2,0},value= $(USANSFolder+":Globals:MainPanel:gTransRatio")
+                
                 Legend
         Endif
@@ -364 +370 @@
         Variable/G $(USANSFolder+":Globals:MainPanel:gTransRock")=samRock/empRock
         
+        TransRatio()            //calculate the ratio and update
+        
         return(0)
 End
@@ -403 +411 @@
         RePlotWithUserAngle(type,newPkAngle)
 End
+
+Function TransRatio()
+        NVAR tr = root:Packages:NIST:USANS:Globals:MainPanel:gTransRock
+        NVAR tw = root:Packages:NIST:USANS:Globals:MainPanel:gTransWide
+        NVAR rat = root:Packages:NIST:USANS:Globals:MainPanel:gTransRatio
+        
+        rat = tr/tw
+        if(rat < 0.9)
+                SetVariable setVar0 labelBack=(65535,32768,32768)
+        else
+                SetVariable setVar0 labelBack=0
+        endif
+        return(0)
+End
+
+Function LogLinToggleCheckProc(cba) : CheckBoxControl
+        STRUCT WMCheckboxAction &cba
+
+        switch( cba.eventCode )
+                case 2: // mouse up
+                        Variable checked = cba.checked                  
+                        if(checked)
+                                ModifyGraph log(bottom)=1
+                        else
+                                ModifyGraph log(bottom)=0
+                        endif
+                        break
+        endswitch
+
+        return 0
+End
+
 
 //returns the peak location found (and used) for zero angle

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -82 +82 @@
         Variable/G gThick = 0.1
         Variable/G gTypeCheck=1
+        Variable/G gTransRatio=1
         //Text filter for data files AJJ Sept 06
         String/G FilterStr