Changeset 1015 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_BeamCenter.ipf

Timestamp:

Oct 14, 2016 12:53:52 PM (6 years ago)

Author:

srkline

Message:

moved the waves and variables for the beam center panel and the mask panel to their own folders, rather than root to avoid conflicts of detector panel display.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_BeamCenter.ipf (modified) (11 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_BeamCenter.ipf

@@ -11 +11 @@
 // -- add method to be able to write the values to the local folder / or better, to file on disk
 // -- graphically show the beam center / radius of where it is in relation to the panel
+//
+// -- move everything into it's own folder, rather than root:
+//
 
 
@@ -16 +19 @@
         DoWindow/F PanelFit
         if(V_flag==0)
+        
+                NewDataFolder/O root:Packages:NIST:VSANS:Globals:BeamCenter
+
                 Execute "DetectorPanelFit()"
         endif
@@ -39 +45 @@
         PopupMenu popup_1,mode=1,popvalue="BroadPeak",value= #"\"BroadPeak;other;\""
         PopupMenu popup_2,pos={20,20},size={109,20},title="Data Source"//,proc=SetFldrPopMenuProc
-        PopupMenu popup_2,mode=1,popvalue="VCALC",value= #"\"RAW;SAM;VCALC;\""
+        PopupMenu popup_2,mode=1,popvalue="RAW",value= #"\"RAW;SAM;VCALC;\""
                 
         Button button_0,pos={486,20},size={80,20},proc=DetFitGuessButtonProc,title="Guess"
@@ -49 +55 @@
 
 
-
-        duplicate/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL:det_FL curDispPanel
+        SetDataFolder root:Packages:NIST:VSANS:Globals:BeamCenter
+
+        duplicate/O root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FL:data curDispPanel
         SetScale/P x 0,1, curDispPanel
         SetScale/P y 0,1, curDispPanel
 
-
+        SetDataFolder root:
+        
         // draw the correct images
         DrawDetPanel("FL")
@@ -156 +164 @@
         Variable nPix_X,nPix_Y,pixSize_X,pixSize_Y
 
-        
-        Wave dispW=root:curDispPanel
+
+        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel
         Wave cw = root:coef_PeakPix2D
 
@@ -320 +328 @@
         cw[8] = pixSize_Y*10            
 
+        SetDataFolder root:Packages:NIST:VSANS:Globals:BeamCenter
         // generate the new panel display
         duplicate/O newW curDispPanel
@@ -333 +342 @@
         RenameWindow #,DetData
         SetActiveSubwindow ##   
+        
+        SetDataFolder root:
+        
         
                 
@@ -392 +404 @@
                 case 2: // mouse up
                         // click code here
-                        Wave dispW=root:curDispPanel
+                        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel
                         Wave coefW=root:coef_PeakPix2D
                         
@@ -454 +466 @@
                         // click code here
                         
-                        Wave dispW=root:curDispPanel
+                        Wave dispW=root:Packages:NIST:VSANS:Globals:BeamCenter:curDispPanel
                         Wave coefW=root:coef_PeakPix2D
                         
@@ -597 +609 @@
 // this works if the proper centers are in the file - otherwise, it's a mess    
 // "B" is skipped here, as it should be...
+
+// TODO --?? is this a problem??
         SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType
 
@@ -622 +636 @@
 Function V_SpreadOutPanels()
 
+// TODO ?? is this a problem??
         SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType