Changeset 1070 for sans

Timestamp:

Oct 6, 2017 12:45:51 PM (5 years ago)

Author:

srkline

Message:

minor changes, fast ways to patch mis-information in the headers has been added to the VSANS menu for easier access.

added comments here and there

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VC_DetectorBinning_Utils.ipf (modified) (4 diffs)
• V_Menu.ipf (modified) (1 diff)
• V_PatchFiles.ipf (modified) (2 diffs)

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

@@ -773 +773 @@
 //
 //
+// TODO:
+// -- some of the input parameters for the resolution calcuation are either assumed (apOff) or are currently
+//    hard-wired. these need to be corrected before even the pinhole resolution is correct
+// x- resolution calculation is in the correct place. The calculation is done per-panel (specified by TYPE),
+//    and then the unwanted points can be discarded (all 6 columns) as the data is trimmed and concatenated
+//    is separate functions that are resolution-aware.
+//
 //
 // folderStr = WORK folder, type = the binning type (may include multiple detectors)
@@ -1170 +1177 @@
 // TODO:
 // -- the iErr (=2D) wave and accumulation of error is NOT CALCULATED CORRECTLY YET
-// -- the solid angle per pixel is not completely implemented.
-//    it will be present for WORK data other than RAW, but not for RAW
-
+//
+// The 1D error does not use iErr, and IS CALCULATED CORRECTLY
+//
+// x- the solid angle per pixel will be present for WORK data other than RAW, but not for RAW
+
+//
 // if any of the masks don't exist, display the error, and proceed with the averaging, using all data
         if(maskMissing == 1)
@@ -1394 +1404 @@
         
 // S2 = sample aperture diameter [mm]
-        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? the "external" may not exist?
+        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", but may not exist?
         
 // L1 = source to sample distance [m] 
@@ -1400 +1410 @@
 
 // L2 = sample to detector distance [m]
-        L2 = V_getDet_ActualDistance(folderStr,type[0]+"L")/100         //TODO "L" panel is hard wired and is WRONG
+// take the first two characters of the "type" to get the correct distance.
+// if the type is say, MLRTB, then the implicit assumption in combining all four panels is that the resolution
+// is not an issue for the slightly different distances.
+        L2 = V_getDet_ActualDistance(folderStr,type[0,1])/100           //convert cm to m
         
 // BS = beam stop diameter [mm]

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

@@ -46 +46 @@
 //              "IgorOnly_Save_SANS_Struct"
                 "Copy_VCALC_to_VSANSFile",Copy_VCALC_to_VSANSFile()
+                "Flip Lateral Offset",V_PatchDet_Offset()
+                "Patch GroupID using CatTable",V_Patch_GroupID_catTable()
+                "Patch Purpose using CatTable",V_Patch_Purpose_catTable()
+                "Patch Intent using CatTable",V_Patch_Intent_catTable()
                 "-"
                 "Setup_VSANS_DIV_Struct"

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

@@ -2334 +2334 @@
 
 
+Proc V_PatchDet_Offset(lo,hi)
+        Variable lo,hi
+        
+        V_fPatchDet_Offset(lo,hi)
+End
+
+// V_fReadDet_Offset(lo,hi)
+
+Proc V_Patch_GroupID_catTable()
+        V_fPatch_GroupID_catTable()
+end
+
+Proc V_Patch_Purpose_catTable()
+        V_fPatch_Purpose_catTable()
+end
+
+Proc V_Patch_Intent_catTable()
+        V_fPatch_Intent_catTable()
+end
+
+
 // simple utility to patch the offset values in the file headers
 //
@@ -2435 +2456 @@
 End
 
-V_fPatch_GroupID_catTable()
-V_fPatch_Purpose_catTable()
-V_fPatch_Intent_catTable()
 
 // patches the Purpose, based on whatever is in the catTable