Merge branch 'mdf_writer_tae_fix' into 'master'

Add option to mdf writer to skip special TAE treatment

See merge request !4008

DAQ/MDF/include/MDF/MDFIO.h

@@ -72,6 +72,8 @@ namespace LHCb {
     bool m_ignoreChecksum;
     /// Flag to force TAE format of the MDF file
     bool m_forceTAE;
+    /// Flag to ignore ignore TAE in input data
+    bool m_ignoreTAE;
     /// Flag to not print messages if getDataSpace fails
     bool m_silent;
     /// Monitoring quantity: Number of write errors
@@ -125,6 +127,7 @@ namespace LHCb {
         , m_catalog( 0 )
         , m_ignoreChecksum( false )
         , m_forceTAE( false )
+        , m_ignoreTAE( false )
         , m_silent( false )
         , m_writeErrors( 0 )
         , m_writeActions( 0 )

DAQ/MDF/src/MDFIO.cpp

@@ -119,7 +119,7 @@ StatusCode LHCb::MDFIO::commitRawBanks( int compTyp, int chksumTyp, void* const
   SmartDataPtr<RawEvent> raw( m_evtSvc, location );
   if ( raw ) {
     size_t len;
-    bool   isTAE = m_forceTAE || isTAERawEvent( raw ); // false in principle...unless TAE
+    bool   isTAE = !m_ignoreTAE && ( m_forceTAE || isTAERawEvent( raw ) ); // false in principle...unless TAE
     if ( !isTAE ) {
       for ( const auto* b : raw->banks( RawBank::DAQ ) ) {
         if ( b->version() == DAQ_STATUS_BANK ) { return commitRawBanks( raw, b, compTyp, chksumTyp, ioDesc ); }

DAQ/MDF/src/MDFWriter.cpp

@@ -60,6 +60,7 @@ void MDFWriter::construct() {
   declareProperty( "BankLocation", m_bankLocation = RawEventLocation::Default ); // Location of the banks in the TES
   declareProperty( "DataManager", m_ioMgrName = "Gaudi::IODataManager/IODataManager" );
   declareProperty( "ForceTAE", m_forceTAE = false );
+  declareProperty( "IgnoreTAE", m_ignoreTAE = false );
   declareProperty( "AddSpace", m_addSpace = 1 );
 }