Changeset 2012

Timestamp:

05/03/08 10:38:05 (2 weeks ago)

Author:

gary

Message:

two changes in assert case b command
now have faint keyword - will not assert intensities fainter than this limit of the normalization line

all HeI lines with +Col contribution are now asserted by default

Files:

• trunk/source/assert_results.cpp (modified) (4 diffs)
• trunk/source/atmdat.h (modified) (1 diff)
• trunk/source/iter_startend.cpp (modified) (1 diff)
• trunk/source/lines.h (modified) (1 diff)
• trunk/source/prt_lines_helium.cpp (modified) (3 diffs)

trunk/source/assert_results.cpp

@@ -118 +118 @@
-
-                        /* these are a pair of optional parameters */
-4
+5
-                }
-
@@ -455 +455 @@
-                wavelength[nAsserts] = 0.;
-
+                /* faint option - do not test line if relative intensity is less
+                 * than entered value */
+                if( (i=nMatch("FAINT",input.chCARDCAPS ))>0 )
+                {
+                        Param[nAsserts][4] = 
+                                FFmtRead(input.chCARDCAPS ,&i, INPUT_LINE_LENGTH,&lgEOL);
+                        if( lgEOL ) 
+                        {
+                                /* did not get 2 numbers */
+                                fprintf(ioQQQ," The assert Case B faint option must have a number,"
+                                        " the relative intensity of the fainest line to assert.\n");
+                                cdEXIT(EXIT_FAILURE);
+                        }
+                        /* number is log if <= 0 */
+                        if( Param[nAsserts][4]<=0. )
+                                Param[nAsserts][4] = pow(10., Param[nAsserts][4] );
+                }
+                else
+                {
+                        /* use default - include everything*/
+                        Param[nAsserts][4] = SMALLFLOAT;
+                }
+
-                /* range option - to limit check on a certain wavelength range */
-nMatch("RANG",input.chCARDCAPS )
+(i=nMatch("RANG",input.chCARDCAPS ))>0
-                {
-                        Param[nAsserts][2] = 
@@ -1939 +1962 @@
-                                                /* find the predicted line intensity */
-                                                cdLine( chAssertLineLabel[i] , wl , &CBrelint , &CBabsint );
+                                                if( CBrelint < Param[i][4]  )
+                                                        continue;
-                                                CBabsint = pow( 10., CBabsint );
-                                                double error;
@@ -2013 +2038 @@
-                                if( !dense.lgElmtOn[ipHELIUM] )
-                                {
-DISASTER
+PROBLEM
-                                                "included.\n");
-s
+f
-                                        cdEXIT(EXIT_FAILURE);
-                                }
+#                               if 0
-#                               define N_CASEB_HEI      11
-                                realnum CaseBWlHeI[N_CASEB_HEI]=
-                                { 10830.f, 3889.f, 3188.f, 5016.f, 3965.f, 7065.f, 5876.f, 4471.f,
-                                4026.f, 6678.f, 4922.f };
+#                               endif
-                                /* do He I as special case */
-                                fprintf(ioASSERT,"                     Wl  Computed  Asserted       error\n");
-N_CASEB_HE
+atmdat.nCaseBHe
-                                {
-                                        /* assert the line */
-
+
+
+
+
-                                        double relint , absint,CBrelint , CBabsint;
-                                        cdLine( chAssertLineLabel[i] , wl , &CBrelint , &CBabsint );
+                                        if( CBrelint < Param[i][4]  )
+                                                continue;
-                                        CBabsint = pow( 10., CBabsint );
-                                        double error;

trunk/source/atmdat.h

@@ -205 +205 @@
-        /** wavelengths of Hummer & Storey case B lines for H - O */
-        realnum WaveLengthCaseB[8][25][24];
+
+        /** wavelengths for HeI case b */
+        realnum *CaseBWlHeI;
+        /** number of HeI case b lines included */
+        long int nCaseBHeI;
-
-        }       atmdat;

trunk/source/iter_startend.cpp

@@ -565 +565 @@
-
-        /* there are three types of calls to lines() 
-this is first call with ipass = -1, only counted number
-of lines and malloced space.  Below is second call and will do
-one-time creation of line labels 
+ipass = -1, first call, only count number off lines
+ipass =  0, second pass, save labels and wavelengths
+ipass =  1, integrate intensity
-        LineSave.ipass = -1;
-        lines();

trunk/source/lines.h

@@ -66 +66 @@
-        long int nComment;
-
-
-
-
+
+
+
+
-        long int ipass;
-

trunk/source/prt_lines_helium.cpp

@@ -7 +7 @@
-#include "helike.h"
-#include "iso.h"
+#include "atmdat.h"
-#include "lines.h"
-#include "lines_service.h"
@@ -66 +67 @@
-                GetStandardHeLines();
-                lgFirstRun = false;
+        }
+
+        /* store labels for all case b HeI lines in case we assert case b 
+         * ipass == -1 only counting number of lines */
+        if( LineSave.ipass < 0 )
+                atmdat.nCaseBHeI = 0;
+        else if( LineSave.ipass == 0 )
+        {
+                /* ipass == 0 allocate space and save wavelengths */
+                atmdat.CaseBWlHeI = (realnum *)MALLOC( (sizeof realnum)*atmdat.nCaseBHeI);
+                atmdat.nCaseBHeI = 0;
-        }
-
@@ -132 +144 @@
-                                                        if( ipLo==4 )
-                                                                totBranch += iso.BranchRatio[ipISO][nelem][ipHi][3] + iso.BranchRatio[ipISO][nelem][ipHi][5];
+
+                                                        if( LineSave.ipass < 0 )
+                                                                ++atmdat.nCaseBHeI;
+                                                        else if( LineSave.ipass == 0 )
+                                                        {
+                                                                /* save wavelengths */
+                                                                atmdat.CaseBWlHeI[atmdat.nCaseBHeI] = 
+                                                                        Transitions[ipHE_LIKE][nelem][ipHi][ipLo].WLAng;
+                                                                ++atmdat.nCaseBHeI;
+                                                        }
-
-                                                        if( ipHi==4 )