Changeset 1142 for trunk/source/cdspec.cpp

Timestamp:

05/21/07 12:12:52 (20 months ago)

Author:

rporter

Message:

merge changes from porter branch. These are all iso refactoring changes. Test suite has zero botches.

Files:

• trunk/source/cdspec.cpp (modified) (2 diffs)

trunk/source/cdspec.cpp

@@ -463 +463 @@
         {
                 /* this is exp(-tau) */
+                cont = (float*)MALLOC( sizeof(float)*(size_t)rfield.nupper );
+                /* need to free the vector once done */
+                lgFREE = true;
                 for( j=0; j<nEnergy; ++j)
                 {
                         /* This is the TOTAL attentuation in both the continuum and lines.  
                          * Jon Miller discovered that the line attentuation was missing in 07.02 */
-                        ReturnedSpectrum[j] = opac.ExpmTau[j]*rfield.trans_coef[j];
+                        cont[j] = opac.ExpmTau[j]*rfield.trans_coef[j];
                 }
                 return;
@@ -478 +481 @@
         }
 
-        /* this is array index used in Spec_cont */
-        iplo = 0;
-        iphi = 0;
         /* now generate the continua */
         for( ncell = 0; ncell < nEnergy; ++ncell )