Merge branch 'master-faser-common-compat' into 'master'

Compatibility with faser-common master

See merge request faser/calypso!144

Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.cxx

@@ -143,7 +143,7 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
 
     try {
       wfm->setWaveform( channel, digitizer->channel_adc_counts( channel ) );
-    } catch ( DigitizerDataException& e ) {
+    } catch ( DigitizerData::DigitizerDataException& e ) {
       ATH_MSG_WARNING("ScintWaveformDecoderTool:\n"
 		   <<e.what()
 		   << "\nChannel "
@@ -154,7 +154,7 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
     try {
       wfm->setHeader( digitizer );
 
-    } catch ( DigitizerDataException& e ) {
+    } catch ( DigitizerData::DigitizerDataException& e ) {
       ATH_MSG_WARNING("ScintWaveformDecoderTool:\n"
 		      << e.what()
 		      << "\nCorrupted Digitizer data!\n"

Tracker/TrackerEventCnv/TrackerByteStream/src/TrackerDataDecoderTool.cxx

@@ -241,7 +241,7 @@ TrackerDataDecoderTool::convert(const DAQFormats::EventFull* re,
         }
       }
     } 
-    catch (const TrackerDataException& exc)
+    catch (const TrackerData::TrackerDataException& exc)
     {
       ATH_MSG_ERROR("TrackerDataException: " << exc.what());
       continue;
@@ -301,7 +301,7 @@ TrackerDataDecoderTool::convert(const DAQFormats::EventFull* re,
   //   // Do the conversion here using whatever it takes
   //   // try {
   //   //  rdo->setData( fragment );
-  //   //} catch ( TrackerDataException& e ) {
+  //   //} catch ( TrackerData::TrackerDataException& e ) {
   //   //  ATH_MSG_INFO("TrackerDataDecoderTool:\n"
   //   //	   <<e.what()
   //   //		   << "\nTracker data not filled!\n");

faser-common @ 89ce6a07

-Subproject commit a6aa04b50328ec496cb8e6910dfc5f77185b1445
+Subproject commit 89ce6a07128eb2ebc367b6b68f29c9c88220e3e6