diff --git a/pub/lib/commands.cpp b/pub/lib/commands.cpp index 05a44a96a0d5e9580efecc428045ce91c5297e0f..a418abb70f70b73e8020caa3c11be49cfbf9cce4 100644 --- a/pub/lib/commands.cpp +++ b/pub/lib/commands.cpp @@ -249,6 +249,7 @@ bool frida_command( string cmd ) " fl load from disk\n" " fs save to disk\n" " fso save to disk, allow overwrite\n" + " fe0 export to old y08 format (obsolete!)\n" " fe1 export (only z and y, one line per spectrum)\n" " fe2 export (one block per spectrum: z header and x-y lines)\n" " fc copy\n" @@ -268,13 +269,13 @@ bool frida_command( string cmd ) } else if (cmd == "fl") { NFileIn::load(); } else if (cmd == "fs") { - NFileOut::save( "y08" ); - } else if (cmd == "fso") { - NFileOut::save( "y08", true ); - } else if (cmd == "fS") { NFileOut::save( "yda" ); - } else if (cmd == "fSo") { + } else if (cmd == "fso") { NFileOut::save( "yda", true ); + } else if (cmd == "fe0") { + NFileOut::save( "y08" ); + } else if (cmd == "fe0o") { + NFileOut::save( "y08", true ); } else if (cmd == "fe1") { NFileOut::save( "csv" ); } else if (cmd == "fe2") { diff --git a/pub/lib/file_out.cpp b/pub/lib/file_out.cpp index e2b289ea4171c39d9df6ceb2bc409b0eff4d714e..aa67d816b11159d322534ed109308fec89a613ef 100644 --- a/pub/lib/file_out.cpp +++ b/pub/lib/file_out.cpp @@ -125,12 +125,10 @@ void NFileOut::save_yda( std::ofstream& ofs, POlo f ) if( fc ) { out << YAML::Key << "Curve" << YAML::Value << YAML::BeginMap; - out << YAML::Key << "expr" << YAML::Value << fc->expr; out << YAML::Key << "nPar" << YAML::Value << fc->nP; out << YAML::Key << "weighing" << YAML::Value << COlc::wgtNames[fc->weighing]; out << YAML::Key << "chi2" << YAML::Value << fc->chi2; - out << YAML::EndMap; }