Changeset 74 for sans/SANSReduction/branches

Timestamp:

Apr 5, 2007 5:06:48 PM (16 years ago)

Author:

srkline

Message:

More changes to move NCNR calls from the main section of code. Transmission is the current sticking point.

Location:

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00

Files:

• CatVSTable.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (2 diffs)
• NSORT.ipf (modified) (1 diff)
• Transmission.ipf (modified) (3 diffs)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/CatVSTable.ipf

@@ -315 +315 @@
         // 0 if the file is a scattering  file, 1 (truth) if the file is a transmission file
         InsertPoints lastPoint,1,GIsTrans
-        GIsTrans[lastPoint]  = CheckIfBeamstopOut(fname, -5)            //returns one if beamstop is "out"
+        GIsTrans[lastPoint]  = isTransFile(fname, -5)           //returns one if beamstop is "out"
         
         return(0)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/NCNR_Utils.ipf

@@ -393 +393 @@
         totalBytes = V_logEOF
         //Print totalBytes
-        if(totalBytes!=33316)
-                //can't possibly be a raw data file
-                Close refnum
-                return(0)               //not a raw SANS file
-        Endif
         FSetPos refNum,75
         FReadLine/N=3 refNum,testStr
         Close refNum
         
-        if(cmpstr(testStr,"RAW")==0)
+        if(totalBytes == 33316 && cmpstr(testStr,"RAW")==0)
                 //true, is raw data file
                 Return(1)
@@ -410 +405 @@
         Endif
 End
+
+
+
+//function to check the header of a raw data file (full path specified by fname)
+//checks the field of the x-position of the beamstop during data collection
+//if the x-position is more negative (farther to the left) than xTol(input)
+//the the beamstop is "out" and the file is a transmission run and not a scattering run
+//xtol typically set at -5 (cm) - trans runs have bs(x) at -10 to -15 cm 
+// function returns 1 if beamstop is out, 0 if beamstop is in
+//
+Function isTransFile(fName,xTol)
+        String fname
+        Variable xTol
+        
+        Variable refnum,xpos
+        //pos = 369, read one real value
+        
+        SetDataFolder root:
+        String GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q"
+        String strToExecute=""
+        // 1 R*4 value
+        strToExecute = GBLoadStr + "/S=368/U=1" + "\"" + fname + "\""
+        Execute strToExecute
+        Wave w=$"root:tempGBWave0"
+        xPos = w[0]
+        KillWaves/Z w
+        //Print "xPos = ",xpos
+        
+        if(xpos<=xTol)
+                //xpos is farther left (more negative) than xtol (currently -5 cm)
+                Return(1)
+        else
+                //some other file
+                Return(0)
+        Endif
+End
+
 
 //function to remove all spaces from names when searching for filenames

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

@@ -1781 +1781 @@
         // 0 if the file is a scattering  file, 1 (truth) if the file is a transmission file
         InsertPoints lastPoint,1,GIsTrans
-        GIsTrans[lastPoint]  = CheckIfBeamstopOut(fname, -5)            //returns one if beamstop is "out"
+        GIsTrans[lastPoint]  = isTransFile(fname, -5)           //returns one if beamstop is "out"
         
         KillWaves/Z w

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Transmission.ipf

@@ -256 +256 @@
         Variable lastPoint, beamstop, Whole
 
-        isTrans = CheckIfBeamstopOut(fname, xTol)
+        isTrans = isTransFile(fname, xTol)
         // decalre the correct set of waves
         // S_Whole is only a place holder so the waves are of equal length
@@ -1655 +1655 @@
 
 
-//function to check the header of a raw data file (full path specified by fname)
-//checks the field of the x-position of the beamstop during data collection
-//if the x-position is more negatice (farther to the left) than xTol(input)
-//the the beamstop is "out" and the file is a transmission run and not a scattering run
-//xtol typically set at -5 (cm) - trans runs have bs(x) at -10 to -15 cm 
-// function returns 1 if beamstop is out, 0 if beamstop is in
-//
-Function CheckIfBeamstopOut(fName,xTol)
-        String fname
-        Variable xTol
-        
-        Variable refnum,xpos
-        //pos = 369, read one real value
-        
-        SetDataFolder root:
-        String GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q"
-        String strToExecute=""
-        // 1 R*4 value
-        strToExecute = GBLoadStr + "/S=368/U=1" + "\"" + fname + "\""
-        Execute strToExecute
-        Wave w=$"root:tempGBWave0"
-        xPos = w[0]
-        KillWaves/Z w
-        //Print "xPos = ",xpos
-        
-        if(xpos<=xTol)
-                //xpos is farther left (more negative) than xtol (currently -5 cm)
-                Return(1)
-        else
-                //some other file
-                Return(0)
-        Endif
-End
-
 //function to update the box coordinates of the file selected as the 
 //empty beam file - takes the file that is currently popped from the list
@@ -1713 +1679 @@
         
         Variable refnum,x1,x2,y1,y2,err
-        Open/R refnum as filename
-        FSetPos refnum,478
-        FBinRead/F=3/B=3 refnum, x1
-        FBinRead/F=3/B=3 refnum, x2
-        FBinRead/F=3/B=3 refnum, y1
-        FBinRead/F=3/B=3 refnum, y2
-        Close refnum
-        
+        GetXYBoxFromFile(filename,x1,x2,y1,y2)
+                
         //and update the global string
         String msgStr=""