diff --git a/TileCalorimeter/TileMonitoring/src/TileDQFragLWMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileDQFragLWMonTool.cxx index c5c06e4497e6f21e424158b4420ced27101d6719..2040430a0b61fb9994c7f31d0d40063fe19bd42f 100644 --- a/TileCalorimeter/TileMonitoring/src/TileDQFragLWMonTool.cxx +++ b/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; } diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py index b6e0d18c240641008cdfca369207eb9c1a6bae6d..8480a5932087d5c86a97578add132052d201cc79 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py +++ b/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()