Changeset 2127 for trunk/source/helike_einsta.cpp

Timestamp:

06/25/08 11:17:40 (5 months ago)

Author:

rporter

Message:

/trunk/source - a bunch of relatively minor changes, essentially all refactoring and comments. One change to command parser. "atom XX-like error generation" now accepts "PESSimistic" option, which chooses the worst of two sets of data in the Monte Carlo calculation.

Files:

• trunk/source/helike_einsta.cpp (modified) (20 diffs)

trunk/source/helike_einsta.cpp

@@ -253 +253 @@
                         fixit(); // adding the 2-photon decay 2^3S - 1^1S may be important in early universe
                         A = ForbiddenHe[ipHi - 1];
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHe2s3S ,ipHe1s1S,IPRAD, 0.01f, 0.20f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHe2s1S ,ipHe1s1S,IPRAD, 0.01f, 0.05f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHe2p3P0,ipHe1s1S,IPRAD, 0.00f, 0.00f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHe2p3P1,ipHe1s1S,IPRAD, 0.01f, 0.05f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHe2p3P2,ipHe1s1S,IPRAD, 0.01f, 0.01f);
                 }
                 else
@@ -293 +297 @@
                                 TotalInsanity();
                         }
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
-                }
-                /*      For now just just put 1% error for forbidden lines. */
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,.01f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
+                }
+
                 return A;
         }
@@ -313 +316 @@
                 A = 8.0E-3 * exp(9.283/sqrt((double)N_(ipLo))) * pow((double)nelem,9.091) /
                         pow((double)N_(ipHi),2.877);
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
         }
 
@@ -328 +331 @@
                         A *= (2.*(ipLo-3)+1.0)/3.0;
                 }
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
         }
 
@@ -344 +347 @@
                         /* 20% error is based on difference between Savukov, Labzowsky, and Johnson (2005)
                          * and Lach and Pachucki (2001) for the helium transition. */
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.2f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.2f,0.2f);
                 }
                 else
@@ -351 +354 @@
                          * the above values to 10% or better. */
                         A= 7.22E-9*pow((double)nelem, 9.33);
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.3f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.3f,0.3f);
                 }
         }
@@ -361 +364 @@
                 {
                         A = 1.549;
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
                 }
                 else
@@ -369 +372 @@
                          * >>refercon   astro-ph 0205163        */
                         A= 0.1834*pow((double)nelem, 6.5735);
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
                 }
         }
@@ -383 +386 @@
                  * See discussion "Energy order within 2 3P" near the top of helike.c */
                 A = 5.78E-12;
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
 
         }
@@ -396 +399 @@
                  * See discussion "Energy order within 2 3P" near the top of helike.c */
                 A = 3.61E-15;
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
         }
 
@@ -403 +406 @@
                 /* Current transition is not supported. */
                 A = iso.SmallA;
-                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
-        }
-
-        /* For now just put 1% error for forbidden lines. */
-        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,.01f);
+                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
+        }
 
         ASSERT( A > 0.);
@@ -488 +488 @@
                                 Aul = TransProbs[nelem][ipHi][ipLo];
 
-                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.0005f);
+                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.0001f,0.002f);
                         }
 
@@ -502 +502 @@
                                                 Aul = (1.59208e10) / pow(Eff_nupper,3.0);
                                         ASSERT( Aul > 0.);
-                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.005f);
+                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.0002f,0.002f);
                                 }
 
@@ -511 +511 @@
                                         Aul = H_Einstein_A(nHi ,lHi , nLo , lLo , nelem);
                                         ASSERT( Aul > 0.);
-
-                                        if( lHi + lLo >= 7 )
-                                        {
-                                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.001f);
-                                        }
-                                        else
-                                        {
-                                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f);
-                                        }
+                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.006f,0.04f);
                                 }
                                 /* These fits come from extrapolations of Drake's oscillator strengths
@@ -616 +608 @@
 
                                         ASSERT( Aul > 0. );
-                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f);
+                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.0002f,0.002f);
                                 }
                                 else
@@ -633 +625 @@
 
                                         ASSERT( Aul > 0. );
-                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.03f);
+                                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f,0.07f);
                                 }
                         }
@@ -652 +644 @@
 
                                 Aul = TransProbs[nelem][ipHi][ipLo];
-                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
                         }
 
@@ -784 +776 @@
 
                                 }
-                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f);
+                                iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.1f,0.1f);
                         }
-
-                        /* for now just give ions some a 5% error across the board */
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.05f);
                 }
         }
@@ -1005 +994 @@
                         /* Neither upper nor lower is resolved...Aul's are easy.        */
                         Aul = HydroEinstA( N_(ipLo), N_(ipHi) )*z4;
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.001f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.001f,0.001f);
 
                         ASSERT( Aul > 0.);
@@ -1034 +1023 @@
                                 iso.CachedAs[ipISO][nelem][ N_(ipHi)-iso.n_HighestResolved_max[ipISO][nelem]-1 ][ ipLo ][1] = 0.f;
 
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f);
+                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f,0.01f);
                         ASSERT( Aul > 0.);
                 }