Changeset 923 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Sep 19, 2013 2:24:48 PM (10 years ago)

Author:

srkline

Message:

Changes to:
Polarization - to correct naming errors when saving polarization panel states. Names were too long.

Event Mode - improved the re-loading of split oscillatory data sets. Also allows easier editing of the list of split files to re-load for decimation.

FFT/real space - Modified gizmo to automatically color the different SLDs present. Limitied to 5 different SLDs due to a limitation of the voxelgram. If more than 5 SLDs are present (solvent does not count), then the extra ones are not displayed. Also modified KR-3Cyl procedures to be able to save/import a table of coordinates.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf (modified) (6 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf

@@ -247 +247 @@
         Button button14,pos={488,350},size={120,20},proc=Stream_LoadDecim,title="Load Split List"
         Button button19,pos={619,350},size={120,20},proc=Stream_LoadAdjustedList,title="Load Edited List"
+        Button button20,pos={650,376},size={90,20},proc=ShowList_ToLoad,title="Show List"
         SetVariable setvar3,pos={487,378},size={150,16},title="Decimation factor"
         SetVariable setvar3,fSize=10
@@ -1108 +1109 @@
                 
         SetDataFolder root:Packages:NIST:Event
+        
+        Wave slicedData = slicedData
+        Wave logSlicedData = logSlicedData
+        Wave dispSliceData = dispSliceData
+        
         if(checked)
+                logslicedData = log(slicedData)
                 Duplicate/O logslicedData dispsliceData
         else
@@ -2371 +2378 @@
                         
                         // load in the waves, saved as Igor text to preserve the data type
-                        LoadWave/T/O
+                        LoadWave/T/O/P=catPathName
                         filePathStr = S_fileName
                         if(strlen(S_fileName) == 0)
@@ -2983 +2990 @@
         SVAR str = root:Packages:NIST:Event:gSplitFileList
         
-        Make/O/T/N=1 root:Packages:NIST:Event:SplitFileWave
-        WAVE tw = root:Packages:NIST:Event:SplitFileWave
-        
+        WAVE/T/Z tw = root:Packages:NIST:Event:SplitFileWave
+        if(waveExists(tw) != 1) 
+                Make/O/T/N=1 root:Packages:NIST:Event:SplitFileWave
+                WAVE/T/Z tw = root:Packages:NIST:Event:SplitFileWave
+        endif
+
         List2TextWave(str,tw)
         Edit tw
@@ -3038 +3048 @@
                 case 2:
                         DoAlert 0,"The accumulated data is now the display data and is ready for display or export."
-                        Duplicate/O accumulatedData slicedData          
+                        Duplicate/O accumulatedData slicedData
+                        // do something to "touch" the display to force it to update
+                        NVAR gLog = root:Packages:NIST:Event:gEvent_logint
+                        LogIntEvent_Proc("",gLog)
                         break
                 default:                        
@@ -3367 +3380 @@
 End
 
+Function ShowList_ToLoad(ctrlName)
+        String ctrlName
+        
+        ShowSplitFileTable()
+        
+        return(0)
+End