Merge branch '21.0-tile-rec-mf-mon-fork1' into '21.0'

Fix Tile Matched filter and r2e:fork1 monitoring (ATLASDQ-519)

See merge request atlas/athena!12205

Former-commit-id: a2119da37d578ebb6786314c3da37c9210af2638

TileCalorimeter/TileMonitoring/src/TileDQFragLWMonTool.cxx

@@ -350,6 +350,12 @@ StatusCode TileDQFragLWMonTool::fillHistograms() {
     m_isFirstEvent = false;
   }
 
+  if (m_manager->forkedProcess()) {
+    fillMasking();
+    m_nEvents = 1;
+    m_nEventsWithAllDigits = 0;
+  }
+
   if (getL1info() == 0x82) {
     ++m_nEventsWithAllDigits;
   }

TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py

@@ -140,15 +140,17 @@ class TileRawChannelGetter ( Configured)  :
             TilePulseTypes = {0 : 'PHY', 1 : 'PHY', 2 : 'LAS', 4 : 'PHY', 8 : 'CIS'}
             TilePulse = TilePulseTypes[jobproperties.TileRecFlags.TileRunType()]
 
-            if (jobproperties.TileRecFlags.doTileFitCool()
+            if (jobproperties.TileRecFlags.doTileMF()
                 or (not jobproperties.TileRecFlags.OfcFromCOOL()
-                    and (jobproperties.TileRecFlags.doTileMF()
-                         or jobproperties.TileRecFlags.doTileOF1()
+                    and (jobproperties.TileRecFlags.doTileOF1()
                          or jobproperties.TileRecFlags.doTileOpt2()
                          or jobproperties.TileRecFlags.doTileOptATLAS()))):
 
-                    tileInfoConfigurator.setupCOOLPULSE(type = TilePulse)
-                    tileInfoConfigurator.setupCOOLAutoCr()
+                tileInfoConfigurator.setupCOOLPULSE(type = TilePulse)
+                tileInfoConfigurator.setupCOOLAutoCr()
+
+            elif jobproperties.TileRecFlags.doTileFitCool():
+                tileInfoConfigurator.setupCOOLPULSE(type = TilePulse)
 
             if jobproperties.TileRecFlags.OfcFromCOOL():
                 if (jobproperties.TileRecFlags.doTileMF()