Changeset 734 for sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

Timestamp:

Sep 14, 2010 10:22:42 AM (13 years ago)

Author:

srkline

Message:

Fixed bug in maunUSANS panel where clicking in white space in the file list threw up an open file dialog.

ticket #292: 1D arithmetic panel now properly writes out USANS data, switching to fill in the USANS fields if the USANS_dQv variable is found. Otherwise it is treated as SANS data.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

@@ -1442 +1442 @@
         //If we are here, the folder (now) exists and the user has agreed to overwrite
         //either in the function call or from the alert.
+        
+        // here, GetIndexedObjectName copies all of the waves
+        index = 0
         do
                 objName = GetIndexedObjName(basestr,1,index)
@@ -1451 +1454 @@
                 index+=1
         while(1)
+
+// -- for USANS data, we need the slit height. copy all of the "USANS_*" variables
+// may need to augment this for other situations
+        index = 0
+        do
+                objName = GetIndexedObjName(basestr,2,index)
+                if (strlen(objName) == 0)
+                        break
+                endif
+                if(stringmatch(objName,"USANS*") == 1)
+                        objname = ":"+basestr+":"+objname
+                        NVAR tmp = $objName
+                        Variable/G $(ReplaceString(basestr,objName,newName))= tmp
+                endif
+                index+=1
+        while(1)
+        
 
         SetDataFolder root: