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

Timestamp:

Jun 10, 2011 2:03:45 PM (12 years ago)

Author:

srkline

Message:

Initial separation of facility-specific initialization from the USANS reduction procedures. This is being done to enable the KIST-USANS instrument to use the NCNR reduction scheme. KIST will duplicate the .bt5 file structure but use a different extension.

For this, files for KIST have been created for USANS-specifc, and for some SANS-specific procedures that are entangled with the XML writing and with the USANS simulator.

Corresponding changes (new U_NCNR_Utils) have been added for NCNR-specific USANS initialization.

More will need to be done to disentangle the U_CALC, but at a later date. See ticket #334.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/Includes_Facility.ipf (deleted)
• SANS/Includes_KIST.ipf (added)
• SANS/KIST_DataReadWrite.ipf (added)
• SANS/KIST_Utils.ipf (added)
• USANS/BT5_AddFiles.ipf (modified) (4 diffs)
• USANS/BT5_Loader.ipf (modified) (3 diffs)
• USANS/Main_USANS.ipf (modified) (7 diffs)
• USANS/USANS_Includes_v230.ipf (modified) (4 diffs)
• USANS/U_CALC.ipf (modified) (2 diffs)
• USANS/U_KIST_Includes_v230.ipf (added)
• USANS/U_KIST_Utils.ipf (added)
• USANS/U_NCNR_Utils.ipf (added)

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

@@ -751 +751 @@
 Proc SelectFilesToAdd(file1,file2)
         String file1,file2
-        Prompt file1, "First File", popup, BT5FileList("*.bt5*")
-        Prompt file2, "Second File", popup, BT5FileList("*.bt5*")
+        Prompt file1, "First File", popup, BT5FileList("")
+        Prompt file2, "Second File", popup, BT5FileList("")
         
 //      Print file1,file2
@@ -763 +763 @@
         String filter
         
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+        filter = "*"+ext+"*"
         
         //get all the files, then trim the list
@@ -789 +791 @@
         String file1,file2
         
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+
         //load each file into a textWave
         Make/O/T/N=200 tw1,tw2
@@ -893 +897 @@
         
         // write out the final file (=tw3)
-        filen = file1[0,strlen(file1)-5]+"_SUM.bt5"
+        filen = file1[0,strlen(file1)-5]+"_SUM"+ext
         
         if(dialog)

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

@@ -31 +31 @@
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
-        Variable num=200,err=0,refnum
+        Variable num=500,err=0,refnum
         Make/O/D/N=(num) $(USANSFolder+":"+type+":Angle")
         Make/O/D/N=(num) $(USANSFolder+":"+type+":DetCts")
@@ -73 +73 @@
         filedt = filedt[1,(ii-2)]
                 
-        print filedt
-        print BT5Date2Secs(filedt)
-        print date2secs(2010,11,7)
-        
-        if (BT5Date2Secs(filedt) < date2secs(2010,11,7))
-                        MainDeadTime = 4e-5
-                        TransDeadTime = 1.26e-5
-                        //print "Old Dead Times"
-                        //MainDeadTime = 0
-                        //TransDeadTime = 0
-        else
-                        MainDeadTime = 7e-6
-                        TransDeadTime = 1.26e-5
-                        //print "New Dead Times"
-        endif
+//      print filedt
+//      print BT5Date2Secs(filedt)
+//      print date2secs(2010,11,7)
+        
+        USANS_DetectorDeadtime(filedt,MainDeadTime,TransDeadTime)
         
         //skip line 2
@@ -206 +196 @@
         Wave angle = $(USANSFolder+":"+type+":Angle")
         Variable num=numpnts(angle)
-        Variable deg2QConv=5.55e-5              //JGB -- 2/24/01
+//      Variable deg2QConv=5.55e-5              //JGB -- 2/24/01
+        NVAR deg2QConv=root:Packages:NIST:USANS:Globals:MainPanel:deg2QConv
+
         
         Make/O/N=(num) $(USANSFolder+":"+type+":Qvals")

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

@@ -64 +64 @@
                 USANS_Panel()
         Endif
+        
+        DoIgorMenu "Control" "Retrieve All Windows"
+
 End
 
@@ -137 +140 @@
         root:Packages:NIST:USANS:BKG:bkgLevel := root:Packages:NIST:USANS:Globals:MainPanel:gBkgCts
 
-        
-        //INSTRUMENTAL CONSTANTS 
-        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gTheta_H = 3.9e-6            //Darwin FWHM   (pre- NOV 2004)
-        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gTheta_V = 0.014             //Vertical divergence   (pre- NOV 2004)
-        //Variable/G  root:Globals:MainPanel:gDomega = 2.7e-7           //Solid angle of detector (pre- NOV 2004)
-        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDomega = 7.1e-7             //Solid angle of detector (NOV 2004)
-        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDefaultMCR= 1e6             //factor for normalization
-        
-        //Variable/G  root:Globals:MainPanel:gDQv = 0.037               //divergence, in terms of Q (1/A) (pre- NOV 2004)
-        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDQv = 0.117         //divergence, in terms of Q (1/A)  (NOV 2004)
-        //November 2010 - deadtime corrections
-        //Only used in BT5_Loader.ipf and dependent on date, so defined there on each file load.
-
-        String/G root:Packages:NIST:gXMLLoader_Title=""
+// initializes facility specific constants to define the instrument     
+        Init_USANS_Facility()   
 
         //initializes preferences. this includes XML y/n, and SANS Reduction items. 
@@ -859 +850 @@
 // reads directly from disk
 //
-// EXCLUDES all files that do not match "*.bt5*" (not case sensitive)
+// EXCLUDES all files that do not match "*.bt5*" (not case sensitive) (*.ext*)
 //
 // sorts the list to alphabetical order
@@ -869 +860 @@
         
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
 
         String folderStr=""
@@ -893 +885 @@
         //Get the filter and determine the match string required AJJ Sept06
         if (stringmatch(FilterStr,"!"))
-                filter = FilterStr+"*.bt5*"
+                filter = FilterStr+"*"+ext+"*"
         else
-                filter = "*.bt5*"
+                filter = "*"+ext+"*"
         endif
         
@@ -1172 +1164 @@
         
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
-        
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+
         //Prod the web update page
         //This is a horrible kludge that doesn't really work as the 
@@ -1204 +1197 @@
         for(ii=0;ii<num;ii+=1)
                 item = StringFromList(ii, list  ,";")
-                if( stringmatch(item,"*.bt5*") )                //ONLY keep files with ".bt5" in the name (NOT case-sensitive) 
+                if( stringmatch(item,"*"+ext+"*") )             //ONLY keep files with ".bt5" in the name (NOT case-sensitive) 
                         newlist += item + ";"
                 endif

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

@@ -2 +2 @@
 #pragma version=2.20
 #pragma IgorVersion=6.1
+
+
+// to properly set up the template for other facility reduction templates, 
+// function NCNR_USANS() must exist here in the Includes file.
+//
+Function NCNR_USANS()
+        //does nothing but define NCNR_USANS()
+        return(0)
+End
+
 
 //*************
@@ -9 +19 @@
 //
 
+
 #include "BT5_Loader",version >= 2.20   
 #include "COR_Graph",version >= 2.20                    
 #include "Main_USANS",version >= 2.20   
 #include "PlotUtilsMacro_v40",version >= 2.20
-#include "NIST_XML_v40"
+#include "NIST_XML_v40"                                 //cansas file writer
 #include "USANS_SlitSmearing_v40"       
 #include "WriteUSANSData",version >= 2.20       
@@ -21 +32 @@
 #include "GaussUtils_v40"                               //added Oct 2008 for unified file loading
 #include "BT5_AddFiles"                                 //Oct 2009 to add raw data files
+#include "NCNR_Utils"                                   //needed for NIST_XML
+#include "U_NCNR_Utils"                                 //USANS-specific initialization
+
 
 // USANS simulation and required procedures
@@ -29 +43 @@
 #include "NCNR_DataReadWrite"
 #include "SANS_Utilities"
-#include "NCNR_Utils"
 #include "MultipleReduce"
 #include "WriteQIS"

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

@@ -1746 +1746 @@
         NVAR ang2 = $(pathStr+"gAngHigh"+num2str(set))
         NVAR incr = $(pathStr+"gIncr"+num2str(set))
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+
         
         Variable refNum,ii,wavePts,numPts,first,last,ctTime,monCt,transDet
@@ -1768 +1770 @@
         
         // set up some of the strings needed
-        fileStr=nameStr+num2str(num+set)+".bt5"
+        fileStr=nameStr+num2str(num+set)+ext
         dateStr = date()
         ctTime = countingTime[first]