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

Timestamp:

Oct 25, 2010 2:30:27 PM (12 years ago)

Author:

srkline

Message:

Fixed bug re-introduced by using the global ASCII code for Angstrom. Now it will use a default "A" if the global does not exist, rather than throwin up an error.

For 2D MC simulation, now if the data was scaled to ABS, the 2D data is "un-scaled" back to raw counts before saving as VAX format. A few counts may be lost here and there during the conversion, but less than 0.01% in my limited testing.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• AvgGraphics.ipf (modified) (2 diffs)
• Marquee.ipf (modified) (1 diff)
• MultScatter_MonteCarlo_2D.ipf (modified) (2 diffs)
• NCNR_DataReadWrite.ipf (modified) (4 diffs)
• SASCALC.ipf (modified) (1 diff)
• Subtract_1D.ipf (modified) (1 diff)

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

@@ -990 +990 @@
                 Label bottom "Angle (deg)"
         else
-                SVAR angst = root:Packages:NIST:gAngstStr
+                SVAR/Z angst = root:Packages:NIST:gAngstStr
                 Label bottom "q ("+angst+"\\S-1\\M)"
         Endif
@@ -1179 +1179 @@
         
         //check for proper x-scaling selection
-        SVAR angst = root:Packages:NIST:gAngstStr 
+        SVAR/Z angst = root:Packages:NIST:gAngstStr 
         String dum
         

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

@@ -264 +264 @@
                 ModifyGraph lowTrip=1e-04
                 ModifyImage data cindex=$"root:myGlobals:NIHColors"
-                SVAR angst = root:Packages:NIST:gAngstStr
+                SVAR/Z angst = root:Packages:NIST:gAngstStr
                 Label bottom "Qx ("+angst+"\\S-1\\M)"
                 Label left "Qy ("+angst+"\\S-1\\M)"

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

@@ -1144 +1144 @@
 // currently hard-wired for SAS data folder
 //
+// A later call to Write_VAXRaw_Data() will check for the simulation data, and 
+// convert ABS simulated data to raw counts if necessary
+//
 Function SaveAsVAXButtonProc(ctrlName,[runIndex,simLabel])
         String ctrlName
@@ -1153 +1156 @@
         // the easy answer is to abort, but I possibly could unscale the data and get back to integer
         // counts.
-        NVAR isRAW = root:Packages:NIST:SAS:gRawCounts
-        if(! isRAW)
-                Abort "The simulation must be in RAW counts for it to be saved as RAW VAX format"
-        endif
+        // A later call to Write_VAXRaw_Data() will check for the simulation data, and 
+        // convert ABS simulated data to raw counts if necessary
+//      NVAR isRAW = root:Packages:NIST:SAS:gRawCounts
+//      if(!isRAW)
+//              Abort "The simulation must be in RAW counts for it to be saved as RAW VAX format"
+//      endif
         
         // if default parameters were passed in, use them

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

@@ -1929 +1929 @@
         WAVE rw=realsRead
         WAVE/T textw=textRead
-        WAVE data=linear_data
+        
+        WAVE linear_data = linear_data
+        Duplicate/O linear_data tmp_data
+                
+        NVAR/Z rawCts = root:Packages:NIST:SAS:gRawCounts
+        if(cmpstr("SAS",type)==0 && !rawCts)            //simulation data, and is not RAW counts, so scale it back
+
+                //use kappa to get back to counts => linear_data = round(linear_data*kappa)
+                String strNote = note(linear_data) 
+                Variable kappa = NumberByKey("KAPPA", strNote , "=", ";")
+                NVAR detectorEff = root:Packages:NIST:SAS:g_detectorEff
+
+                tmp_data *= kappa
+                tmp_data *= detectorEff
+//              Print kappa, detectorEff
+                Redimension/I tmp_data
+        endif
+        
+        WAVE w=tmp_data
+
         
         //check each wave
@@ -1941 +1960 @@
                 Abort "textw DNExist WriteVAXData()"
         Endif
-        If(!(WaveExists(data)))
+        If(!(WaveExists(w)))
                 Abort "linear_data DNExist WriteVAXData()"
         Endif
@@ -1971 +1990 @@
         
         Make/O/W/N=16401 dataWRecMarkers
-        AddRecordMarkers(data,dataWRecMarkers)
+        AddRecordMarkers(w,dataWRecMarkers)
         
         // need to re-compress?? maybe never a problem, but should be done for the odd case
@@ -2252 +2271 @@
         
         // all done
-        Killwaves/Z tmpFile,dataWRecMarkers
+        Killwaves/Z tmpFile,dataWRecMarkers,tmp_data
         
         Print "Saved VAX binary data as:  ",textW[0]

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

@@ -1619 +1619 @@
         NVAR instrument = instrument
         NVAR L2diff = L2diff
-        NVAR lens = root:Packages:NIST:SAS:gUsingLenses
-        SVAR aStr = root:Packages:NIST:gAngstStr
+   NVAR lens = root:Packages:NIST:SAS:gUsingLenses
+        SVAR/Z aStr = root:Packages:NIST:gAngstStr
         
         sprintf temp,"Source Aperture Diameter =\t\t%6.2f cm\r",sourceApertureDiam()

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

@@ -321 +321 @@
         ShowInfo
         Label left "Sample, Solvent I (cm\\S-1\M)"
-        Label bottom "q ("+root:Packages:NIST:gAngstStr+"\\S-1\M)"
+        
+        String angst = StrVarOrDefault("root:Packages:NIST:gAngstStr", "A" )
+        Label bottom "q ("+angst+"\\S-1\M)"
 //      Label right "Result I/cm\\S-1"
         ControlBar 40