-                      r9624cda
+                      r4b30118
         """
         out = numpy.empty(0)
         #s = time.time()
+        s = time.time()
         for ind in range(len(input[0])):
             if self.is_avg:
 …
                 outi = self.model.runXY(inputi)
                 out = numpy.append(out, outi)
         #print time.time() - s
+        print time.time() - s
         if self.is_avg or self.is_avg == None:
             self._draw1D(out)
 …
         media = calmedia.get_data_path(media='media')
         path = os.path.join(media,"gen_sans_help.html")
+        name = "Polarization Angle"
+        frame = HelpWindow(self, -1, title=' Help: Polarization Angle',
+        name = "Generic Scattering Calculator"
+        frame = HelpWindow(self, -1,
+                           title=' Help: GenSANS',
                            pageToOpen=path, size=(865, 450))
         try:
 …
             frame.lpanel.Hide()
             frame.Show(True)
+            add_icon(self.parent, frame)
         except:
             frame.Destroy()

calculatorview/src/sans/perspectives/calculator/media/gen_sans_help.html

-                      rafcb052
+                      r4b30118
 <body>
+<h4>Polarization and Magnetic Scattering</h4>
+<h4>Generic Scattering Calculator:</h4>
+Polarization and Magnetic Scattering
+<br>
+<br>
 <ul>
 <li><a href="#theory">Theory:</a></li>
 <li><a href="#gui">GUI</a></li>
+<li><a href="#pdb">PDB Data</a></li>
 </ul>
+<br>
 <br>
 <b>1. <a name="theory">Theory</a> </b>
 …
 *Note III: For the nuclear scattering length density, only the real component is taken account.
 <br>
+<br>
+<b>3. <a name="pdb">PDB Data</a> </b>
+<br>
+This Generic scattering calculator also supports some pdb files without considering polarized/magnetic scattering
+ so that the related parameters such as Up_*** will be ignored (see the Picture below). The calculation for fixed orientation uses (the first) Equation above resulting
+in a 2D output, whileas the scattering calculation averaged over all the orientations uses the Debye equation providing a 1D output:
+ <p>
+<img src="gen_debye_eq.gif"/>
+</p>
+<br>
+where v<sub>j</sub>&#946;<sub>j</sub> &#8801; b<sub>j</sub> is the scattering length of the j'th atom.
+The resultant outputs will be displayed in the DataExporer for further uses.
+<br>
+ <p>
+<img src="pdb_combo.jpg"/>
+</p>
 </body>

Note: See TracChangeset for help on using the changeset viewer.

SasView