Changeset 392 for sans/Dev/trunk/NCNR_User_Procedures/USANS

Timestamp:

Jun 30, 2008 8:49:58 PM (15 years ago)

Author:

srkline

Message:

Changed NCNR_ raw data reader to get the magnetic field strength (actually the voltage) from byte 348, rather than 190.

Added Jan Ilavsky's fixes to all data loaders to accept 2-column data. A fake error is generated for the data set as read in, so the data can be treated as 3-column data from that point.

File:

• sans/Dev/trunk/NCNR_User_Procedures/USANS/PlotUtils_USANS.ipf (modified) (6 diffs)

sans/Dev/trunk/NCNR_User_Procedures/USANS/PlotUtils_USANS.ipf

@@ -13 +13 @@
         LoadWave/G/D/A
         String filename = S_fileName
-        
-        if(V_flag==3)
+        Variable numCols = V_flag
+        
+        //changes JIL
+        if(numCols==2)          //no errors     
+                n1 = StringFromList(1, S_waveNames ,";" )               
+                Duplicate/O $("root:"+n1), errorTmp
+                 errorTmp = 0.01*(errorTmp)+ 0.03*sqrt(errorTmp)
+                S_waveNames+="errorTmp;"
+                numCols=3
+        endif
+        
+        if(numCols==3)
                 String w0,w1,w2,n0,n1,n2,wt
                 Variable rr,gg,bb
@@ -100 +110 @@
         endif
         
-        if(V_flag == 6)
+        if(numCols == 6)
                 String w0,w1,w2,n0,n1,n2,wt
                 String w3,w4,w5,n3,n4,n5                        //3 extra waves to load
@@ -202 +212 @@
         endif
 
-        if(V_flag==5)
+        if(numCols==5)
                 String w0,w1,w2,n0,n1,n2,w3,n3,w4,n4
                 Variable rr,gg,bb
@@ -283 +293 @@
         LoadWave/G/D/A/Q fileStr
         String fileName = S_fileName
-        
-        if(V_flag==3)
+        Variable numCols = V_flag
+        
+        //changes JIL
+        if(numCols==2)          //no errors     
+                n1 = StringFromList(1, S_waveNames ,";" )               
+                Duplicate/O $("root:"+n1), errorTmp
+                 errorTmp = 0.01*(errorTmp)+ 0.03*sqrt(errorTmp)
+                S_waveNames+="errorTmp;"
+                numCols=3
+        endif
+        
+        if(numCols==3)
                 String w0,w1,w2,n0,n1,n2,wt
                 
@@ -327 +347 @@
         endif
         
-        if(V_flag == 6)
+        if(numCols == 6)
                 String w0,w1,w2,n0,n1,n2,wt
                 String w3,w4,w5,n3,n4,n5                        //3 extra waves to load
@@ -385 +405 @@
         endif
 
-        if(V_flag==5)
+        if(numCols==5)
                 String w0,w1,w2,n0,n1,n2,w3,n3,w4,n4
                 Variable rr,gg,bb