Changeset 926 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Dec 2, 2013 1:36:53 PM (9 years ago)

Author:

srkline

Message:

Added utilities to RealSpaceModeling? to allow previously saved matrices to be added together. currently they are strictly added - that is overlapping voxels are added together, which may not be the optimal behavior, but this can be changed as needed.

Also added utility to allow arbitrary rotation of a 3D object. No interpolation is done, so the rotation is lossy. Rotation is applied in xyz order, which can make a difference. Beware.

Documentation to follow (eventually).

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/NCNR_DataReadWrite.ipf (modified) (1 diff)
• USANS/U_CALC.ipf (modified) (2 diffs)

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

@@ -1695 +1695 @@
 
 //////  integer values
-
+// reads 32 bit integer
 Function getIntegerFromHeader(fname,start)
         String fname                            //full path:name

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/U_CALC.ipf

@@ -874 +874 @@
         NVAR omega = root:Packages:NIST:USANS:Globals:U_Sim:gAnalyzerOmega
         
-        if(exists(funcStr) != 0)
+//      if(exists(funcStr) != 0)
+        if(cmpstr(funcStr,"default") != 0)
                 FUNCREF SANSModelAAO_proto func=$("fSmeared"+funcStr)                   //a wrapper for the structure version
                 FUNCREF SANSModelAAO_proto funcUnsmeared=$(funcStr)             //unsmeared
@@ -1301 +1302 @@
         list = SortList(list)
         
+        list = "default;"+ list
         return(list)
 End