Changeset 4409 for trunk

Timestamp:

Apr 23, 2020 5:53:38 PM (3 years ago)

Author:

toby

Message:

select bank for scripting simulation

File:

• trunk/GSASIIscriptable.py (modified) (4 diffs)

trunk/GSASIIscriptable.py

@@ -2120 +2120 @@
         
     def add_simulated_powder_histogram(self, histname, iparams, Tmin, Tmax, Tstep,
-                                       wavelength=None, scale=None, phases=[]):
+                                       wavelength=None, scale=None, phases=[], ibank=None):
         """Loads a powder data histogram into the project.
 
@@ -2131 +2131 @@
         :param str histname: A name for the histogram to be created.
         :param str iparams: The instrument parameters file, a filename.
-        :param float Tmin: Minimum 2theta or TOF (ms) for dataset to be simulated
-        :param float Tmax: Maximum 2theta or TOF (ms) for dataset to be simulated
-        :param float Tstep: Step size in 2theta or TOF (ms) for dataset to be simulated       
+        :param float Tmin: Minimum 2theta or TOF (microsec) for dataset to be simulated
+        :param float Tmax: Maximum 2theta or TOF (usec) for dataset to be simulated
+        :param float Tstep: Step size in 2theta or TOF (usec) for dataset to be simulated       
         :param float wavelength: Wavelength for CW instruments, overriding the value
            in the instrument parameters file if specified.
@@ -2143 +2143 @@
         :param list phases: Phases to link to the new histogram. Use proj.phases() to link to
            all defined phases.
+        :param int ibank: provides a bank number for the instrument parameter file. The 
+           default is None, corresponding to load the first bank.
 
         :returns: A :class:`G2PwdrData` object representing the histogram
@@ -2184 +2186 @@
         Tmax = rd.powderdata[0][-1]
         histname, new_names, pwdrdata = load_pwd_from_reader(rd, iparams,
-                                                            [h.name for h in self.histograms()])
+                                            [h.name for h in self.histograms()],ibank)
         if histname in self.data:
             G2fil.G2Print("Warning - redefining histogram", histname)