Changeset 2151

Timestamp:

Feb 16, 2016 4:19:48 PM (8 years ago)

Author:

vondreele

Message:

add Generic TOF to defaultIparms.py; forces user to set flight path & 2-theta
modify instparm reading to sort out multibank issues
add MultiFloatDialog? to solicit multi values from user

Location:

trunk

Files:

• GSASII.py (modified) (6 diffs)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• defaultIparms.py (modified) (1 diff)

trunk/GSASII.py

@@ -1234 +1234 @@
             returns: dict: Instrument parameter dictionary
             '''       
+            sind = lambda x: math.sin(x*math.pi/180.)
+            tand = lambda x: math.tan(x*math.pi/180.)
             import defaultIparms as dI
             while True: # loop until we get a choice
@@ -1241 +1243 @@
                 for l in dI.defaultIparm_lbl:
                     choices.append('Defaults for '+l)
-                res = rd.BlockSelector(
-                    choices,
-                    ParentFrame=self,
-                    title=head,
-                    header='Select default inst parms',
-                    useCancel=False)
+                res = rd.BlockSelector(choices,ParentFrame=self,title=head,
+                    header='Select default inst parms',useCancel=False)
                 if res is None: continue
                 rd.instfile = ''
-                rd.instmsg = 'default: '+dI.defaultIparm_lbl[res]
-                return self.ReadPowderInstprm(dI.defaultIparms[res],bank)    #this is [Inst1,Inst2] a pair of dicts
+                if 'Generic' in choices[res]:
+                    dlg = G2G.MultiFloatDialog(self,title='Generic TOF detector bank',
+                        prompts=['Total FP','2-theta',],values=[25.0,150.,],
+                            limits=[[6.,200.],[5.,175.],],formats=['%6.2f','%6.1f',])
+                    if dlg.ShowModal() == wx.ID_OK:
+                        FP,tth = dlg.GetValues()
+                        difC = 252.816*2.*FP*sind(tth/2.)
+                        sig1 = 50.+2.5e-6*(difC/tand(tth/2.))**2
+                        rd.instmsg = 'default: '+dI.defaultIparm_lbl[res]
+                        Inst = self.ReadPowderInstprm(dI.defaultIparms[res],bank)
+                        Inst[0]['difC'] = [difC,difC,0]
+                        Inst[0]['sig-1'] = [sig1,sig1,0]
+                        return Inst    #this is [Inst1,Inst2] a pair of dicts
+                    dlg.Destroy()
+                else:
+                    rd.instmsg = 'default: '+dI.defaultIparm_lbl[res]
+                    return self.ReadPowderInstprm(dI.defaultIparms[res],bank)    #this is [Inst1,Inst2] a pair of dicts
 
         # stuff we might need from the reader
@@ -1260 +1273 @@
         basename = os.path.splitext(filename)[0]
         for ext in '.instprm','.prm','.inst','.ins':
-            instfile = basename + ext
+            if self.zipfile:
+                instfile = G2IO.ExtractFileFromZip(self.zipfile,
+                    selection=os.path.split(basename + ext)[1],parent=self)
+            else:
+                instfile = basename + ext
             if not os.path.exists(instfile):
                 continue
@@ -1293 +1310 @@
                 # for multiple reads of one data file, reuse the inst parm file
                 instfile = lastIparmfile
+            if self.zipfile:
+                instfile = G2IO.ExtractFileFromZip(self.zipfile,
+                    selection=os.path.split(instfile)[1],parent=self)
             if os.path.exists(instfile):
                 #print 'debug: try read',instfile
@@ -1316 +1336 @@
                 self.ErrorDialog('Open Error','Error opening instrument parameter file '
                     +str(instfile)+' requested by file '+ filename)
-        # did we read the data file from a zip? If so, look there for a
-        # instrument parameter file
-        if self.zipfile:
-            for ext in '.instprm','.prm','.inst','.ins':
-                instfile = G2IO.ExtractFileFromZip(self.zipfile,
-                    selection=os.path.split(basename + ext)[1],parent=self)
-                if instfile is not None and instfile != self.zipfile:
-                    print 'debug:',instfile,'created from ',self.zipfile
-                    Lines = self.OpenPowderInstprm(instfile)
-                    instParmList = None
-                    if Lines is not None:
-                        instParmList = self.ReadPowderInstprm(Lines,bank)    #this is [Inst1,Inst2] a pair of dicts
-                    if 'dict' in str(type(instParmList)):
-                        rd.instfile = instfile
-                        rd.instmsg = 'GSAS-II file '+instfile
-                        return instParmList
-                    else:
-                        rd.instmsg = instParmList   #an error message
-                        print 'three',instParmList
-                        return GetDefaultParms(self,rd)
-                    Iparm = self.ReadPowderIparm(instfile,bank,numbanks,rd)
-                    if Iparm:
-                        rd.instfile = instfile
-                        rd.instmsg = instfile + ' bank ' + str(rd.instbank)
-                        return SetPowderInstParms(Iparm,rd)
-                    else:
-                        #print 'debug: open/read for',instfile,'from',self.zipfile,'failed'
-                        pass # fail silently
-
+#        # did we read the data file from a zip? If so, look there for a
+#        # instrument parameter file
+#        if self.zipfile:
+#            for ext in '.instprm','.prm','.inst','.ins':
+#                instfile = G2IO.ExtractFileFromZip(self.zipfile,
+#                    selection=os.path.split(basename + ext)[1],parent=self)
+#                if instfile is not None and instfile != self.zipfile:
+#                    print 'debug:',instfile,'created from ',self.zipfile
+#                    Lines = self.OpenPowderInstprm(instfile)
+#                    instParmList = None
+#                    if Lines is not None:
+#                        instParmList = self.ReadPowderInstprm(Lines,bank)    #this is [Inst1,Inst2] a pair of dicts
+#                    if 'dict' in str(type(instParmList)):
+#                        rd.instfile = instfile
+#                        rd.instmsg = 'GSAS-II file '+instfile
+#                        return instParmList
+#                    else:
+#                        rd.instmsg = instParmList   #an error message
+#                        print 'three',instParmList
+#                        return GetDefaultParms(self,rd)
+#                    Iparm = self.ReadPowderIparm(instfile,bank,numbanks,rd)
+#                    if Iparm:
+#                        rd.instfile = instfile
+#                        rd.instmsg = instfile + ' bank ' + str(rd.instbank)
+#                        return SetPowderInstParms(Iparm,rd)
+#                    else:
+#                        #print 'debug: open/read for',instfile,'from',self.zipfile,'failed'
+#                        pass # fail silently
+#
+        #Finally - ask user for Instrument parametrs file - seems it can't be in a zip file
         while True: # loop until we get a file that works or we get a cancel
             instfile = ''
             pth = G2G.GetImportPath(self)
             if not pth: pth = '.'
-            dlg = wx.FileDialog(
-                self,
+            dlg = wx.FileDialog(self,
                 'Choose inst. param file for "'+rd.idstring+'" (or Cancel for default)',
                 pth, '',
@@ -1365 +1385 @@
             if 'instprm' in instfile:
                 Lines = self.OpenPowderInstprm(instfile)
-                print instfile,bank
                 if Lines is not None:
                     instParmList = self.ReadPowderInstprm(Lines,bank)    #this is [Inst1,Inst2] a pair of dicts

trunk/GSASIIctrls.py

@@ -1924 +1924 @@
     def GetValue(self):
         return self.value
+        
+    def OnOk(self,event):
+        parent = self.GetParent()
+        parent.Raise()
+        self.EndModal(wx.ID_OK)              
+        
+    def OnCancel(self,event):
+        parent = self.GetParent()
+        parent.Raise()
+        self.EndModal(wx.ID_CANCEL)
+
+################################################################################
+class MultiFloatDialog(wx.Dialog):
+    'Dialog to obtain a multi float value from user'
+    def __init__(self,parent,title,prompts,values,limits=[[0.,1.],],formats=['%.5g',]):
+        wx.Dialog.__init__(self,parent,-1,title, 
+            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
+        self.panel = wx.Panel(self)         #just a dummy - gets destroyed in Draw!
+        self.limits = limits
+        self.values = values
+        self.prompts = prompts
+        self.formats = formats
+        self.Draw()
+        
+    def Draw(self):
+        
+        def OnValItem(event):
+            Obj = event.GetEventObject()
+            id,limits,format = Indx[Obj]
+            try:
+                val = float(Obj.GetValue())
+                if val < limits[0] or val > limits[1]:
+                    raise ValueError
+            except ValueError:
+                val = self.values[id]
+            self.values[id] = val
+            Obj.SetValue(format%(val))
+            
+        Indx = {}
+        self.panel.Destroy()
+        self.panel = wx.Panel(self)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        lineSizer = wx.FlexGridSizer(0,2,5,5)
+        for id,[prompt,value,limits,format] in enumerate(zip(self.prompts,self.values,self.limits,self.formats)):
+            lineSizer.Add(wx.StaticText(self.panel,label=prompt),0,wx.ALIGN_CENTER)
+            valItem = wx.TextCtrl(self.panel,value=format%(value),style=wx.TE_PROCESS_ENTER)
+            Indx[valItem] = [id,limits,format]
+            lineSizer.Add(valItem,0,wx.ALIGN_CENTER)
+            valItem.Bind(wx.EVT_TEXT_ENTER,OnValItem)
+            valItem.Bind(wx.EVT_KILL_FOCUS,OnValItem)
+        mainSizer.Add(lineSizer)
+        OkBtn = wx.Button(self.panel,-1,"Ok")
+        OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
+        CancelBtn = wx.Button(self.panel,-1,'Cancel')
+        CancelBtn.Bind(wx.EVT_BUTTON, self.OnCancel)
+        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+        btnSizer.Add((20,20),1)
+        btnSizer.Add(OkBtn)
+        btnSizer.Add(CancelBtn)
+        btnSizer.Add((20,20),1)
+        mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        self.panel.SetSizer(mainSizer)
+        self.panel.Fit()
+        self.Fit()
+
+    def GetValues(self):
+        return self.values
         
     def OnOk(self,event):

trunk/GSASIIpwdGUI.py

@@ -1182 +1182 @@
     data tree item.
     '''
-#patch
-    if 'Bank' not in data:  #get it from name
+    if 'Bank' not in data:  #get it from name; absent for default parms selection 
         hst = G2frame.PatternTree.GetItemText(G2frame.PatternId)
         if 'Bank' in hst:
-            bank = int(hst.split('Bank')[1])
+            bank = int(hst.split('Bank')[1].split('_')[0])
             data['Bank'] = [bank,bank,0]
         else:
             data['Bank'] = [1,1,0]
-#end patch    
+
     def keycheck(keys):
         good = []

trunk/defaultIparms.py

@@ -103 +103 @@
     'X:-1.80259010604;Y:4.47209435997\n',
 ])
+
+defaultIparm_lbl.append('Generic TOF')
+defaultIparms.append([
+    '#GSAS-II instrument parameter file for Generic TOF\n',
+    'Type:PNT;fltPath:25.0;2-theta:150.;Azimuth:0.0\n',
+    'Zero:0.;difC:9000.;difA:0.;difB:0.\n',
+    'alpha:1.0\n',
+    'beta-0:0.;beta-1:0.005;beta-q:0.0\n',
+    'sig-0:0.;sig-1:-50.;sig-2:0.;sig-q:0.0\n',
+    'X:0.;Y:0.\n',
+])