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

Timestamp:

Oct 16, 2014 10:59:26 AM (8 years ago)

Author:

srkline

Message:

Changes to VCALC files, moving detector information into sub-folders in anticipation of the possible folder structure that I will use for the actual data reduction. But purely speculative at this point.

Fixing some typos in other procedures.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• HFIR_Utils.ipf (modified) (1 diff)
• ILL_Utils.ipf (modified) (1 diff)
• Marquee.ipf (modified) (1 diff)
• NCNR_DataReadWrite.ipf (modified) (1 diff)
• NCNR_Utils_HDF5.ipf (modified) (1 diff)

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

@@ -1077 +1077 @@
 End
 
+Function/S GetASCDataFileList()
+        
+        //make sure that path exists
+        PathInfo catPathName
+        if (V_flag == 0)
+                Abort "Folder path does not exist - use Pick Path button on Main Panel"
+        Endif
+        
+        String list=IndexedFile(catPathName,-1,"????")
+        String newList="",item=""
+        Variable num=ItemsInList(list,";"),ii
+        for(ii=0;ii<num;ii+=1)
+                item = StringFromList(ii, list  ,";")
+                if(stringmatch(item,"*.ASC") )
+                        newlist += item + ";"
+                endif
+        endfor
+        
+        newList = SortList(newList,";",0)
+        return(newList)
+End
+
 //**********************
 // 2D resolution function calculation - in terms of X and Y

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

@@ -1052 +1052 @@
 End
 
+Function/S GetASCDataFileList()
+        
+        //make sure that path exists
+        PathInfo catPathName
+        if (V_flag == 0)
+                Abort "Folder path does not exist - use Pick Path button on Main Panel"
+        Endif
+        
+        String list=IndexedFile(catPathName,-1,"????")
+        String newList="",item=""
+        Variable num=ItemsInList(list,";"),ii
+        for(ii=0;ii<num;ii+=1)
+                item = StringFromList(ii, list  ,";")
+                if(stringmatch(item,"*.ASC") )
+                        newlist += item + ";"
+                endif
+        endfor
+        
+        newList = SortList(newList,";",0)
+        return(newList)
+End
+
+
+
 //**********************
 // 2D resolution function calculation - in terms of X and Y

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

@@ -375 +375 @@
         Sort FileID BoxCounts,FileID            //sort the waves, in case the run numbers were entered out of numerical order
         
-        Display /W=(5,44,383,306) BoxCounts vs FileID
-        ModifyGraph mode=4
-        ModifyGraph marker=8
-        ModifyGraph grid=2
-        ModifyGraph mirror=2
-        ErrorBars/T=0 BoxCounts Y,wave=(BoxCount_err,BoxCount_err)
-        Label left "Counts (per 10^8 monitor counts)"
-        Label bottom "Run Number"
-        
+        DoWindow BoxCountGraph
+        if(V_flag == 0)
+                Display /W=(5,44,383,306) BoxCounts vs FileID
+                DoWindow/C BoxCountGraph
+                ModifyGraph mode=4
+                ModifyGraph marker=8
+                ModifyGraph grid=2
+                ModifyGraph mirror=2
+                ErrorBars/T=0 BoxCounts Y,wave=(BoxCount_err,BoxCount_err)
+                Label left "Counts (per 10^8 monitor counts)"
+                Label bottom "Run Number"
+        endif
         return(0)
 End

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

@@ -1367 +1367 @@
         endif
         str = "["+str+"]"
+        
+        if(strlen(str) < 11)            //pad to 11 characters if the account number is only one digit
+                str = PadString(str,11,0x20)
+        endif
+                
         WriteTextToHeader(fname,str,78)
         return(0)

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

@@ -2 +2 @@
 #pragma version=5.0
 #pragma IgorVersion=6.1
+
+//
+// *** modified JUNL2014 to work with HDF5 raw data files.
+//    when finally implemented, be sure to compare with NCNR_Utils.ipf
+//    to pick up any changes there, especially those related to CGB
+//
+//
+//
+//
 
 // this file contains globals and functions that are specific to a