Changeset 1102 for sans

Timestamp:

May 25, 2018 11:11:48 AM (5 years ago)

Author:

srkline

Message:

fixed a few bugs in the transmission panel.

added patching operation for dead time of the back panel

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_PatchFiles.ipf (modified) (4 diffs)
• V_Transmission.ipf (modified) (4 diffs)
• V_Utilities_Comparisons.ipf (modified) (1 diff)

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

@@ -517 +517 @@
         fname = S_path + fname
 
-        Variable nRows = 12
+        Variable nRows = 13
         Redimension/N=(nRows,3) ListWave
         Redimension/N=(nRows,3) selWave
@@ -570 +570 @@
         listWave[11][2] = num2str(V_getDet_y_pixel_size(fname,detStr))  
 
+        listWave[12][1] = "dead time (s) (back only)"
+        listWave[12][2] = num2str(V_getDetector_deadtime_B(fname,detStr))                       //returns 0 if not "B"
 
         return(0)
@@ -1358 +1360 @@
         endif   
         
-
+        if ((selWave[12][0] & 2^4) != 0)                //"dead time, "B" only"
+                val = str2num(listWave[12][2])
+                if(cmpstr(detStr,"B") == 0)
+                        err = V_writeDetector_deadtime_B(fname,detStr,val)
+                endif
+        endif   
 
         
@@ -2789 +2796 @@
         
         Make/O/D/N=3 cal_x,cal_y
-        cal_x[0] = VCALC_getPixSizeX(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm]
+        cal_x[0] = VCALC_getPixSizeX(detStr)                    // pixel size in VCALC_getPixSizeX(detStr) is [cm]
         cal_x[1] = 1
         cal_x[2] = 10000
-        cal_y[0] = VCALC_getPixSizeY(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm]
+        cal_y[0] = VCALC_getPixSizeY(detStr)                    // pixel size in VCALC_getPixSizeX(detStr) is [cm]
         cal_y[1] = 1
         cal_y[2] = 10000

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

@@ -222 +222 @@
         endfor
 
+        SVAR newSamList = root:Packages:NIST:VSANS:Globals:Transmission:gSamMatchList
+        newSamList = newList
+        
         return(newList)
 End
@@ -247 +250 @@
         endfor
 
+        SVAR newTransList = root:Packages:NIST:VSANS:Globals:Transmission:gTransMatchList
+        newTransList = newList
+        
         return(newList)
         
@@ -272 +278 @@
                         PopupMenu popup_1,mode=1,value=V_getTransListForPopup()
                         
+                        SVAR newBox = root:Packages:NIST:VSANS:Globals:Transmission:gEmptyBoxCoord
+                        newBox = V_NumWave2List(boxCoord,";")
+                        
                         break
                 case -1: // control being killed
@@ -347 +356 @@
                         EmptyFile = S_Value
                 
-                        // gSamMatchStr has " at each end. remove these
                         String list
                         list = gSamMatchList
-                        list = list[1,strlen(list)-1]
-                        list = list[0,strlen(list)-2]
+//                      list = list[1,strlen(list)-1]
+//                      list = list[0,strlen(list)-2]
                         
                         Variable num,ii

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

@@ -166 +166 @@
         
         
-// I DO need to check all of the offset values
-        //// only return value for B and L/R detectors. everything else returns zero
-        //Function V_getDet_LateralOffset(fname,detStr)
-        //
-        //// only return values for T/B. everything else returns zero
-        //Function V_getDet_VerticalOffset(fname,detStr)
-        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
-                detStr = StringFromList(ii, ksDetectorListAll, ";")
-                if(!V_FP2_Value_Match(V_getDet_LateralOffset,fname1,fname2,detStr))
-                        return(0)       //no match
-                endif
-                if(!V_FP2_Value_Match(V_getDet_VerticalOffset,fname1,fname2,detStr))
-                        return(0)       //no match
-                endif
-        endfor
+//// ???Do I need to check all of the offset values
+//      //// only return value for B and L/R detectors. everything else returns zero
+//      //Function V_getDet_LateralOffset(fname,detStr)
+//      //
+//      //// only return values for T/B. everything else returns zero
+//      //Function V_getDet_VerticalOffset(fname,detStr)
+//      for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
+//              detStr = StringFromList(ii, ksDetectorListAll, ";")
+//              if(!V_FP2_Value_Match(V_getDet_LateralOffset,fname1,fname2,detStr))
+//                      return(0)       //no match
+//              endif
+//              if(!V_FP2_Value_Match(V_getDet_VerticalOffset,fname1,fname2,detStr))
+//                      return(0)       //no match
+//              endif
+//      endfor
+
+// only check the panel position for the actual panel used for the open beam measurement
+        detStr = V_getReduction_BoxPanel(fname1)
+        if(!V_FP2_Value_Match(V_getDet_LateralOffset,fname1,fname2,detStr))
+                return(0)       //no match
+        endif
 
         return(1)               // passed all of the tests, OK, it's a match