Changeset 301:7bef42595c00 for source/class

Timestamp:

Sep 19, 2011, 6:58:03 PM (13 years ago)

Author:

Evgeny Stambulchik <Evgeny.Stambulchik@…>

Branch:

default

Phase:

public

Message:

Fixed f-b spectral density.

File:

• source/class/pf/Plasma.js (modified) (2 diffs)

source/class/pf/Plasma.js

@@ -181 +181 @@
         {
             var z_i = this.i.getQ();
+            var m_i = this.i.getM();
             var z_r = this.r.getQ();
+            var m_r = this.r.getM();
             var v_e = this.e.getThermalVelocity();
-            var m_r = this.r.getM();
 
             return -8*Math.PI/(3*Math.pow(pf.base.Bohr.c, 3))*v_e*this.e.getN()*
-                (this.i.getN()*z_i*z_i*pf.base.Bohr.bindingEnergy(z_i, m_r, 1) +
+                (this.i.getN()*z_i*z_i*pf.base.Bohr.bindingEnergy(z_i, m_i, 1) +
                  this.r.getN()*z_r*z_r*pf.base.Bohr.bindingEnergy(z_r, m_r, 1))/
                  this.e.getT();
@@ -194 +195 @@
         {
             var photon_en = this.r.getTransitionEnergy();
-            return this.getFreeBoundLosses()/this.e.getT()*
-                Math.exp(-photon_en/this.e.getT());
+            var T_e = this.e.getT();
+            var v_e = this.e.getThermalVelocity();
+            var N_e = this.e.getN();
+            
+            var sum = 0;
+            
+            var sa = [this.i, this.r];
+            for (var i =0; i < sa.length; i++) {
+                var s = sa[i];
+                var N_s = s.getN();
+                if (!N_s) {
+                    continue;
+                }
+                
+                var z_s = s.getQ();
+                var m_s = s.getM();
+                
+                var Eb = -pf.base.Bohr.bindingEnergy(z_s, m_s, 1);
+                
+                if (photon_en < Eb) {
+                    continue;
+                }
+                
+                sum += N_s*z_s*z_s*(Eb/T_e)*Math.exp(-(photon_en - Eb)/T_e);
+            }
+
+            return 8*Math.PI/(3*Math.pow(pf.base.Bohr.c, 3))*v_e*N_e/T_e*sum;
         },