Small tweaks for CMF, SPC, SPE files.

Author: wcjohns

src/SpecFile_cnf.cpp

@@ -147,10 +147,10 @@ void SpecFile::load_cnf_using_reader( CAMInputOutput::CAMIO &reader )
     const CAMInputOutput::DetInfo &det_info = reader.GetDetectorInfo();
 
     if( det_info.MCAType.size() )
-      remarks_.push_back( "MCA Type: " + det_info.MCAType);
+      remarks_.push_back( "MCA Type: " + det_info.MCAType );
 
     if( det_info.Type.size() )
-      remarks_.push_back( "Detector Type: " + det_info.MCAType);
+      remarks_.push_back( "Detector Type: " + det_info.Type );
 
     if( !det_info.SerialNo.empty() )
       instrument_id_ = det_info.SerialNo;

src/SpecFile_spc.cpp

@@ -431,7 +431,7 @@ bool SpecFile::load_from_iaea_spc( std::istream &input )
         if( have_d )
           d = static_cast<float>( atof( line.c_str() + dpos + 2 ) );
 
-        if( have_a && have_b && have_c && have_d
+        if( have_c && have_d
             && (a!=0.0 || b!=0.0 || c!=0.0 ) )
         {
           calibcoeff_poly = {d,c,b,a};

src/SpecFile_spe.cpp

@@ -678,7 +678,8 @@ bool SpecFile::load_from_iaea( std::istream& istr )
             break;
           }//if( we have overrun the data section )
         }
-      }else if( starts_with(line,"$MCA_CAL:") )
+      }else if( starts_with(line,"$MCA_CAL:")
+               || starts_with(line,"$NONLIN_ENER_FIT:") )
       {
         try
         {