Changeset 502

Timestamp:

May 14, 2009 10:24:20 AM (14 years ago)

Author:

srkline

Message:

List of small changes:
Lin_Fits - added I(0) error to one calculation, Need to propagate this to all logical places. (and submit a ticket)
MainPanel? - correctly handle cancel of raw data display
Transmssion - add a "guess" option of a user-supplied "N" characters
Correct - revert back to zero error for beam center mismatch
NCNR_DataRW - add utility to patch monitor counts (comment out of menu later)

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/LinearizedFits/LinearizedFits_v40.ipf (modified) (2 diffs)
• Reduction/SANS/Correct.ipf (modified) (1 diff)
• Reduction/SANS/Includes_v520.ipf (modified) (1 diff)
• Reduction/SANS/MainPanel.ipf (modified) (1 diff)
• Reduction/SANS/NCNR_DataReadWrite.ipf (modified) (1 diff)
• Reduction/SANS/PatchFiles.ipf (modified) (1 diff)
• Reduction/SANS/Transmission.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

@@ -538 +538 @@
         WAVE W_sigma=W_sigma
         String textstr_1,textstr_2,textstr_3 = ""
-        Variable rg,rgerr,minfit,maxfit
+        Variable rg,rgerr,minfit,maxfit,izerr
         
         textstr_1 = "Slope = " + num2str(W_coef[1]) + " ± " + num2str(W_sigma[1])
@@ -574 +574 @@
                 endif
                 If (cmpstr("1/I",ystr) == 0)
-                        textstr_3 = "I(q=0) =  "  + num2str(1/W_coef[0])
+                        izerr = abs(1/W_coef[0] - 1/(W_coef[0]+W_sigma[0]))
+                        textstr_3 = "I(q=0) =  "  + num2str(1/W_coef[0])+" ± " + num2str(izerr)
                         break
                 endif

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

@@ -895 +895 @@
         noadd_mat = 1           //initialize to 1
         
-        If((abs(xshift) >= 0.01) || (abs(yshift) >= 0.01))                      //APR09 - change tolerance to handle ICE "precision"
+        If((xshift != 0) || (yshift != 0))
+//      If((abs(xshift) >= 0.01) || (abs(yshift) >= 0.01))                      //APR09 - loosen tolerance to handle ICE "precision"
                 DoAlert 1,"Do you want to ignore the beam center mismatch?"
                 if(V_flag==1)           //yes -> just go on

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

@@ -107 +107 @@
         "Patch User Account Name"
         "Read User Account Name"
+        "Patch Monitor Count"
+        "Read Monitor Count"
         "-"
         "AddALLToLayout"

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

@@ -30 +30 @@
         String ctrlName
 
-        LoadRawSANSData("Select a Raw SANS data file")
-        UpdateDisplayInformation("RAW")
+        Variable err=   LoadRawSANSData("Select a Raw SANS data file")
+        if(!err)
+                UpdateDisplayInformation("RAW")
+        endif
 End
 

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

@@ -2579 +2579 @@
         return(0)
 End
+
+// May 2009 - SRK
+// Monitor count not written correctly to file from ICE
+
+Proc PatchMonitorCount(firstFile,lastFile,monCtRate)
+        Variable firstFile=1,lastFile=100,monCtRate
+
+        fPatchMonitorCount(firstFile,lastFile,monCtRate)
+
+End
+
+Proc ReadMonitorCount(firstFile,lastFile)
+        Variable firstFile=1,lastFile=100
+        
+        fReadMonitorCount(firstFile,lastFile)
+End
+
+// simple utility to patch the user account name in the file headers
+// pass in the account name as a string
+// lo is the first file number
+// hi is the last file number (inclusive)
+//
+Function fPatchMonitorCount(lo,hi,monCtRate)
+        Variable lo,hi,monCtRate
+        
+        Variable ii,ctTime
+        String file
+        
+        //loop over all files
+        for(ii=lo;ii<=hi;ii+=1)
+                file = FindFileFromRunNumber(ii)
+                if(strlen(file) != 0)
+                        ctTime = getCountTime(file)
+                        WriteMonitorCountToHeader(file,ctTime*monCtRate)                        
+                else
+                        printf "run number %d not found\r",ii
+                endif
+        endfor
+        
+        return(0)
+End
+
+// simple utility to read the user account name stored in the file header
+Function fReadMonitorCount(lo,hi)
+        Variable lo,hi
+        
+        String file
+        Variable ii,monitorCount
+        
+        for(ii=lo;ii<=hi;ii+=1)
+                file = FindFileFromRunNumber(ii)
+                if(strlen(file) != 0)
+                        monitorCount = getMonitorCount(file)
+                        printf "File %d:  Monitor Count = %g\r",ii,monitorCount
+                else
+                        printf "run number %d not found\r",ii
+                endif
+        endfor
+        
+        return(0)
+End

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

@@ -1015 +1015 @@
 
 end
+

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

@@ -1771 +1771 @@
 
         String menuStr=""
+        menuStr += "Guess using N characters;"
         menuStr += "Guess using 3 characters;"
         menuStr += "Guess using 6 characters;"
@@ -1813 +1814 @@
                                                 fGuessTransToScattFiles(24)
                                                 break
+                                        case "Guess using N characters":
+                                                Variable num=10
+                                                Prompt num, "Number of characters"
+                                                DoPrompt "Enter the number of characters to match", num
+                                                if (V_Flag)
+                                                        break   //user cancel, do nothing
+                                                endif
+                                                fGuessTransToScattFiles(num)
+                                                break
                                 endswitch               //on selection
                         endif