Changeset 2012 for trunk/source/assert_results.cpp

Timestamp:

05/03/08 10:38:05 (8 months 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/assert_results.cpp

@@ -118 +118 @@
 
                         /* these are a pair of optional parameters */
-                        Param[i] = ((double *)MALLOC(4*sizeof(double )));
+                        Param[i] = ((double *)MALLOC(5*sizeof(double )));
                 }
 
@@ -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 */
-                if( nMatch("RANG",input.chCARDCAPS ) )
+                if( (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] )
                                 {
-                                        fprintf(ioQQQ,"DISASTER assert case B for a He is requested but He is not "
+                                        fprintf(ioQQQ,"PROBLEM assert case B for a He is requested but He is not "
                                                 "included.\n");
-                                        fprintf(ioQQQ,"Do not turn off He is you want to assert its spectrum.\n");
+                                        fprintf(ioQQQ,"Do not turn off He if you want to assert its spectrum.\n");
                                         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");
-                                for( long int ipLine=0; ipLine< N_CASEB_HEI ; ++ipLine )
+                                for( long int ipLine=0; ipLine< atmdat.nCaseBHeI ; ++ipLine )
                                 {
                                         /* assert the line */
-                                        realnum wl = CaseBWlHeI[ipLine];
+                                        realnum wl = atmdat.CaseBWlHeI[ipLine];
+                                        /* range option to restrict wavelength coverage */
+                                        if( wl < Param[i][2] || wl > Param[i][3] )
+                                                continue;
                                         double relint , absint,CBrelint , CBabsint;
                                         cdLine( chAssertLineLabel[i] , wl , &CBrelint , &CBabsint );
+                                        if( CBrelint < Param[i][4]  )
+                                                continue;
                                         CBabsint = pow( 10., CBabsint );
                                         double error;