Changeset 2091 for branches/c08_branch/source/iso_create.cpp

Timestamp:

05/22/08 10:42:53 (3 months ago)

Author:

rporter

Message:

merge r2083 from trunk.

Files:

• branches/c08_branch/source/iso_create.cpp (modified) (5 diffs)

branches/c08_branch/source/iso_create.cpp

@@ -331 +331 @@
                                         StatesElem[ipISO][nelem][ipHi].lifetime = SMALLFLOAT;
                                         
-                                        long ipLoStart = 0;
-                                        if( opac.lgCaseB && L_(ipHi)==1 && (ipISO==ipH_LIKE || S_(ipHi)==1) )
-                                                ipLoStart = 1;
-
-                                        for( ipLo=ipLoStart; ipLo < ipHi; ipLo++ )  
+                                        for( ipLo=0; ipLo < ipHi; ipLo++ )  
                                         {
                                                 if( Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul <= iso.SmallA )
@@ -1272 +1268 @@
         for( ipHi=1; ipHi<iso.numLevels_max[ipISO][nelem]; ipHi++ )
         {
+                double SumAs = 0.;
+
                 /** Cascade probabilities are as defined in Robbins 68,
                  * generalized here for cascade probability for any iso sequence.       
@@ -1294 +1292 @@
                 for( ipLo=ipLoStart; ipLo<ipHi; ipLo++ )
                 {
+                        SumAs += Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul;
+                }
+
+                for( ipLo=ipLoStart; ipLo<ipHi; ipLo++ )
+                {
                         if( Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul <= iso.SmallA )
                         {
@@ -1303 +1306 @@
                         iso.CascadeProb[ipISO][nelem][ipHi][ipLo] = 0.;
                         iso.BranchRatio[ipISO][nelem][ipHi][ipLo] = 
-                                Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul *
-                                StatesElem[ipISO][nelem][ipHi].lifetime;
+                                Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul / SumAs;
 
                         ASSERT( iso.BranchRatio[ipISO][nelem][ipHi][ipLo] <= 1.0000001 );
@@ -1965 +1967 @@
                 StatesElem[ipISO][nelem][ipHi].lifetime = SMALLFLOAT;
 
-                long ipLoStart=0;
-                if( opac.lgCaseB && L_(ipHi)==1 && (ipISO==ipH_LIKE || S_(ipHi)==1) )
-                        ipLoStart=1;
-
-                for( long ipLo=ipLoStart; ipLo < ipHi; ipLo++ )  
+                for( long ipLo=0; ipLo < ipHi; ipLo++ )  
                 {
                         if( Transitions[ipISO][nelem][ipHi][ipLo].Emis->Aul <= iso.SmallA )