Changeset 1144 for sans

Timestamp:

Apr 11, 2019 3:05:25 PM (4 years ago)

Author:

srkline

Message:

a few changes to the VSANS menu

updated VSANS reduction documentation for posting on the trac page

Location:

sans/Dev

Files:

• tags/VSANS_Reduction_Documentation.pdf (modified) (previous)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf (modified) (2 diffs)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_FileCatalog.ipf (modified) (5 diffs)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_Initialize.ipf (modified) (2 diffs)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_Menu.ipf (modified) (2 diffs)

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

@@ -1519 +1519 @@
 Proc pV_SubtractReadNoiseBack(folder,ReadNoise)
         String folder="RAW"
-        Variable readNoise=200
+        Variable readNoise=3160
         
         V_SubtractReadNoiseBack(folder,readNoise)
@@ -1540 +1540 @@
 Proc pV_MedianAndReadNoiseBack(folder,ReadNoise)
         String folder="RAW"
-        Variable readNoise=200
+        Variable readNoise=3160
         
         V_MedianAndReadNoiseBack(folder,readNoise)

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

@@ -311 +311 @@
         String infoStr
         String event= StringByKey("EVENT",infoStr)
+        
+        Variable ii
+        
 //      Print "EVENT= ",event
         strswitch(event)
@@ -317 +320 @@
 //                      Variable ypix= NumberByKey("MOUSEY",infoStr)
 //                      PopupContextualMenu/C=(xpix, ypix) "yes;no;maybe;"
-                        PopupContextualMenu "Load RAW;Load MSK;Load DIV;"
+                        PopupContextualMenu "Load RAW;Load MSK;Load DIV;-;Send to MRED;"
                         
                         WAVE/T Filenames = $"root:Packages:NIST:VSANS:CatVSHeaderInfo:Filenames"
@@ -340 +343 @@
                                                 
                                         endif
-                                        break;
+                                        break
                                         
                                 case "Load MSK":
@@ -348 +351 @@
                                         err = V_LoadHDF5Data(FileNames[V_StartRow],"MSK")
                                         
-                                        break;
+                                        break
                                         
                                 case "Load DIV":
@@ -356 +359 @@
                                         err = V_LoadHDF5Data(FileNames[V_StartRow],"DIV")
 
-                                        break;
+                                        break
+                                case "Send to MRED":
+                                        //
+                                        SVAR/Z numList=root:Packages:NIST:VSANS:Globals:MRED:gFileNumList
+                                        if(SVAR_Exists(numList))
+                                                GetSelection table,CatVSANSTable,1
+                                                for(ii=V_StartRow;ii<=V_endRow;ii+=1)
+        //                                              Print "selected " + FileNames[ii]
+                                                        numList += fileNames[ii] + ","
+                                                endfor
+                                                // pop the menu on the mred panel
+                                                V_MREDPopMenuProc("",1,"")
+                                        endif
+                                        break
                                         
                         endswitch               //popup selection

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

@@ -22 +22 @@
 //************************
 
-Constant kVSANSVersion = 7.91
+Constant kVSANSVersion = 7.92
 
 // TODO -- need to set up a separate file of "constants" or "globals" where the actual numbers are
@@ -463 +463 @@
         Printf "Hook cleaned out RawVSANS, experiment saved\r"
 
-        NVAR gHighResBinning = root:Packages:NIST:VSANS:Globals:gHighResBinning
+        NVAR/Z gHighResBinning = root:Packages:NIST:VSANS:Globals:gHighResBinning
         if(gHighResBinning == 1)
 // these KillDF are a bad idea - it wipes out all of the current work

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

@@ -25 +25 @@
                 "-"
                 "Show Mask for Averaging",V_Display_Four_Panels()
-                "Annular Binning",Annular_Binning()
-                "Write Annular Data",V_Write1DAnnular()
-                "Trim I(q) points",V_CombineDataGraph()
+//              "Annular Binning",Annular_Binning()
+//              "Write Annular Data",V_Write1DAnnular()
+//              "Trim I(q) points",V_CombineDataGraph()
                 "-"
                 "Derive Beam Centers From Reference",V_DeriveBeamCenters()
@@ -41 +41 @@
                 "Patch Intent using CatTable",V_Patch_Intent_catTable()
                 "-"
-                "Flip Lateral Offset",V_PatchDet_Offset()
-                "Mark Lateral Flip Done",V_MarkLeftRightFlip_Done()
-                "Mark Lateral Flip NOT Done",V_MarkLeftRightFlip_Not_Done()
-                "Patch Detector Panel Gap",V_PatchDet_Gap()
-                "Read Detetcor Panel Gap",V_ReadDet_Gap()
+//              "Flip Lateral Offset",V_PatchDet_Offset()
+//              "Mark Lateral Flip Done",V_MarkLeftRightFlip_Done()
+//              "Mark Lateral Flip NOT Done",V_MarkLeftRightFlip_Not_Done()
+//              "Patch Detector Panel Gap",V_PatchDet_Gap()
+//              "Read Detetcor Panel Gap",V_ReadDet_Gap()
                 "Patch Detector Distance",V_PatchDet_Distance()
                 "Patch XY Pixel Size",V_Patch_XYPixelSize()