Changeset 1142 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf

Timestamp:

Apr 9, 2019 11:04:14 AM (4 years ago)

Author:

srkline

Message:

cosmetic changes to VCALC

changed the patch routine for guides to accept "CONV_BEAMS", etc. to properly fill in the collimation to be recognized for resolution calculations.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf (modified) (5 diffs)

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

@@ -2861 +2861 @@
                 
                 // fake data
-                        V_writeDetectorData(fname,detStr,tmpData)
+//                      V_writeDetectorData(fname,detStr,tmpData)
                         
                         
@@ -2934 +2934 @@
 
 
-Proc V_Patch_Guide_SSD_Aperture(lo,hi,numGuides,sourceDiam_mm)
-        Variable lo,hi,numGuides=0,sourceDiam_mm=30
-        
-        V_fPatch_Guide_SSD_Aperture(lo,hi,numGuides,sourceDiam_mm)
+Proc V_Patch_Guide_SSD_Aperture(lo,hi,numGuideStr,sourceDiam_mm)
+        Variable lo,hi
+        String numGuideStr="CONV_BEAMS"
+        Variable sourceDiam_mm=30
+        
+        V_fPatch_Guide_SSD_Aperture(lo,hi,numGuideStr,sourceDiam_mm)
 End
 
@@ -2956 +2958 @@
 // hi is the last file number (inclusive)
 //
-Function V_fPatch_Guide_SSD_Aperture(lo,hi,numGuides,sourceDiam_mm)
-        Variable lo,hi,numGuides,sourceDiam_mm
+Function V_fPatch_Guide_SSD_Aperture(lo,hi,numGuideStr,sourceDiam_mm)
+        Variable lo,hi
+        String numGuideStr
+        Variable sourceDiam_mm
 
         
@@ -2963 +2967 @@
         String fname,detStr
 
-        switch(numGuides)
-                case 0:
+        strswitch(numGuideStr)
+                case "CONV_BEAMS":
+                case "NARROW_SLITS":
+                case "0":
                                 A1_to_GV = 2441
                         break
-                case 1:
+                case "1":
                                 A1_to_GV = 2157
                         break
-                case 2:
+                case "2":
                                 A1_to_GV = 1976
                         break
-                case 3:
+                case "3":
                                 A1_to_GV = 1782
                         break                   
-                case 4:
+                case "4":
                                 A1_to_GV = 1582
                         break                   
-                case 5:
+                case "5":
                                 A1_to_GV = 1381
                         break                   
-                case 6:
+                case "6":
                                 A1_to_GV = 1181
                         break                   
-                case 7:
+                case "7":
                                 A1_to_GV = 980
                         break                   
-                case 8:
+                case "8":
                                 A1_to_GV = 780
                         break                   
-                case 9:
+                case "9":
                                 A1_to_GV = 579
                         break                   
@@ -3006 +3012 @@
                 
                 // write values
-                V_writeNumberOfGuides(fname,num2str(numGuides))
+                V_writeNumberOfGuides(fname,numGuideStr)
 
                 V_writeSourceAp_distance(fname,A1_to_GV)