From: Ron F. <ro...@us...> - 2004-05-12 21:26:50
|
Update of /cvsroot/nsclspectcl/SpecTcl/SpecTcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17208 Modified Files: Tag: SpecTcl-2-2_development TCLAnalyzer.cpp Log Message: Catch exceptions thrown by user event processors and treat them as a false return...+ an error message. Index: TCLAnalyzer.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/TCLAnalyzer.cpp,v retrieving revision 4.5 retrieving revision 4.5.4.1 diff -C2 -d -r4.5 -r4.5.4.1 *** TCLAnalyzer.cpp 24 Oct 2003 14:46:07 -0000 4.5 --- TCLAnalyzer.cpp 12 May 2004 21:26:41 -0000 4.5.4.1 *************** *** 297,300 **** --- 297,301 ---- #include "EventProcessor.h" #include <buftypes.h> + #include <iostream> *************** *** 434,438 **** while(p != m_lAnalysisPipeline.end()) { CEventProcessor* pProcessor(*p); ! if(!pProcessor->operator()(pRawData, anEvent, *this, *pDecoder)) { IncrementCounter(EventsRejected); IncrementCounter(EventsRejectedThisRun); --- 435,451 ---- while(p != m_lAnalysisPipeline.end()) { CEventProcessor* pProcessor(*p); ! Bool_t success; ! try { ! success = pProcessor->operator()(pRawData, anEvent, *this, *pDecoder); ! } ! catch (string msg) { ! cerr << "Event processor threw: '" << msg << "'" << endl; ! success = kfFALSE; ! } ! catch (...) { ! cerr << "Event processor threw an unanticipated exception " << endl; ! success = kfFALSE; ! } ! if(!success) { IncrementCounter(EventsRejected); IncrementCounter(EventsRejectedThisRun); |