Changeset 857 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Jul 6, 2012 5:29:38 PM (11 years ago)

Author:

srkline

Message:

Added support for reading 4-column data into the 2D reader

Calculation of kappa for ABS now does a specific byte check for ensuring a "good" DIV file. hopefully this will eliminate errors where incorrect DIV files are selected and bad kappa values are generated - and the program thinks (incorrectly) that there is a valid DVI file present, when there really isn't one (and then there is no easy recovery from this)

Added CheckIfDIVData() functions to NCNR_Utils and to FACILITY_Utils, and to other (facility)_Utils

Changed the calls to writing BT5 files after adding so that it could be more easily scripted in the future.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• ANSTO_Utils.ipf (modified) (1 diff)
• FACILITY_Utils.ipf (modified) (1 diff)
• ILL_Utils.ipf (modified) (1 diff)
• KIST_Utils.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (1 diff)
• ProtocolAsPanel.ipf (modified) (1 diff)

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

@@ -396 +396 @@
 End
 
+
+//function to test a file to see if it is a DIV file
+//
+// returns truth 0/1
+//
+// called by many procedures (both external and local)
+//
+Function CheckIfDIVData(fname)
+        String fname
+        
+
+//      if(your test here)
+//              //true, is DIV data file
+                Return(1)
+//      else
+//              //some other file
+//              Return(0)
+//      Endif
+
+End
+
 Function isScatFile(fname)
         String fname

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

@@ -259 +259 @@
 //      if(your test here)
 //              //true, is raw data file
+//              Return(1)
+//      else
+//              //some other file
+//              Return(0)
+//      Endif
+
+End
+
+//function to test a file to see if it is a DIV file
+//
+// returns truth 0/1
+//
+// called by many procedures (both external and local)
+//
+Function CheckIfDIVData(fname)
+        String fname
+        
+
+//      if(your test here)
+//              //true, is DIV data file
 //              Return(1)
 //      else

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

@@ -450 +450 @@
 End
 
+//function to test a file to see if it is a DIV file
+//
+// returns truth 0/1
+//
+// called by many procedures (both external and local)
+//
+Function CheckIfDIVData(fname)
+        String fname
+        
+
+//      if(your test here)
+//              //true, is DIV file data file
+                Return(1)
+//      else
+//              //some other file
+//              Return(0)
+//      Endif
+
+End
 
 // function returns 1 if file is a transmission file, 0 if not

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

@@ -267 +267 @@
 End
 
+//function to test a file to see if it is a DIV file
+//
+// returns truth 0/1
+//
+// called by many procedures (both external and local)
+//
+Function CheckIfDIVData(fname)
+        String fname
+        
+
+//      if(your test here)
+//              //true, is DIV data file
+//              Return(1)
+//      else
+//              //some other file
+//              Return(0)
+//      Endif
+
+End
 
 // function returns 1 if file is a transmission file, 0 if not

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

@@ -831 +831 @@
                 Return(0)
         Endif
+End
+
+//function to test a file to see if it is a DIV file
+//
+// returns truth 0/1
+//
+// called by many procedures (both external and local)
+//
+Function CheckIfDIVData(fname)
+        String fname
+        
+
+        Variable refnum,totalBytes
+//      String testStr=""
+        
+        Open/R/T="????TEXT" refNum as fname
+        if(strlen(s_filename) == 0)     //user cancel (/Z not used, so V_flag not set)
+                return(0)
+        endif
+        
+        //get the total number of bytes in the file
+        FStatus refNum
+        totalBytes = V_logEOF
+        //Print totalBytes
+        if(totalBytes < 100)
+                Close refNum
+                return(0)               //not a raw file
+        endif
+//      FSetPos refNum,75
+//      FReadLine/N=3 refNum,testStr
+        Close refNum
+        
+        if(totalBytes == 66116)         // && ( cmpstr(testStr,"RAW")==0 ||  cmpstr(testStr,"SIM")==0))
+                //true, is raw data file
+                Return(1)
+        else
+                //some other file
+                Return(0)
+        Endif
+
 End
 

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

@@ -2109 +2109 @@
                         endif
 #else
-                        if(strlen(junkStr)==0 || CheckIfRawData(junkStr))               //for NCNR, not raw is sufficient, but better in the future to confirm it is DIV if either is false, exit
+                        if(strlen(junkStr)==0 || !CheckIfDIVData(junkStr))              //for NCNR, and other data confirm it is DIV if either is false, exit
                                 SetDataFolder root:
                                 Abort "No DIV (PLEX) file selected. Please use setABSParams again, selecting the empty beam file and then the detector sensitivity (Plex_) file"