From 3b511613560a19d7a6f92c00082ddf02f73dda76 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 23 Jan 2019 00:26:40 +0000
Subject: [PATCH] TileRecUtils+TileEvent: Remove obsolete tool
TileBeamInfoProvider.
---
.../TileEvent/TileEvent/TileDQstatus.h | 3 -
.../TileRecUtils/TileBeamInfoProvider.h | 178 -----
.../TileRecUtils/TileRawChannelBuilder.h | 3 +-
.../TileRawChannelBuilderFitFilter.h | 1 -
.../TileRawChannelBuilderFitFilterCool.h | 3 +-
.../TileRecUtils/TileRecUtilsDict.h | 1 -
.../TileRecUtils/TileRecUtils/selection.xml | 1 -
TileCalorimeter/TileRecUtils/doc/packagedoc.h | 4 +-
.../python/TileRawChannelGetter.py | 31 +-
.../TileRawChannelGetter_DigiHSTruth.py | 12 -
.../TileRecUtils/src/TileBeamInfoProvider.cxx | 685 ------------------
.../src/components/TileRecUtils_entries.cxx | 2 -
12 files changed, 14 insertions(+), 910 deletions(-)
delete mode 100644 TileCalorimeter/TileRecUtils/TileRecUtils/TileBeamInfoProvider.h
delete mode 100644 TileCalorimeter/TileRecUtils/src/TileBeamInfoProvider.cxx
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h b/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
index 8862f597cb0..85ea9bbb610 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
@@ -21,7 +21,6 @@
#include <vector>
-class TileBeamInfoProvider;
class TileDQstatusTool;
class TileRawChannelCollection;
class TileDigitsContainer;
@@ -48,8 +47,6 @@ class MsgStream;
*/
class TileDQstatus
{
- //FIXME: Remove
- friend class TileBeamInfoProvider;
friend class TileDQstatusTool;
public:
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileBeamInfoProvider.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileBeamInfoProvider.h
deleted file mode 100644
index c519d9685d4..00000000000
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileBeamInfoProvider.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TILERECUTILS_TILEBEAMINFOPROVIDER_H
-#define TILERECUTILS_TILEBEAMINFOPROVIDER_H
-
-/********************************************************************
- *
- * NAME: TileBeamInfoProvider
- * PACKAGE: offline/TileCalorimeter/TileRecUtils
- *
- * AUTHOR : A. Solodkov
- * CREATED: June 06, 2004
- *
- * PURPOSE: Re
- *
- * Input: TileBeamElemContainer
- * Output: contents of cispar fragment, header, status and trigType
- * Parameters:
- * TileBeamElemContainer - Name of input container
- *
- ********************************************************************/
-
-// Tile includes
-#include "TileEvent/TileBeamElemContainer.h"
-#include "TileEvent/TileDigitsContainer.h"
-#include "TileEvent/TileRawChannelContainer.h"
-#include "TileEvent/TileTriggerContainer.h"
-#include "TileEvent/TileLaserObject.h"
-#include "TileConditions/ITileDCSTool.h"
-#include "TileEvent/TileDQstatus.h"
-
-// Atlas includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "xAODEventInfo/EventInfo.h"
-#include "StoreGate/ReadHandleKey.h"
-#include "StoreGate/WriteHandleKey.h"
-
-// Gaudi includes
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-#include <string>
-#include <vector>
-#include <inttypes.h>
-
-
-class TileHWID;
-class TileRawChannelCollection;
-class StoreGateSvc;
-class TileBeamInfoProvider;
-class ITileBadChanTool;
-class IAtRndmGenSvc;
-namespace CLHEP {
- class HepRandomEngine;
-}
-
-
-
-/**
-@class coincBoard
-@brief Small class holding the information for a cosmic trigger coincidence board
-*/
-class coincBoard {
-public:
- bool trig[96]; //!< each component of this array correspond to a single tower of a module (12 modules x 8 towers = 96 components)
- uint32_t amp;
-};
-
-/**
-@class TileBeamInfoProvider
-@brief This class provides the contents of cispar fragment, header, status and trigType from the objects in a TileBeamElemContainer
-*/
-class TileBeamInfoProvider: public AthAlgTool
- , virtual public IIncidentListener {
- //friend class TileDQstatus;
- public:
- TileBeamInfoProvider(const std::string& type, const std::string& name, const IInterface* parent); //!< Constructor
-
- virtual ~TileBeamInfoProvider(); //!< Destructor
-
- virtual StatusCode initialize(); //!< intialize method
- virtual StatusCode finalize(); //!< finalize method
-
- virtual void handle(const Incident&) ; //!< Callback for Incident service
-
- static const InterfaceID& interfaceID( ) ; //!< AlgTool InterfaceID
-
- const TileDQstatus* getDQstatus(); //<! Creates TileDQstatus object and fills arrays from DQ fragment
-
- bool isChanDCSgood (int partition, int drawer, int channel) const;
-
- inline uint32_t eventCounter(void) const { return m_evt; }
- inline uint32_t calibMode(void) const { return m_calibMode; }
- inline int trigType(void) const { return m_trigType; }
- inline uint32_t laserFlag(void) const { return m_laserFlag; }
- inline uint32_t digiSize(void) const { return m_digiSize; }
- inline uint32_t BCID(void) const { return m_BCID; }
- inline const uint32_t * cispar(void) const { return m_cispar; }
- inline const uint32_t * laspar(void) const { return m_laspar; }
- uint32_t checkCalibMode(void);
- inline const std::vector<coincBoard> & getCoincBoard(void) const { return m_coincTrig; }
-
- void setContainers(const TileDigitsContainer * digitsCnt = NULL,
- const TileRawChannelContainer * rcCnt = NULL,
- const TileBeamElemContainer * beamElemCnt = NULL);
-
- const TileRawChannelContainer * dspContainer() const { return m_rcCnt;}
- bool noiseFilterApplied() const { return m_noiseFilterApplied;}
- void setNoiseFilterApplied(bool val=true) {m_noiseFilterApplied=val;}
- bool incompleteDigits() const { return m_incompleteDigits;}
-
- protected:
-
- bool m_checkDQ; //!< if false, skip DQ checks (set to false if container is not found in first event)
- bool m_checkDigi; //!< if false, skip reading of TileDigitsContainer ( /-/-/-/ )
- bool m_checkBeam; //!< if false, skip reading of TileBeamContainer ( /-/-/-/ )
- bool m_checkDCS; //!< if false, do not use Tile DCS at all
- bool m_simulateTrips; //! if true simulate drawer trips
-
- SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this, "EventInfo",
- "EventInfo", "Input Event info key"};
-
- SG::ReadHandleKey<TileBeamElemContainer> m_beamElemContainerKey{this, "TileBeamElemContainer",
- "", "Input Tile beam elements container key"};
-
- SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this, "TileDigitsContainer",
- "", "Input Tile digits container key"};
-
- SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this, "TileRawChannelContainer",
- "", "Input Tile raw channel container key"};
-
- SG::WriteHandleKey<TileTriggerContainer> m_triggerContainerKey{this, "TileTriggerContainer",
- "", "Output Tile trigger container key"};
-
- SG::WriteHandleKey<TileLaserObject> m_laserObjectKey{this, "TileLaserObject",
- "", "Output Tile laser object key"};
-
-
- ToolHandle<ITileDCSTool> m_tileDCS{this, "TileDCSTool", "TileDCSTool", "Tile DCS tool"};
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
- ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tool which provides trips probabilities also
-
- const TileHWID* m_tileHWID; //!< Pointer to TileHWID
-
- int m_trigType; //!< Trigger type
- uint32_t m_laserFlag; //!< Laser Flag
- uint32_t m_cispar[110]; //!< Parameter for CIS
- uint32_t m_laspar[32]; //!< Parameter for LASER
-
- uint32_t m_calibMode; //!< Calibration mode
-
- uint32_t m_digiSize; //!< number of samples in digits
-
- uint32_t m_BCID; //!< BCID in LASTROD
-
- uint32_t m_evt; //!< number of event
-
- std::vector<coincBoard> m_coincTrig; // vector with instances of the coincBoard class
-
- TileDQstatus m_DQstatus; //<! DQStatus
-
- const TileDigitsContainer * m_digitsCnt;
- const TileRawChannelContainer * m_rcCnt;
- const TileBeamElemContainer * m_beamElemCnt;
-
- CLHEP::HepRandomEngine* m_pHRengine; //!< Random number generator engine to use
- double* m_rndmVec;
-
- bool m_noiseFilterApplied; //!< True if noise filter is applied to DSP container
-
- bool m_incompleteDigits; //!< True if not all digits are available (taken from frag 1)
-
-};
-
-#endif
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
index e90045565bd..e9986c2c944 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
@@ -51,7 +51,6 @@ class TileRawChannel;
class TileID;
class TileHWID;
class TileInfo;
-class TileBeamInfoProvider;
class StoreGateSvc;
typedef std::vector<std::pair<TileRawChannel*, const TileDigits*> > Overflows_t;
@@ -182,7 +181,7 @@ class TileRawChannelBuilder: public AthAlgTool {
const TileInfo* m_tileInfo;
ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools{this,
- "NoiseFilterTools", {}, "Tile nose filter tools"};
+ "NoiseFilterTools", {}, "Tile noise filter tools"};
ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
"TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilter.h
index e1b92577e42..343cb5e8967 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilter.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilter.h
@@ -28,7 +28,6 @@
#include "TileConditions/TilePulseShapes.h"
#include "TileConditions/TileCondToolNoiseSample.h"
-class TileBeamInfoProvider;
class TileRawChannelBuilderFitFilter: public TileRawChannelBuilder {
public:
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
index 1245759a599..79ffb44131c 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TILERECUTILS_TILERAWCHANNELBUILDERFITFILTERCOOL_H
@@ -48,7 +48,6 @@
#define LAS_DT_HI 1.8
#define LAS_DT_LO 1.8
-class TileBeamInfoProvider;
class TileRawChannelBuilderFitFilterCool: public TileRawChannelBuilder
, public IIncidentListener {
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
index 4796beda8c9..085c418edc3 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
@@ -17,7 +17,6 @@
// Needed for tests.
-#include "TileRecUtils/TileBeamInfoProvider.h"
#include "TileRecUtils/ITileDQstatusTool.h"
#include "TileRecUtils/TileRawChannelBuilder.h"
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/selection.xml b/TileCalorimeter/TileRecUtils/TileRecUtils/selection.xml
index e06ba32da19..49da0498b8e 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/selection.xml
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/selection.xml
@@ -1,5 +1,4 @@
<lcgdict>
- <class name="TileBeamInfoProvider"/>
<class name="ITileDQstatusTool"/>
<class name="TileRawChannelBuilder"/>
</lcgdict>
diff --git a/TileCalorimeter/TileRecUtils/doc/packagedoc.h b/TileCalorimeter/TileRecUtils/doc/packagedoc.h
index 65e95a690c1..023f44a613d 100644
--- a/TileCalorimeter/TileRecUtils/doc/packagedoc.h
+++ b/TileCalorimeter/TileRecUtils/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -37,8 +37,6 @@ This package contains the algorithms and tools used for TileCal reconstruction
- TileRawChannelBuilderManyAmps: used by TileDigitsMaker. TileRawChannels are built using the method developed by Frank Marritt, based on fitting the digital samples to to a series of pulses (for pileup handling). Default method for full ATLAS reconstruction.
- - TileBeamInfoProvider: provides the contents of cispar fragment, header, status and trigType from the objects in a TileBeamElemContainer
-
- TileCellBuilder: creates TileCells from TileRawChannels, which are stored in a container. By default uses Opt2 Optimal Filter, and on-th-fly cell masking.
- TileCellFakeProb: scales down the energy of TileCells due to simulated failure of drawers
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
index a80a6b701e3..05f9ae4d924 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
@@ -58,13 +58,6 @@ class TileRawChannelGetter ( Configured) :
from AthenaCommon.AppMgr import ToolSvc
from TileRecUtils.TileRecFlags import jobproperties
- from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider
- theTileBeamInfoProvider = TileBeamInfoProvider()
-
- from AthenaCommon.AlgSequence import AthSequencer
- condSequence = AthSequencer("AthCondSeq")
- if hasattr(condSequence, 'TileDCSCondAlg'):
- theTileBeamInfoProvider.CheckDCS = True
# true for real data, false for MC - GlobalFlags.DataSource.is_data()
# true for nominal ATLAS configuration - GlobalFlags.DetGeo.is_atlas()
@@ -75,23 +68,23 @@ class TileRawChannelGetter ( Configured) :
jobproperties.TileRecFlags.noiseFilter=1
if jobproperties.TileRecFlags.TileRunType() == 1 :
- theTileBeamInfoProvider.TileBeamElemContainer="";
+ tileBeamElemContainer="";
else:
- theTileBeamInfoProvider.TileBeamElemContainer="TileBeamElemCnt";
+ tileBeamElemContainer="TileBeamElemCnt";
if jobproperties.TileRecFlags.readDigits():
- theTileBeamInfoProvider.TileDigitsContainer="TileDigitsCnt";
+ tileDigitsContainer="TileDigitsCnt";
else:
- theTileBeamInfoProvider.TileDigitsContainer="";
- theTileBeamInfoProvider.TileRawChannelContainer="TileRawChannelCnt";
+ tileDigitsContainer="";
+ tileRawChannelContainer="TileRawChannelCnt";
else:
- theTileBeamInfoProvider.TileBeamElemContainer="";
- theTileBeamInfoProvider.TileDigitsContainer="";
- theTileBeamInfoProvider.TileRawChannelContainer="";
+ tileBeamElemContainer="";
+ tileDigitsContainer="";
+ tileRawChannelContainer="";
from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault
- dq = TileDQstatusAlgDefault (TileRawChannelContainer = theTileBeamInfoProvider.TileRawChannelContainer,
- TileDigitsContainer = theTileBeamInfoProvider.TileDigitsContainer,
- TileBeamElemContainer = theTileBeamInfoProvider.TileBeamElemContainer)
+ dq = TileDQstatusAlgDefault (TileRawChannelContainer = tileRawChannelContainer,
+ TileDigitsContainer = tileDigitsContainer,
+ TileBeamElemContainer = tileBeamElemContainer)
# set time window for amplitude correction if it was not set correctly before
@@ -105,8 +98,6 @@ class TileRawChannelGetter ( Configured) :
jobproperties.TileRecFlags.TimeMinForAmpCorrection = -halfBS
jobproperties.TileRecFlags.TimeMaxForAmpCorrection = halfBS
- ToolSvc += theTileBeamInfoProvider
-
TileFrameLength = ServiceMgr.TileInfoLoader.NSamples
if TileFrameLength!=7:
mlog.info("disabling reading of OFC from COOL because Nsamples!=7")
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
index 2bf19b5c5a2..0afad1e5184 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
@@ -50,19 +50,9 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
from AthenaCommon.AppMgr import ToolSvc
from TileRecUtils.TileRecFlags import jobproperties
- from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider
- theTileBeamInfoProvider = TileBeamInfoProvider()
-
- from AthenaCommon.AlgSequence import AthSequencer
- condSequence = AthSequencer("AthCondSeq")
- if hasattr(condSequence, 'TileDCSCondAlg'):
- theTileBeamInfoProvider.CheckDCS = True
# true for nominal ATLAS configuration - GlobalFlags.DetGeo.is_atlas()
from AthenaCommon.GlobalFlags import globalflags
- theTileBeamInfoProvider.TileBeamElemContainer="";
- theTileBeamInfoProvider.TileDigitsContainer="";
- theTileBeamInfoProvider.TileRawChannelContainer="";
# set time window for amplitude correction if it was not set correctly before
if jobproperties.TileRecFlags.TimeMaxForAmpCorrection() <= jobproperties.TileRecFlags.TimeMinForAmpCorrection() :
@@ -75,8 +65,6 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
jobproperties.TileRecFlags.TimeMinForAmpCorrection = -halfBS
jobproperties.TileRecFlags.TimeMaxForAmpCorrection = halfBS
- ToolSvc += theTileBeamInfoProvider
-
NoiseFilterTools = []
if jobproperties.TileRecFlags.noiseFilter() == 1:
from TileRecUtils.TileRecUtilsConf import TileRawChannelNoiseFilter
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamInfoProvider.cxx b/TileCalorimeter/TileRecUtils/src/TileBeamInfoProvider.cxx
deleted file mode 100644
index 2fc73007887..00000000000
--- a/TileCalorimeter/TileRecUtils/src/TileBeamInfoProvider.cxx
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TileCal includes
-#include "TileRecUtils/TileBeamInfoProvider.h"
-#include "TileIdentifier/TileHWID.h"
-#include "TileIdentifier/TileTBFrag.h"
-#include "TileIdentifier/TileTTL1Hash.h"
-#include "TileEvent/TileTrigger.h"
-#include "TileConditions/TileBadChanTool.h"
-#include "TileCalibBlobObjs/TileCalibUtils.h"
-
-// Calo include
-#include "CaloIdentifier/CaloLVL1_ID.h"
-
-// Atlas includes
-#include "StoreGate/ReadHandle.h"
-#include "StoreGate/WriteHandle.h"
-#include "AthenaKernel/errorcheck.h"
-
-#include "AthenaKernel/IAtRndmGenSvc.h"
-
-// Gaudi includes
-#include "GaudiKernel/IIncidentSvc.h"
-
-
-//CLHEP includes
-#include <CLHEP/Random/Randomize.h>
-
-
-#include <iomanip>
-#include <memory>
-
-// uncomment line below for debug output
-// #define TILECELL_DEBUG 1
-
-static const InterfaceID IID_ITileBeamInfoProvider("TileBeamInfoProvider", 1, 0);
-
-const InterfaceID&
-TileBeamInfoProvider::interfaceID() {
- return IID_ITileBeamInfoProvider;
-}
-
-/**
- * Constructor
- */
-TileBeamInfoProvider::TileBeamInfoProvider(const std::string& type,
- const std::string& name, const IInterface* parent)
- : AthAlgTool(type, name, parent)
- , m_rndmSvc ("AtRndmGenSvc", name)
- , m_tileBadChanTool("TileBadChanTool")
- , m_tileHWID(0)
- , m_trigType(0)
- , m_laserFlag(0xFFFFFFFF)
- , m_calibMode(0xFFFFFFFF)
- , m_digiSize(0U)
- , m_BCID(0U)
- , m_evt(0U)
- , m_digitsCnt(0)
- , m_rcCnt(0)
- , m_beamElemCnt(0)
- , m_pHRengine(0)
- , m_rndmVec(0)
-{
-
- declareInterface < TileBeamInfoProvider > (this);
-
- declareProperty("CheckDCS", m_checkDCS = false);
- declareProperty("SimulateTrips", m_simulateTrips = false, "Simulate drawer trips (default=false)");
- declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileCondToolTrip");
-
- m_checkDQ = m_checkDigi = m_checkBeam = false; //until begin of run inibit DQ status
-
- m_noiseFilterApplied = false;
- m_incompleteDigits = true;
-}
-
-/**
- * Destructor
- */
-TileBeamInfoProvider::~TileBeamInfoProvider() {
-}
-
-/**
- * Initializer
- */
-StatusCode TileBeamInfoProvider::initialize() {
-
- ATH_MSG_INFO("in initialize()");
-
- // retrieve TileID helpers from det store
- CHECK(detStore()->retrieve(m_tileHWID, "TileHWID"));
-
- //=== TileDCSSvc
- if (m_checkDCS) {
- ATH_CHECK(m_tileDCS.retrieve());
- } else {
- m_tileDCS.disable();
- }
-
- m_evt = 0;
- m_trigType = 0;
- m_laserFlag = 0xFFFFFFFF;
- memset(m_cispar, 0, sizeof(m_cispar));
-
- m_calibMode = 0xFFFFFFFF;
-
-
- if (m_simulateTrips) {
- CHECK( m_tileBadChanTool.retrieve() );
- CHECK( m_rndmSvc.retrieve());
- m_pHRengine = m_rndmSvc->GetEngine("Tile_CondToolTrip");
- m_rndmVec = new double[TileCalibUtils::MAX_DRAWER];
- ATH_MSG_INFO("Drawer trips will be simulated");
- } else {
- m_tileBadChanTool.disable();
- }
-
- if (!(m_beamElemContainerKey.key().empty()
- && m_digitsContainerKey.key().empty()
- && m_rawChannelContainerKey.key().empty())
- || m_simulateTrips) {
-
- // Listen for begin of event
- ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", this->name());
- CHECK(incSvc.retrieve());
-
- int PRIORITY = 100;
- incSvc->addListener(this, "BeginRun", 101);
- incSvc->addListener(this, "BeginEvent", PRIORITY);
-
- ATH_MSG_DEBUG( "TileBeamInfoProvider created, taking info from '"
- << m_beamElemContainerKey.key()
- << "', '" << m_digitsContainerKey.key()
- << "', and from '" << m_rawChannelContainerKey.key()
- << ((m_simulateTrips) ? "', and from drawer trips simulation" : "'") );
-
- } else {
- ATH_MSG_DEBUG("TileBeamInfoProvider created, but BeginOfEvent incident not activated");
- }
-
- ATH_CHECK( m_eventInfoKey.initialize() );
-
- if (!m_beamElemContainerKey.key().empty()) {
- ATH_CHECK( m_beamElemContainerKey.initialize() );
- }
-
- if (!m_digitsContainerKey.key().empty()) {
- ATH_CHECK( m_digitsContainerKey.initialize() );
- }
-
- if (!m_rawChannelContainerKey.key().empty()) {
- ATH_CHECK( m_rawChannelContainerKey.initialize() );
- }
-
- if (!m_triggerContainerKey.key().empty()) {
- ATH_CHECK( m_triggerContainerKey.initialize() );
- }
-
- if (!m_laserObjectKey.key().empty()) {
- ATH_CHECK( m_laserObjectKey.initialize() );
- }
-
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode TileBeamInfoProvider::finalize() {
- ATH_MSG_INFO("Finalizing");
- if (m_rndmVec) {
- delete[] m_rndmVec;
- m_rndmVec = NULL;
- }
- return StatusCode::SUCCESS;
-}
-
-/****************************************************************************
- * This setContainer is called in event overlay jobs from TileDigitsMaker
- when containers are in non-usual event store
- ****************************************************************************/
-void TileBeamInfoProvider::setContainers(const TileDigitsContainer * digitsCnt,
- const TileRawChannelContainer * rcCnt,
- const TileBeamElemContainer * beamElemCnt) {
- m_rcCnt = rcCnt;
- m_digitsCnt = digitsCnt;
- m_beamElemCnt = beamElemCnt;
-
- m_checkDQ = (m_rcCnt != NULL);
- m_checkDigi = (m_digitsCnt != NULL);
- m_checkBeam = (m_beamElemCnt != NULL);
- m_noiseFilterApplied = false;
- m_incompleteDigits = false;
-
- m_DQstatus.setAllGood();
-
- if (m_evt == 0) {
- ATH_MSG_DEBUG("setContainer is called in first event");
- }
- ++m_evt;
-}
-
-/****************************************************************************
- * Implementation of Incident listener
- ****************************************************************************/
-void TileBeamInfoProvider::handle(const Incident& inc) {
- if (inc.type() == "BeginRun") {
- ATH_MSG_DEBUG("Handling BeginRun incident");
- m_evt = 0;
- m_DQstatus.setAllGood();
- m_DQstatus.setFilled(true);
- return;
- }
-
- ATH_MSG_DEBUG("Handling BeginEvent incident");
-
- if (m_evt == 0) {
- //enable DQstatus checks
- m_checkDQ = (!m_rawChannelContainerKey.key().empty());
- m_checkDigi = (!m_digitsContainerKey.key().empty());
- m_checkBeam = (!m_beamElemContainerKey.key().empty());
- if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "Check DQ=" << m_checkDQ << endmsg;
- msg(MSG::DEBUG) << "Check Digi=" << m_checkDigi << endmsg;
- msg(MSG::DEBUG) << "Check Beam=" << m_checkBeam << endmsg;
- }
- }
-
- m_rcCnt = nullptr;
- m_digitsCnt = nullptr;
- m_beamElemCnt = nullptr;
- m_noiseFilterApplied = false;
-
- // retrive all containers from detector store and cache pointers for future use
-
- if (m_checkBeam) {
- // Needed due to back-door setting of the property.
- m_beamElemContainerKey.initialize().ignore();
- SG::ReadHandle<TileBeamElemContainer> beamElemContainer(m_beamElemContainerKey);
- if (beamElemContainer.isValid()) {
- m_beamElemCnt = beamElemContainer.cptr();
- } else {
- ATH_MSG_ERROR("can't retrieve BeamElem '" << m_beamElemContainerKey.key() << "' from TDS");
- if (m_evt == 0) {
- m_checkBeam = false;
- }
- }
- }
-
- if (m_checkDigi) {
- SG::ReadHandle<TileDigitsContainer> digitsContainer(m_digitsContainerKey);
- if (digitsContainer.isValid()) {
- m_digitsCnt = digitsContainer.cptr();
- } else {
- ATH_MSG_ERROR("can't retrieve Digits '" << m_digitsContainerKey.key() << "' from TDS");
- if (m_evt == 0) {
- m_checkDigi = false;
- }
- }
- }
-
- if (m_checkDQ) {
- m_DQstatus.setAllGood();
- SG::ReadHandle<TileRawChannelContainer> rawChannelContainer(m_rawChannelContainerKey);
- if (rawChannelContainer.isValid()) {
- m_rcCnt = rawChannelContainer.cptr();
- } else {
- ATH_MSG_ERROR("can't retrieve RawChannels '" << m_rawChannelContainerKey.key() << "' from TDS");
- if (m_evt == 0) {
- m_checkDQ = false;
- m_DQstatus.setFilled(true);
- }
- }
- }
-
- m_BCID = 0;
- m_trigType = 0;
- m_laserFlag = 0xFFFFFFFF;
- memset(m_cispar, 0, sizeof(m_cispar));
- memset(m_laspar, 0, sizeof(m_laspar));
-
- if (m_beamElemCnt != NULL) {
-
- TileBeamElemContainer::const_iterator collItr = m_beamElemCnt->begin();
- TileBeamElemContainer::const_iterator lastColl = m_beamElemCnt->end();
-
- for (; collItr != lastColl; ++collItr) {
-
- int frag = (*collItr)->identify();
-
- if (m_trigType == 0 && (*collItr)->getLvl1Type() != 0) // take it from the ROD header
- m_trigType = -(*collItr)->getLvl1Type(); // make negative to distinguish from TileCal internal trig types
-
- switch (frag) {
-
- case LASE_PTN_FRAG: {
-
- TileBeamElemCollection::const_iterator beamItr = (*collItr)->begin();
- TileBeamElemCollection::const_iterator lastBeam = (*collItr)->end();
-
- if (beamItr != lastBeam) {
- std::vector < uint32_t > digits = (*beamItr)->get_digits();
-
- if (digits.size() > 0) {
- m_laserFlag = digits[0];
- if (m_laserFlag & 0xFF00)
- m_trigType = m_laserFlag >> 8;
- }
- }
- }
- break;
-
- case DIGI_PAR_FRAG: {
-
- m_BCID = (*collItr)->getRODBCID();
-
- TileBeamElemCollection::const_iterator beamItr = (*collItr)->begin();
- TileBeamElemCollection::const_iterator lastBeam = (*collItr)->end();
-
- for (; beamItr != lastBeam; ++beamItr) {
-
- HWIdentifier id = (*beamItr)->adc_HWID();
- std::vector < uint32_t > digits = (*beamItr)->get_digits();
- int cha = m_tileHWID->channel(id);
-
- if (cha < 15) {
- if (digits.size() > 0) {
- m_cispar[cha] = digits[0];
- ATH_MSG_VERBOSE("cispar [" << cha << "] = " << m_cispar[cha]);
- }
- } else if (cha == 15) {
- int siz = 15 + digits.size();
- if (siz > 110)
- siz = 110;
- for (int i = 15; i < siz; ++i) {
- m_cispar[i] = digits[i - 15];
- ATH_MSG_VERBOSE("cispar [" << i << "] = " << m_cispar[i]);
- }
- switch (m_cispar[16]) {
-
- case 0x02: {
- int aux_ext = m_cispar[17];
- m_cispar[17] = (aux_ext & 0x00ff); // dac
- m_cispar[18] = (aux_ext >> 8) & 0x00ff; // 00
- m_cispar[19] = (aux_ext >> 16) & 0x00ff; // 00
- m_cispar[20] = (aux_ext >> 24) & 0x00ff; // small/large cap
- }
- break;
-
- case 0x07: {
- bool badpar = ((m_cispar[16] == m_cispar[17]) || (m_cispar[17] == m_cispar[18]));
- int aux_ext = m_cispar[18];
- m_cispar[18] = (aux_ext & 0x00ff) - 1; // pmt ext cispar starts from 1
- m_cispar[19] = (aux_ext >> 8) & 0x00ff; // tower
- m_cispar[20] = (aux_ext >> 16) & 0x00ff; // drawer
-
- if (badpar || (aux_ext>>24)!=0 || m_cispar[18]>5 || m_cispar[19]>15 || m_cispar[20]>63) {
- ATH_MSG_WARNING("bad cispar[16,17,18]: " << m_cispar[16] << " " << m_cispar[17] << " " << aux_ext
- << " drawer,tower,pmt: " << m_cispar[20] << " " << m_cispar[19] << " " << (int)m_cispar[18]);
- m_cispar[16] += 0x100; // flag bad events
- m_cispar[18] = 5;
- m_cispar[19] = 0xff;
- m_cispar[20] = 0xff;
- }
-
- if (m_cispar[16] != m_cispar[17]) {
- // Warning: nonportable.
- union {
- unsigned int i;
- float f;
- } chargeCnv;
- chargeCnv.i = m_cispar[17];
- m_cispar[17] = chargeCnv.f;
- }
- }
- break;
- }
- }
- }
- }
- break;
-
- case LASER_OBJ_FRAG: {
-
- m_BCID = (*collItr)->getRODBCID();
-
- TileBeamElemCollection::const_iterator beamItr = (*collItr)->begin();
- TileBeamElemCollection::const_iterator lastBeam = (*collItr)->end();
-
- if (beamItr != lastBeam) { // one channel is expected, check that it's really there
-
- //HWIdentifier id=(*beamItr)->adc_HWID();
- std::vector < uint32_t > digits = (*beamItr)->get_digits();
- int cha = std::min(32, (int) digits.size());
-
- while (--cha >= 0) {
- m_laspar[cha] = digits[cha];
- ATH_MSG_VERBOSE("laspar [" << cha << "] = " << m_laspar[cha]);
- }
- }
- }
- break;
-
- case COIN_TRIG1_FRAG:
- case COIN_TRIG2_FRAG:
- case COIN_TRIG3_FRAG:
- case COIN_TRIG4_FRAG:
- case COIN_TRIG5_FRAG:
- case COIN_TRIG6_FRAG:
- case COIN_TRIG7_FRAG:
- case COIN_TRIG8_FRAG: {
- unsigned int board = frag - COIN_TRIG1_FRAG;
- // make sure that we have enough space
- if (board >= m_coincTrig.size()) {
- m_coincTrig.resize(board + 1);
- }
-
- TileBeamElemCollection::const_iterator beamItr = (*collItr)->begin();
- TileBeamElemCollection::const_iterator lastBeam = (*collItr)->end();
-
- // loop over 4 integer words for one board
- for (; beamItr != lastBeam; ++beamItr) {
-
- HWIdentifier id = (*beamItr)->adc_HWID();
- std::vector < uint32_t > digits = (*beamItr)->get_digits();
- uint32_t amplitude = (digits.size() > 0) ? digits[0] : 0;
- int cha = m_tileHWID->channel(id);
-
- if (cha < 3) {
- int idx = cha * 32;
- for (int ibit = 0; ibit < 32; ++ibit) {
- m_coincTrig[board].trig[idx++] = (amplitude >> ibit) & 1;
- }
- } else if (cha == 3) {
- m_coincTrig[board].amp = amplitude;
- }
- }
- }
- break;
-
- default:
- break;
- }
- }
- }
- /*
- for (unsigned int i=0; i<m_coincTrig.size(); ++i) {
- std::cout << "board "<<i+1<<" amp="<<m_coincTrig[i].amp<<std::endl;
- for (unsigned int j=0; j<96; ++j) {
- std::cout << m_coincTrig[i].trig[j];
- }
- std::cout << std::endl;
- }
- */
- // we are going to put TileTrigger to StoreGate
- if (!m_triggerContainerKey.key().empty()) {
-
- SG::WriteHandle<TileTriggerContainer> triggerContainer(m_triggerContainerKey);
- if (triggerContainer.record( std::make_unique<TileTriggerContainer>() ).isSuccess()) {
-
- int maxboard = m_coincTrig.size();
- if (maxboard > 0) {
- Identifier mtid;
- double mtsum(0.0);
- std::vector < Identifier > boardtid(maxboard);
- std::vector<double> boardtsum(maxboard);
- std::vector < Identifier > backtid(maxboard);
- std::vector<double> backtsum(maxboard);
-
- // FIXME:: convert coincTrig to TileTrigger
-
- TileTrigger* tileTrigger = new TileTrigger(mtid, mtsum, boardtid,
- boardtsum, backtid, backtsum);
- triggerContainer->push_back(tileTrigger);
- }
- } else {
- ATH_MSG_ERROR("failed to register the TileTrigger container: "
- << m_triggerContainerKey.key() << " in StoreGate");
-
- }
-
- }
-
- // we are going to put TileLaserObject to StoreGate
- if (!m_laserObjectKey.key().empty()) {
-
- SG::WriteHandle<TileLaserObject> laserObject(m_laserObjectKey);
- if(laserObject.record( std::make_unique<TileLaserObject>() ).isSuccess()) {
- laserObject->setBCID(m_BCID);
-
- // FIXME: a lot of set methods here
- // to copy m_laspar to TileLaserObject
-
- } else {
- ATH_MSG_ERROR("failed to register the TileLaserObject: "
- << m_laserObjectKey.key() << " in StoreGate");
- }
-
- }
-
- if (m_calibMode == 0xFFFFFFFF) {
-
- m_digiSize = 0;
-
- if (m_digitsCnt != NULL) {
- // Get iterator for all TDColl in TDCont
- TileDigitsContainer::const_iterator itColl = m_digitsCnt->begin();
- TileDigitsContainer::const_iterator itCollEnd = m_digitsCnt->end();
-
- bool found = false;
- bool isCalib = false;
- bool incomplete = false;
- for (; itColl != itCollEnd; ++itColl) {
- if (m_BCID == 0)
- m_BCID = (*itColl)->getRODBCID();
- incomplete |= ((*itColl)->size() < 48);
- if ((*itColl)->size() > 0) {
- int dsize = (*((*itColl)->begin()))->NtimeSamples();
- if (4 < dsize && dsize < 15) { // don't use strange fragments
- isCalib |= (*itColl)->isCalibMode();
- m_digiSize = dsize;
- found = true;
- }
- }
- }
- m_incompleteDigits = incomplete;
- if (found)
- m_calibMode = (isCalib) ? 1 : 0;
- m_DQstatus.setBiGain(isCalib);
- }
- }
-
- if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "BCID = " << m_BCID << endmsg;
- msg(MSG::VERBOSE) << "digi size = " << m_digiSize << endmsg;
- msg(MSG::VERBOSE) << "zero-suppressed digi container = " << m_incompleteDigits << endmsg;
-
- if (m_trigType < 0)
- msg(MSG::VERBOSE) << "trig type = " << m_trigType << " (Level-1 type) " << endmsg;
- else
- msg(MSG::VERBOSE) << "trig type = " << m_trigType
- << " (TileCal internal type) " << endmsg;
-
- msg(MSG::VERBOSE) << "calib mode = " << m_calibMode << endmsg;
- }
-
- // Set BCID in DQstatus object for explicit BCID check
- m_DQstatus.setRODBCID(m_BCID);
-
- if (m_simulateTrips) m_DQstatus.setFilled(false);
-
- if (m_evt == 0) {
- ATH_MSG_DEBUG("End of handling first BeginEvent incident");
- }
- ++m_evt;
-}
-
-uint32_t TileBeamInfoProvider::checkCalibMode(void) {
- // on demand - loop over all collection to check if
- // we are running in bi-gain mode
- if (m_digitsCnt != NULL) {
- bool found = false;
- bool calibMode = false;
- bool incomplete = false;
- // Get iterator for all TDColl in TDCont
- TileDigitsContainer::const_iterator itColl = m_digitsCnt->begin();
- TileDigitsContainer::const_iterator itCollEnd = m_digitsCnt->end();
-
- for (; itColl != itCollEnd; ++itColl) {
-
- incomplete |= ((*itColl)->size() < 48);
- if ((*itColl)->size() > 0) {
- calibMode |= (*itColl)->isCalibMode();
- found = true;
- }
- }
- m_incompleteDigits = incomplete;
- if (found)
- m_calibMode = (calibMode) ? 1 : 0;
- }
- return m_calibMode;
-}
-
-// returns DCS HV channel status
-bool TileBeamInfoProvider::isChanDCSgood(int partition, int drawer,
- int channel) const {
- if (m_checkDCS) {
- TileDCSState::TileDCSStatus status = m_tileDCS->getDCSStatus(partition, drawer, channel);
-
- if (status > TileDCSState::WARNING) {
- ATH_MSG_DEBUG("Module=" << TileCalibUtils::getDrawerString(partition, drawer)
- << " channel=" << channel
- << " masking becasue of bad DCS status=" << status);
- return false;
- } else {
- return true;
- }
- }
- return true;
-}
-
-// returns pointer to TileDQstatus and calls function to fill the data members if it's not filled yet
-const TileDQstatus * TileBeamInfoProvider::getDQstatus() {
-
- // return immediately if it's filled already
- if (m_DQstatus.isFilled())
- return &m_DQstatus;
-
- //Fill BCID from the EventInfo, if available
- SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
- if (eventInfo.isValid()) {
- m_DQstatus.setRODBCID(eventInfo->bcid());
- }
-
- if (m_rcCnt != NULL) {
-
- if (m_digitsCnt != NULL) {
-
- TileDigitsContainer::const_iterator collItr = m_digitsCnt->begin();
- TileDigitsContainer::const_iterator lastColl = m_digitsCnt->end();
-
- for (; collItr != lastColl; collItr++) {// Loop over TileModules
- int frag = (*collItr)->identify();
- int partition = (frag >> 8);
- int drawer = (frag & 0x3F);
-
- std::vector < uint32_t > data = (*collItr)->getFragChipHeaderWords();
- unsigned int dataSize = std::min(16u, (unsigned int) data.size());
- for (unsigned int dmu = 0; dmu < dataSize; ++dmu) {
- if (data[dmu] == 0xFFFFFFFF)
- m_DQstatus.setEmptyEvent(partition, drawer, dmu, 0, 1);
- }
-
- data = (*collItr)->getFragChipHeaderWordsHigh();
- dataSize = std::min(16u, (unsigned int) data.size());
- for (unsigned int dmu = 0; dmu < dataSize; ++dmu) {
- if (data[dmu] == 0xFFFFFFFF)
- m_DQstatus.setEmptyEvent(partition, drawer, dmu, 1, 1);
- }
- }
- } // end if m_checkDigi
-
- TileFragHash::TYPE RChType = m_rcCnt->get_type();
- if (RChType != TileFragHash::OptFilterDsp
- && RChType != TileFragHash::OptFilterDspCompressed) {
- ATH_MSG_INFO("RawChannelContainer didn't come from BS - don't check DQ flags");
- ATH_MSG_INFO("RChType = " << RChType);
- m_DQstatus.setAllGood();
- m_checkDQ = false;
- } else {
- TileRawChannelContainer::const_iterator itColl = m_rcCnt->begin();
- TileRawChannelContainer::const_iterator itCollEnd = m_rcCnt->end();
-
- // Go through all TileRawChannelCollections
- for (; itColl != itCollEnd; ++itColl) {
- const TileRawChannelCollection *coll = (*itColl);
- ATH_MSG_VERBOSE("RCh collection 0x" << MSG::hex
- << coll->identify() << MSG::dec
- << " size=" << coll->size());
-
- m_DQstatus.fillArrays(coll, m_digitsCnt, 0);
- m_DQstatus.fillArrays(coll, m_digitsCnt, 1);
- }
- if (m_evt == 1 && m_DQstatus.nonZeroCounter() == 0) {
- ATH_MSG_INFO("all DQ elements are empty - don't check DQ flags");
- m_DQstatus.setAllGood();
- m_checkDQ = false;
- } else {
- ATH_MSG_DEBUG("BiGain mode: " << ((m_DQstatus.isBiGain()) ? "true" : "false"));
- }
- }
- }
-
-
- if (m_simulateTrips) {
- for (unsigned int partition = 1; partition < TileCalibUtils::MAX_ROS; ++partition) {
- CLHEP::RandFlat::shootArray(m_pHRengine, TileCalibUtils::MAX_DRAWER, m_rndmVec);
- std::vector<float> trips = m_tileBadChanTool->getTripsProbabilities(partition);
- m_DQstatus.fillTrips(partition, trips, m_rndmVec, this->msg());
- }
- }
-
- m_DQstatus.setFilled(true);
- return &m_DQstatus;
-}
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
index eed93cbeee3..ff4a67c367a 100644
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
+++ b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
@@ -6,7 +6,6 @@
#include "TileRecUtils/TileRawChannelBuilderQIEFilter.h"
#include "TileRecUtils/TileRawChannelBuilderManyAmps.h"
#include "TileRecUtils/TileRawChannelBuilderMF.h"
-#include "TileRecUtils/TileBeamInfoProvider.h"
#include "TileRecUtils/TileCellBuilder.h"
#include "TileRecUtils/TileCellBuilderFromHit.h"
#include "TileRecUtils/TileCellFakeProb.h"
@@ -36,7 +35,6 @@ DECLARE_COMPONENT( TileRawChannelBuilderOpt2Filter )
DECLARE_COMPONENT( TileRawChannelBuilderQIEFilter )
DECLARE_COMPONENT( TileRawChannelBuilderManyAmps )
DECLARE_COMPONENT( TileRawChannelBuilderMF )
-DECLARE_COMPONENT( TileBeamInfoProvider )
DECLARE_COMPONENT( TileCellBuilder )
DECLARE_COMPONENT( TileCellBuilderFromHit )
DECLARE_COMPONENT( TileCellFakeProb )
--
GitLab