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

Timestamp:

Jun 1, 2011 11:30:33 AM (12 years ago)

Author:

srkline

Message:

Smear_2D procedures to plot resolution function at each pixel have been improved, and to integrate the resolution to check that it normalizes to 1.

+ other minor tweaks to convert VAX time and to clean up list behavior.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• Initialize.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (2 diffs)

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

@@ -63 +63 @@
                 Main_Panel()
         Endif
-        ResizeCmdWindow()
+//      ResizeCmdWindow()
         
         //unload the NCNR_Package_Loader, if NCNR not defined

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

@@ -520 +520 @@
 //      print yr,mon,day
         time_secs = date2secs(yr,mon,day)
+
+        return(time_secs)
+end
+
+// dd-mon-yyyy hh:mm:ss -> seconds
+// the VAX uses 24 hr time for hh
+//
+Function ConvertVAXDateTime2secs(dateAndTime)
+        string dateAndTime
+        
+        Variable day,yr,mon,hh,mm,ss,time_secs
+        string str,monStr
+        
+        str=dateandtime
+        sscanf str,"%d-%3s-%4d %d:%d:%d",day,monStr,yr,hh,mm,ss
+        mon = monStr2num(monStr)
+//      print yr,mon,day,hh,mm,ss
+        time_secs = date2secs(yr,mon,day)
+        time_secs += hh*3600 + mm*60 + ss
+
 
         return(time_secs)
@@ -1501 +1521 @@
 End
 
+// a utility function so that I can get the values from the command line
+// since the atten_err is PBR
+//
+Function PrintAttenuation(instr,lam,attenNo)
+        String instr
+        Variable lam,attenNo
+        
+        Variable atten_err, attenFactor
+        
+        strswitch(instr)
+                case "NG3":
+                        attenFactor = LookupAttenNG3(lam,attenNo,atten_err)
+                        break
+                case "NG5":
+                        //using NG7 lookup Table
+                        attenFactor = LookupAttenNG7(lam,attenNo,atten_err)
+                        break
+                case "NG7":
+                        attenFactor = LookupAttenNG7(lam,attenNo,atten_err)
+                        break
+                default:                                                        
+                        //return error?
+                        attenFactor=1
+        endswitch
+
+        Print "atten, err = ", attenFactor, atten_err
+        
+        return(0)
+End
+
+
+
 //returns the proper attenuation factor based on the instrument (NG3, NG5, or NG7)
 //NG5 values are taken from the NG7 tables (there is very little difference in the