Changeset 1246 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Marquee_Operations.ipf

Timestamp:

Mar 19, 2020 4:35:21 PM (2 years ago)

Author:

srkline

Message:

A large number of changes to the size of panels to enable "Laptop Mode" where all of the panels and controls are scaled down so that they fit on screen and are still in correct proportion. For the laptop I'm using for testing, the resolution is 1920x1080. For this, a scaling of 0.7 seems to work. The on/off of the "laptop Mode" is controlled by a checkbox in the preference panel (under the General tab).

There are still more panels to update in the next commit.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Marquee_Operations.ipf (modified) (1 diff)

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

@@ -379 +379 @@
 
                 if(cmpstr(detStr,"FR") == 0)
-                        Print "Reference Y-Center is corrected for tube #7 zero position"               
+                        Print "Reference Y-Center is corrected for FR tube #7 zero position"            
 
                         yCorrection = 61.70 - yCorrection
                         Print "yCorrection (pix) = ",yCorrection
                         Print "yCorrection (cm) = ",yCorrection*yPixSize
-                        Print "FRONT Reference X-center (cm) = ",x_mm/10
-                        Print "FRONT Reference Y-center (cm) = ",y_mm/10 + yCorrection*yPixSize
                         xRef = x_mm/10
                         yRef = y_mm/10 + yCorrection*yPixSize
+                        Print "FRONT Reference X-center (cm) = ",xRef
+                        Print "FRONT Reference Y-center (cm) = ",yRef
+
                 endif
 
                 if(cmpstr(detStr,"MR") == 0)
-                        Print "Reference Y-Center is corrected for tube #10 zero position"              
+                        Print "Reference Y-Center is corrected for MR tube #10 zero position"           
 
                         yCorrection = 61.94 - yCorrection
                         Print "yCorrection (pix) = ",yCorrection
                         Print "yCorrection (cm) = ",yCorrection*yPixSize
-                        Print "MIDDLE Reference X-center (cm) = ",x_mm/10
-                        Print "MIDDLE Reference Y-center (cm) = ",y_mm/10 + yCorrection*yPixSize
                         xRef = x_mm/10
                         yRef = y_mm/10 + yCorrection*yPixSize
+                        Print "MIDDLE Reference X-center (cm) = ",xRef
+                        Print "MIDDLE Reference Y-center (cm) = ",yRef
+
                 endif
                 
 // if measured on the LEFT panel, convert to the RIGHT coordinates for the reference value      
 // these corrections are exactly the opposite (subtract, not add) of what is done in V_fDeriveBeamCenters(xFR,yFR,xMR,yMR)
+// since the lateral scans to determine the relative centers were done at the same time
+// the pixel values for the zero are on the same y-level, set by the beam height
+//
                 if(cmpstr(detStr,"FL") == 0)
-                        Print "FRONT Reference X-center (cm) = ",x_mm/10 - kBCtrOffset_FL_x     // NEW Dec 2018 values
-                        Print "FRONT Reference Y-center (cm) = ",y_mm/10 - kBCtrOffset_FL_y
+                        Print "Reference Y-Center is corrected for FR tube #7 zero position"            
+
+                        yCorrection = 61.70 - yCorrection
+                        Print "yCorrection (pix) = ",yCorrection
+                        Print "yCorrection (cm) = ",yCorrection*yPixSize                
                         xRef = x_mm/10 - kBCtrOffset_FL_x
-                        yRef = y_mm/10 - kBCtrOffset_FL_y
+                        yRef = y_mm/10 - kBCtrOffset_FL_y + yCorrection*yPixSize                
+                        Print "FRONT Reference X-center (cm) = ",xRef   // NEW Dec 2018 values
+                        Print "FRONT Reference Y-center (cm) = ",yRef
+
                 endif
                 
                 if(cmpstr(detStr,"ML") == 0)
-                        Print "MIDDLE Reference X-center (cm) = ",x_mm/10 - kBCtrOffset_ML_x
-                        Print "MIDDLE Reference Y-center (cm) = ",y_mm/10 - kBCtrOffset_ML_y
+                        Print "Reference Y-Center is corrected for MR tube #10 zero position"           
+
+                        yCorrection = 61.94 - yCorrection
+                        Print "yCorrection (pix) = ",yCorrection
+                        Print "yCorrection (cm) = ",yCorrection*yPixSize
                         xRef = x_mm/10 - kBCtrOffset_ML_x
-                        yRef = y_mm/10 - kBCtrOffset_ML_y
+                        yRef = y_mm/10 - kBCtrOffset_ML_y + yCorrection*yPixSize                        
+                        Print "MIDDLE Reference X-center (cm) = ",xRef
+                        Print "MIDDLE Reference Y-center (cm) = ",yRef
+
                 endif
         endif