relaxis: improve error handling some
This commit is contained in:
@ -36,10 +36,7 @@ int main(int argc, char** argv)
|
|||||||
if(!checkDir(outDir))
|
if(!checkDir(outDir))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
int arg = 1;
|
for(int arg = 1; arg < argc; ++arg)
|
||||||
try
|
|
||||||
{
|
|
||||||
for(; arg < argc; ++arg)
|
|
||||||
{
|
{
|
||||||
if(ignoreArgs.find(arg) != ignoreArgs.end())
|
if(ignoreArgs.find(arg) != ignoreArgs.end())
|
||||||
continue;
|
continue;
|
||||||
@ -48,10 +45,14 @@ int main(int argc, char** argv)
|
|||||||
std::cout<<"Loaded "<<argv[arg]<<" file has "<<file.getProjectCount()<<" project(s)\n";
|
std::cout<<"Loaded "<<argv[arg]<<" file has "<<file.getProjectCount()<<" project(s)\n";
|
||||||
|
|
||||||
for(size_t i = 0; i < file.getProjectCount(); ++i)
|
for(size_t i = 0; i < file.getProjectCount(); ++i)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
rlx::Project project = file.getProject(i);
|
rlx::Project project = file.getProject(i);
|
||||||
std::cout<<"Project "<<i<<" has "<<project.getSpectraCount()<<" spectra\n";
|
std::cout<<"Project "<<i<<" has "<<project.getSpectraCount()<<" spectra\n";
|
||||||
for(size_t j = 0; j < project.getSpectraCount(); ++j)
|
for(size_t j = 0; j < project.getSpectraCount(); ++j)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
rlx::Spectra spectra = project.getSpectra(j);
|
rlx::Spectra spectra = project.getSpectra(j);
|
||||||
if(!spectra.fitted)
|
if(!spectra.fitted)
|
||||||
@ -71,12 +72,19 @@ int main(int argc, char** argv)
|
|||||||
data.id = std::to_string(spectra.id);
|
data.id = std::to_string(spectra.id);
|
||||||
saveData("relaxis", data, outDir, argv[arg]);
|
saveData("relaxis", data, outDir, argv[arg]);
|
||||||
}
|
}
|
||||||
|
catch(const eis::file_error& err)
|
||||||
|
{
|
||||||
|
std::cerr<<"error spectra " <<i<<" from file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch(const eis::file_error& err)
|
catch(const eis::file_error& err)
|
||||||
{
|
{
|
||||||
std::cerr<<"error reading file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
|
std::cerr<<"error reading file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
|
||||||
return 1;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user