@@ -393,17 +393,9 @@ void HistDataMD::plot(unsigned tbegin, unsigned tend, std::istream &stream, Grap
393
393
std::string function;
394
394
auto pos = stream.tellg ();
395
395
396
- try {
397
- HistData::plot (tbegin, tend, stream, gplot, config);
398
- }
399
- catch ( Exception &e ) {
400
- if ( e.getReturnValue () == ERRABT ) {
401
- stream.clear ();
402
- stream.seekg (pos);
403
396
stream >> function;
404
397
405
398
std::string line;
406
- size_t pos = stream.tellg ();
407
399
std::getline (stream,line);
408
400
stream.clear ();
409
401
stream.seekg (pos);
@@ -626,7 +618,14 @@ void HistDataMD::plot(unsigned tbegin, unsigned tend, std::istream &stream, Grap
626
618
}
627
619
628
620
else {
629
- throw EXCEPTION (std::string (" Function " )+function+std::string (" not available yet" ),ERRABT);
621
+ try {
622
+ HistData::plot (tbegin, tend, stream, gplot, config);
623
+ } catch (Exception &e) {
624
+ e.ADD (std::string (" Function " ) + function +
625
+ std::string (" not available yet" ),
626
+ ERRABT);
627
+ throw e;
628
+ }
630
629
}
631
630
632
631
try {
@@ -637,11 +636,6 @@ void HistDataMD::plot(unsigned tbegin, unsigned tend, std::istream &stream, Grap
637
636
}
638
637
Graph::plot (config,gplot);
639
638
stream.clear ();
640
- }
641
- else {
642
- throw e;
643
- }
644
- }
645
639
}
646
640
647
641
std::list<std::vector<double >> HistDataMD::getVACF (unsigned tbegin, unsigned tend) const {
0 commit comments