diff --git a/Calorimeter/CaloInterface/CaloInterface/CaloInterfaceDict.h b/Calorimeter/CaloInterface/CaloInterface/CaloInterfaceDict.h
index 79e4334066eb3d658422e283f1cb6b6e4dcd7ebe..77c4c5a29c96a0127e0d6a08f70d588334001d5c 100644
--- a/Calorimeter/CaloInterface/CaloInterface/CaloInterfaceDict.h
+++ b/Calorimeter/CaloInterface/CaloInterface/CaloInterfaceDict.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOINTERFACE_CALOINTERFACEDICT_H
@@ -13,7 +13,6 @@
#include "CaloInterface/ICaloNoiseTool.h"
#include "CaloInterface/ICalorimeterNoiseTool.h"
#include "CaloInterface/ICaloAffectedTool.h"
-#include "CaloInterface/ICaloLumiBCIDTool.h"
#endif
diff --git a/Calorimeter/CaloInterface/CaloInterface/ICaloLumiBCIDTool.h b/Calorimeter/CaloInterface/CaloInterface/ICaloLumiBCIDTool.h
deleted file mode 100755
index a7c1e57d4fd6992c7ae0fc3790496717b76f161d..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloInterface/CaloInterface/ICaloLumiBCIDTool.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef CALOINTERFACE_ICaloLumiBCIDTool_H
-#define CALOINTERFACE_ICaloLumiBCIDTool_H
-
-// Includes for Gaudi
-#include "GaudiKernel/IAlgTool.h"
-
-#include "AthenaKernel/IOVSvcDefs.h"
-
-#include "Identifier/Identifier.h"
-
-class CaloDetDescrElement;
-class CaloCell;
-
-class ICaloLumiBCIDTool: virtual public IAlgTool
-{
-public:
-
- static const InterfaceID& interfaceID() {
- static const InterfaceID IID_ICaloLumiBCIDTool("ICaloLumiBCIDTool", 1 , 0);
- return IID_ICaloLumiBCIDTool;
- }
-
-
- virtual float average(const CaloCell* caloCell, unsigned int bcid)=0;
-
- virtual float average(const CaloDetDescrElement* caloDDE, unsigned int bcid)=0;
-
- virtual float average(const Identifier cellID, unsigned int bcid)=0;
-
- virtual StatusCode LoadCalibration(IOVSVC_CALLBACK_ARGS) = 0;
-
-};
-
-#endif
diff --git a/Calorimeter/CaloInterface/CaloInterface/selection.xml b/Calorimeter/CaloInterface/CaloInterface/selection.xml
index 239b12fe5945d1a07cd0fc9f9cee0740fb72957c..40ffb6dbd91fcfdf8fa70e226356ea502c39e8a6 100644
--- a/Calorimeter/CaloInterface/CaloInterface/selection.xml
+++ b/Calorimeter/CaloInterface/CaloInterface/selection.xml
@@ -6,6 +6,5 @@
<class name="ICaloMBAverageTool" />
<class name="ICaloCellNormalizedQualityTool" />
<class name="ICaloAffectedTool" />
-<class name="ICaloLumiBCIDTool" />
</lcgdict>
diff --git a/Calorimeter/CaloInterface/doc/packagedoc.h b/Calorimeter/CaloInterface/doc/packagedoc.h
index 5349a11f0640c5873314cc18af88aa8669533e80..a5c6dae429818b0e6c3f7105090c897a9534601d 100644
--- a/Calorimeter/CaloInterface/doc/packagedoc.h
+++ b/Calorimeter/CaloInterface/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -30,6 +30,5 @@ reconstruction
- IHadronicCalibrationTool.h : extends ICellWeightTool for more refined hadronic calibration information
- ICaloAffectedTool.h : interface for tool providing affected region info for a given 4 momentum object
- ICaloCellNormalizedQualityTool.h : interface for tool computing a normalized pulse shape quality from the raw quality
- - ICaloLumiBCIDTool.h : interface for tool computing BCID dependent pileup offset corrections
*/
diff --git a/Calorimeter/CaloTools/CaloTools/CaloLumiBCIDTool.h b/Calorimeter/CaloTools/CaloTools/CaloLumiBCIDTool.h
deleted file mode 100644
index daeab30b66c8422be418dd8b1399a8bacc3a8ad0..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTools/CaloTools/CaloLumiBCIDTool.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-//Dear emacs, this is -*-c++-*-
-
-/**
- @class CaloLumiBCIDTool
- @brief Tool to provide expected pedestal shift for Pileup from first principle computation (relevant for non 25ns bunch spacing)
- @author G.Unal
-*/
-
-#ifndef CALOTOOLS_CaloLumiBCIDTool_H
-#define CALOTOOLS_CaloLumiBCIDTool_H
-
-class Identifier;
-class StoreGateSvc;
-class CaloIdManager;
-class CaloCell_ID;
-class CaloDetDescrElement;
-
-#include "LArElecCalib/ILArShape.h"
-#include "LArElecCalib/ILArMinBiasAverage.h"
-#include "LArElecCalib/ILArOFC.h"
-#include "LArElecCalib/ILArOFCTool.h"
-#include "LArElecCalib/ILArMCSymTool.h"
-#include "LArIdentifier/LArOnlineID.h"
-#include "LArCabling/LArCablingLegacyService.h"
-
-#include "LumiBlockComps/ILuminosityTool.h"
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "StoreGate/DataHandle.h"
-#include "CaloInterface/ICaloLumiBCIDTool.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-
-
-class CaloLumiBCIDTool: public AthAlgTool,
- virtual public ICaloLumiBCIDTool, virtual public IIncidentListener
-{
-private:
-
-//Database
-
- const DataHandle<ILArShape> m_dd_shape;
- const DataHandle<ILArMinBiasAverage> m_dd_minbiasAverage;
- const DataHandle<ILArOFC> m_dd_ofc;
- ToolHandle<LArCablingLegacyService> m_cablingService;
- ToolHandle<ILArMCSymTool> m_larmcsym;
- ToolHandle<ILArOFCTool> m_OFCTool;
- ToolHandle<ILuminosityTool> m_lumiTool;
- ToolHandle<Trig::IBunchCrossingTool> m_bunchCrossingTool;
-
- const LArOnlineID* m_lar_on_id;
- const CaloIdManager* m_caloIdMgr;
- const CaloCell_ID* m_calocell_id;
-
-
- bool m_isMC;
- std::string m_keyShape, m_keyMinBiasAverage, m_keyOFC;
-
- unsigned int m_bcidMax;
- int m_ncell;
- unsigned int m_bcid;
- int m_firstSampleEMB;
- int m_firstSampleEMEC;
- int m_firstSampleHEC;
- int m_firstSampleFCAL;
-
-
- mutable bool m_cacheValid;
-
- //Internal cache:
- std::vector<HWIdentifier> m_hwid_sym;
- std::vector<float> m_eshift_sym;
- std::vector<int> m_symCellIndex;
-
- std::vector<float> m_lumiVec;
- std::vector<float> m_minBias;
- std::vector<unsigned int> m_first;
- std::vector<char> m_isOnl;
-
- std::vector< std::vector< float > > m_shape;
- std::vector< std::vector< float > > m_OFC;
-
-
-//Functions
- StatusCode initialize();
-
- virtual StatusCode LoadCalibration(IOVSVC_CALLBACK_ARGS);
-
- void handle(const Incident& inc);
-
- void getListOfCells();
-
- StatusCode computeValues(unsigned int bcid);
-
- void accumulateLumi(const unsigned int bcid, const float xlumiMC);
-
-public:
-
- CaloLumiBCIDTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
- virtual ~CaloLumiBCIDTool();
-
- float average(const CaloCell* caloCell, unsigned int bcid);
-
- float average(const CaloDetDescrElement* caloDDE,unsigned int bcid);
-
- float average(const Identifier caloDDE,unsigned int bcid);
-};
-
-#endif
diff --git a/Calorimeter/CaloTools/python/CaloLumiBCIDToolDefault.py b/Calorimeter/CaloTools/python/CaloLumiBCIDToolDefault.py
deleted file mode 100644
index fe9a094661f8a6c4bc1a305bd40db0acff99e132..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTools/python/CaloLumiBCIDToolDefault.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import *
-
-def CaloLumiBCIDToolDefault(name='CaloLumiBCIDToolDefault'):
- mlog = logging.getLogger( 'CaloLumiBCIDToolDefault' )
-
- from CaloTools.CaloToolsConf import CaloLumiBCIDTool
- from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-
- from AthenaCommon.GlobalFlags import globalflags
- if globalflags.DataSource()=='data':
- from LumiBlockComps.LuminosityToolDefault import LuminosityToolDefault
- theLumiTool = LuminosityToolDefault()
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += theLumiTool
- from IOVDbSvc.CondDB import conddb
- #conddb.addFolder("","/LAR/ElecCalibOfl/LArPileupShape<db>sqlite://;schema=/afs/cern.ch/user/g/gunal/public/DB/bcid/shape.db;dbname=COMP200</db><key>LArShape32</key><tag>LARElecCalibOflLArPileupShape-mc</tag>")
- #conddb.addFolder("","/LAR/ElecCalibOfl/LArPileupAverage<db>sqlite://;schema=/afs/cern.ch/user/g/gunal/public/DB/bcid/LArPileupAverage-data.db;dbname=COMP200</db><tag>LARElecCalibOflLArPileupAverage-data11-00</tag>")
- if athenaCommonFlags.isOnline:
- conddb.addFolder("LAR_ONL","/LAR/LArPileup/LArPileupShape<key>LArShape32</key>")
- conddb.addFolder("LAR_ONL","/LAR/LArPileup/LArPileupAverage")
- else:
- conddb.addFolder("LAR_OFL","/LAR/ElecCalibOfl/LArPileupShape<key>LArShape32</key>")
- conddb.addFolder("LAR_OFL","/LAR/ElecCalibOfl/LArPileupAverage")
- theTool = CaloLumiBCIDTool(name,isMC=False,LumiTool=theLumiTool,keyShape="LArShape32")
- else:
- from LArRecUtils.LArOFCToolDefault import LArOFCToolDefault
- theOFCTool = LArOFCToolDefault()
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += theOFCTool
- from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
- theBunchCrossingTool = BunchCrossingTool()
- from IOVDbSvc.CondDB import conddb
- conddb.addFolder("LAR_OFL","/LAR/ElecCalibMC/Shape")
- #conddb.addFolder("","/LAR/ElecCalibMC/LArPileupAverage<db>sqlite://;schema=/afs/cern.ch/user/g/gunal/public/DB/bcid/LArPileupAverage-mc.db;dbname=OFLP200</db><tag>LARElecCalibMCLArPileupAverage-mc11b-00</tag>")
- conddb.addFolder("LAR_OFL","/LAR/ElecCalibMC/LArPileupAverage")
- theTool = CaloLumiBCIDTool(name,
- isMC=True,
- LArOFCTool = theOFCTool,BunchCrossingTool = theBunchCrossingTool)
- return theTool
diff --git a/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx b/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx
deleted file mode 100644
index ec5e783c7f3afc0467b9dd19174eae3349bac14c..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CaloTools/CaloLumiBCIDTool.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "CaloEvent/CaloCell.h"
-#include "CaloIdentifier/CaloCell_ID.h"
-#include "CaloIdentifier/CaloIdManager.h"
-//#include "xAODEventInfo/EventID.h"
-#include "xAODEventInfo/EventInfo.h"
-#include <sys/time.h>
-
-//#define DONTDO
-
-CaloLumiBCIDTool::CaloLumiBCIDTool (const std::string& type,
- const std::string& name,
- const IInterface* parent) :
- AthAlgTool(type, name, parent),
- m_cablingService("LArCablingLegacyService"),
- m_larmcsym("LArMCSymTool"),
- m_OFCTool("LArOFCTool"),
- m_lumiTool("LuminosityTool"),
- m_bunchCrossingTool("BunchCrossingTool"),
- m_lar_on_id(nullptr),
- m_caloIdMgr(nullptr),
- m_calocell_id(nullptr),
- m_isMC(false),
- m_keyShape("LArShape"), m_keyMinBiasAverage("LArPileupAverage"),m_keyOFC("LArOFC"),
- m_bcidMax(3564),
- m_ncell(0),
- m_bcid(0xFFFF), //Larger than m_bcidmax
- m_firstSampleEMB(0),
- m_firstSampleEMEC(0),
- m_firstSampleHEC(1),
- m_firstSampleFCAL(0),
- m_cacheValid(false)
-{
- declareInterface<ICaloLumiBCIDTool>(this);
- declareProperty("LArOFCTool",m_OFCTool,"Tool handle for OFC");
- declareProperty("LumiTool",m_lumiTool,"Tool handle for Luminosity");
- declareProperty("BunchCrossingTool",m_bunchCrossingTool,"Tool handle for bunch crossing tool");
- declareProperty("isMC",m_isMC);
- declareProperty("keyShape",m_keyShape);
- declareProperty("keyMinBiasAverge",m_keyMinBiasAverage);
- declareProperty("keyOFC",m_keyOFC);
- declareProperty("firstSampleEMB",m_firstSampleEMB,"First sample EMB in 4 samples mode");
- declareProperty("firstSampleEMEC",m_firstSampleEMEC,"First sample EMEC in 4 samples mode");
- declareProperty("firstSampleHEC",m_firstSampleHEC,"First sample HEC in 4 samples mode");
- declareProperty("firstSampleFCAL",m_firstSampleFCAL,"First sample FCAL in 4 samples mode");
-}
-
-//-----------------------------------------------------------------
-
-CaloLumiBCIDTool::~CaloLumiBCIDTool() {}
-
-
-//-------------------------------------------------------------------
-
-StatusCode CaloLumiBCIDTool::initialize() {
-
- ATH_MSG_INFO( " initialize " );
-
- IIncidentSvc* incSvc = nullptr;
- ATH_CHECK( service( "IncidentSvc", incSvc ) );
- long int priority=100;
- incSvc->addListener(this,"BeginEvent",priority);
-
-
- m_lumiVec.reserve(m_bcidMax);
- m_lumiVec.assign(m_bcidMax,0.0);
-
-// callback for Shape
-
- ATH_CHECK( detStore()->regFcn(&ICaloLumiBCIDTool::LoadCalibration,
- dynamic_cast<ICaloLumiBCIDTool*>(this),
- m_dd_shape,m_keyShape,true) );
- ATH_MSG_INFO( "Registered callback for key: "<< m_keyShape );
-
-// callback for MinBiasAverage
-
- ATH_CHECK( detStore()->regFcn(&ICaloLumiBCIDTool::LoadCalibration,
- dynamic_cast<ICaloLumiBCIDTool*>(this),
- m_dd_minbiasAverage,m_keyMinBiasAverage,true) );
- ATH_MSG_INFO( "Registered callback for key: " << m_keyMinBiasAverage );
-
- ATH_CHECK( m_cablingService.retrieve() );
-
-
-// get OFC tool and register callback
-
- if (m_isMC) {
- ATH_CHECK( m_OFCTool.retrieve() );
- ATH_MSG_DEBUG( " -- LArOFCTool retrieved" );
-
- ATH_CHECK( detStore()->regFcn(&ILArOFCTool::LoadCalibration,&(*m_OFCTool),
- &ICaloLumiBCIDTool::LoadCalibration,dynamic_cast<ICaloLumiBCIDTool*>(this),true) );
- ATH_MSG_INFO( "Registered callbacks for LArOFCTool -> CaloLumiBCIDTool" );
-
- } else {
- ATH_CHECK( detStore()->regFcn(&ICaloLumiBCIDTool::LoadCalibration,
- dynamic_cast<ICaloLumiBCIDTool*>(this),
- m_dd_ofc,m_keyOFC,true) );
- ATH_MSG_INFO( "Registered callback for key: " << m_keyOFC );
- m_OFCTool.disable();
- }
-
-// get LumiTool
- if (m_isMC) {
- ATH_CHECK( m_bunchCrossingTool.retrieve() );
- ATH_MSG_DEBUG(" -- bunch crossing Tool retrieved");
- m_lumiTool.disable();
-
- } else {
- ATH_CHECK( m_lumiTool.retrieve() );
- ATH_MSG_DEBUG(" -- Lumi Tool retrieved");
- m_bunchCrossingTool.disable();
- }
-
- //
- ATH_CHECK( m_larmcsym.retrieve() );
- ATH_MSG_DEBUG(" -- LArMCSmy tool retrieved ");
-
- ATH_CHECK( detStore()->retrieve(m_lar_on_id,"LArOnlineID") );
- ATH_CHECK( detStore()->retrieve( m_caloIdMgr ) );
- m_calocell_id = m_caloIdMgr->getCaloCell_ID();
-
- return StatusCode::SUCCESS;
-}
-
-//------------------------------------------------------------------------------------------------------------------------------
-
-void CaloLumiBCIDTool::getListOfCells()
-{
- m_ncell = m_calocell_id->calo_cell_hash_max();
-
- m_symCellIndex.resize(m_ncell,-1);
- m_hwid_sym.reserve(2000);
- m_eshift_sym.reserve(2000);
- std::vector<int> doneCell;
- doneCell.resize(m_ncell,-1);
-
- int nsym=0;
- for (int i=0;i<m_ncell;i++) {
- IdentifierHash idHash=i;
- Identifier id=m_calocell_id->cell_id(idHash);
- if (m_calocell_id->is_tile(id)) continue;
- // convert cell id to symetric identifier
- HWIdentifier hwid2=m_larmcsym->symOnline(id);
- Identifier id2 = m_cablingService->cnvToIdentifier(hwid2);
- int i2 = (int) (m_calocell_id->calo_cell_hash(id2));
- // we have already processed this hash => just need to associate cell i to the same symetric cell
- if (doneCell[i2]>=0) {
- m_symCellIndex[i]=doneCell[i2];
- }
- // we have not already processed this hash, add an entry for this new symmetric cell
- else {
- doneCell[i2]=nsym;
- m_symCellIndex[i] = nsym;
- m_hwid_sym.push_back(hwid2);
- m_eshift_sym.push_back(0.);
- nsym++;
- }
- }
-
- //std::cout << " --- number of symmetric cells found " << nsym << std::endl;
-
- //for (int i=0;i<m_ncell;i++) {
- // IdentifierHash idHash=i;
- // Identifier id=m_calocell_id->cell_id(idHash);
- // std::cout << " Calo cell " << m_calocell_id->show_to_string(id) << " sym index " << m_symCellIndex[i] << " symmetric hwid " << m_lar_on_id->show_to_string(m_hwid_sym[m_symCellIndex[i]]) << std::endl;
- //}
-
-
- m_minBias.reserve(2000);
- m_minBias.clear();
- m_minBias.assign(2000,0.0);
- m_first.reserve(2000);
- m_first.clear();
- m_first.assign(2000,0.0);
- m_isOnl.reserve(2000);
- m_isOnl.clear();
- m_isOnl.assign(2000,0.0);
-
- m_shape.reserve(2000);
- m_OFC.reserve(2000);
-
- m_shape.clear();
- m_OFC.clear();
-
- std::vector<float> vec;
-
-
- std::vector<HWIdentifier>::iterator it = m_hwid_sym.begin();
- std::vector<HWIdentifier>::iterator it_end = m_hwid_sym.end();
- int index=0;
- unsigned int ns = 32;
- unsigned int nsofc = 32;
- for(;it!=it_end;++it) {
- const HWIdentifier id = *it;
- m_minBias.push_back(0);
- m_first.push_back(0);
- m_isOnl.push_back(0);
- if(m_cablingService->isOnlineConnected(id)) {
- // get MinBiasAverage
- float MinBiasAverage = m_dd_minbiasAverage->minBiasAverage(id);
- m_minBias[index]=MinBiasAverage;
- m_isOnl[index]=1;
-
- unsigned int ifirst= 0;
- if (m_lar_on_id->isEMBchannel(id)) ifirst=m_firstSampleEMB;
- if (m_lar_on_id->isEMECchannel(id)) ifirst=m_firstSampleEMEC;
- if (m_lar_on_id->isHECchannel(id)) ifirst=m_firstSampleHEC;
- if (m_lar_on_id->isFCALchannel(id)) ifirst=m_firstSampleFCAL;
- m_first[index] = ifirst;
-
- // get Shape
- ILArShape::ShapeRef_t Shape = m_dd_shape->Shape(id,0);
- ns = Shape.size();
- std::vector<float> s;
- for(unsigned int i = 0 ; i<ns ; i++) s.push_back(Shape[i]);
- m_shape.push_back(s);
-
- // get OFC
- ILArOFCTool::OFCRef_t OFC;
- if (m_isMC) OFC = m_OFCTool->OFC_a(id,0) ;
- else OFC = m_dd_ofc->OFC_a(id,0,0);
- nsofc = OFC.size();
- std::vector<float> sofc;
- for(unsigned int i = 0 ; i<nsofc ; i++) sofc.push_back(OFC[i]);
- m_OFC.push_back(sofc);
-
- } else {
- std::vector<float> s;
- for(unsigned int i = 0 ; i<ns ; i++) s.push_back(0);
- m_shape.push_back(s);
- std::vector<float> sofc;
- for(unsigned int i = 0 ; i<nsofc ; i++) sofc.push_back(0);
- m_OFC.push_back(sofc);
- }
- index++;
- }
-
-
- return;
-}
-
-//-------------------------------------------------------------------------------------
-
-StatusCode CaloLumiBCIDTool::LoadCalibration(IOVSVC_CALLBACK_ARGS_K(keys)) {
-
- ATH_MSG_INFO( "Callback invoked for " << keys.size() << " keys " );
-
- m_cacheValid=false;
- return StatusCode::SUCCESS;
-}
-
-//---------------------------------------------------------
-
-void CaloLumiBCIDTool::handle(const Incident& inc) {
-
- if (inc.type()!="BeginEvent") return;
-
- //std::cout << " in CaloLumiBCIDTool event handle " << std::endl;
- m_cacheValid=false;
- return;
-
-}
-
-
-//----------------------------------------------------------------------------------------
-
-StatusCode CaloLumiBCIDTool::computeValues(unsigned int bcid)
-{
-
- if (m_ncell==0) getListOfCells();
-
-// get mu value and convert to luminosity for MC
- float xlumiMC=0.;
- if (m_isMC) {
- const xAOD::EventInfo* eventInfo;
- if (! evtStore()->retrieve(eventInfo).isSuccess() ) {
- ATH_MSG_WARNING( " Event info not found in event store . Pileup offsets computed for 0 lumi " );
- }
- else {
- xlumiMC = eventInfo->averageInteractionsPerCrossing()*0.158478605; // convert from mu/bunch to lumi in 10**30 units per bunch
- // 25ns*Nbcid*71mb*10**30 = 25e-9*3564*71e-27*1e30 = 6.31 Use 1/6.31 = 0.158478605
- //std::cout << " mu and xlumiMC for this bcid " << eventInfo->averageInteractionsPerCrossing() << " " << xlumiMC << std::endl;
- }
- }
-
- if (bcid==0) {
- const xAOD::EventInfo* eventInfo;
- if (! evtStore()->retrieve(eventInfo).isSuccess() ) {
- ATH_MSG_WARNING( " Event info not found in event store . Pileup offsets computed for bcid=1 " );
- std::cout << " Event info not found in event store . Pileup offsets computed for bcid=1 " << std::endl;
- bcid=1;
- }
- else {
- //const EventID* myEventID=eventInfo->event_ID();
- bcid = eventInfo->bcid();
- }
- }
-
- // Calculate Luminosity values ONLY around the places Luminosity will be needed
- accumulateLumi(bcid,xlumiMC);
- //std::cout << " start loop over cells bcid= " << bcid << std::endl;
- //if (!m_isMC) std::cout << " lumi for this bcid " << m_lumiTool->lbLuminosityPerBCID(bcid) << std::endl;
- size_t total = m_hwid_sym.size();
-
- if ( (bcid > 34) && (bcid < m_bcidMax-34)) { // Not close to bcid boundary
-
- for(int index=0 ; index<(int)total; index++) {
- //const HWIdentifier id = *it;
- //std::cout << " Identifier " << m_lar_on_id->show_to_string(id) << std::endl;
- float eOFC=0.;
- if(m_isOnl[index]) {
-
- // get MinBiasAverage
- float MinBiasAverage = m_minBias[index];
-
- if (MinBiasAverage<0.) MinBiasAverage=0.;
-
- std::vector<float>& ofc = m_OFC[index];
- std::vector<float>& samp = m_shape[index];
- unsigned int nsamples = ofc.size();
-
- // choise of first sample : i.e sample on the pulse shape to which first OFC sample is applied
- unsigned int ifirst= 0;
- if (nsamples==4) ifirst = m_first[index];
-
-
- unsigned int nshapes = samp.size();
- if (nshapes < nsamples) {
- // ATH_MSG_ERROR( " Not enough samples in Shape " << nshapes << " less than in OFC " << nsamples );
- return StatusCode::FAILURE;
- }
-
- unsigned int ishift = ifirst + bcid ; // correct for first sample
- for (unsigned int i=0;i<nsamples;i++) {
- float sumShape=0.;
- //unsigned int ishift = i + ifirst + bcid ; // correct for first sample
- unsigned int k = ishift;
- for (unsigned int j=0;j<nshapes;j++) {
- float lumi = m_lumiVec[k];
- sumShape += samp[j]*lumi;
- k--;
- }
- eOFC += sumShape * (ofc[i] );
- ishift++;
- }
- eOFC = eOFC * MinBiasAverage;
- } // connected cell
- else {
- //std::cout << " disconnected cell ? " << std::endl;
- eOFC=0.;
- }
-
- //std::cout << " index, eOFC " << index << " " << eOFC << std::endl;
- m_eshift_sym[index]=eOFC;
-
- } // loop over cells
-
-
- } else { // I am close to the boundary
-
- for(int index=0 ; index<(int)total; index++) {
- //const HWIdentifier id = *it;
- //std::cout << " Identifier " << m_lar_on_id->show_to_string(id) << std::endl;
- float eOFC=0.;
- if(m_isOnl[index]) {
-
- // get MinBiasAverage
- float MinBiasAverage = m_minBias[index];
- //float MinBiasAverage=1.;
-
- if (MinBiasAverage<0.) MinBiasAverage=0.;
-
- std::vector<float>& ofc = m_OFC[index];
- std::vector<float>& samp = m_shape[index];
- unsigned int nsamples = ofc.size();
-
- // choise of first sample : i.e sample on the pulse shape to which first OFC sample is applied
- unsigned int ifirst= 0;
- if (nsamples==4) ifirst = m_first[index];
-
-
- unsigned int nshapes = samp.size();
- if (nshapes < nsamples) {
- // ATH_MSG_ERROR( " Not enough samples in Shape " << nshapes << " less than in OFC " << nsamples );
- return StatusCode::FAILURE;
- }
-
- for (unsigned int i=0;i<nsamples;i++) {
- float sumShape=0.;
- unsigned int ishift = i + ifirst ; // correct for first sample
- for (unsigned int j=0;j<nshapes;j++) {
- unsigned int k;
- if ((bcid+ishift)<j) k = m_bcidMax+bcid+ishift-j;
- else if ((bcid+ishift)>=(m_bcidMax+j)) k = ishift-j+bcid-m_bcidMax;
- else k = bcid+ishift-j;
- float lumi = m_lumiVec[k];
-
- sumShape += samp[j]*lumi;
- }
- eOFC += sumShape* (ofc[i] );
- }
- //std::cout << std::endl;
- eOFC = eOFC * MinBiasAverage;
- } // connected cell
- else {
- //std::cout << " disconnected cell ? " << std::endl;
- eOFC=0.;
- }
-
- //std::cout << " index, eOFC " << index << " " << eOFC << std::endl;
- m_eshift_sym[index]=eOFC;
-
- } // loop over cells
-
- } // end of the check bcid boundary
-
-#ifdef DONTDO // some debug code, please, ignore
- std::cout << "BCIDTool: corrections for BCID : " << bcid << std::endl;
- for(unsigned index1=0 ; index1<total; index1++) {
- if ( fabsf(1e9*(m_eshift_sym[index1]) ) > 0.001 ){
- unsigned id32= m_hwid_sym[index1].get_identifier32().get_compact();
- std::cout << "Tool BCID " << bcid << " ,cell [" << id32 <<"] = " <<(double)(m_eshift_sym[index1])
- << std::endl;
- }
- }
-#endif
-
-
- m_cacheValid=true;
- m_bcid = bcid;
-
- return StatusCode::SUCCESS;
-}
-
-//-------------------------------------------------
-
-float CaloLumiBCIDTool::average(const CaloCell* caloCell,unsigned int bcid)
-{
- return this->average(caloCell->caloDDE(),bcid);
-
-}
-
-//-------------------------------------------------
-
-float CaloLumiBCIDTool::average(const CaloDetDescrElement* caloDDE,unsigned int bcid)
-{
- if (bcid != m_bcid && bcid !=0 ) m_cacheValid=false;
- if (!m_cacheValid) {
- StatusCode sc = this->computeValues(bcid);
- if (sc.isFailure()) return 0.;
- }
- // const Identifier CellID = caloDDE->identify();
- //if (m_calocell_id->is_tile(CellID)) return 0.;
-
- if (caloDDE->is_tile()) return 0;
- int i2 = (int) caloDDE->calo_hash();//(m_calocell_id->calo_cell_hash(CellID));
- if (i2>=m_ncell) return 0.;
- unsigned int index = m_symCellIndex[i2];
- if (index>=m_eshift_sym.size()) return 0.;
- return m_eshift_sym[index];
-}
-
-//-------------------------------------------------
-
-float CaloLumiBCIDTool::average(const Identifier CellID,unsigned int bcid)
-{
- if (bcid != m_bcid && bcid !=0 ) m_cacheValid=false;
- if (!m_cacheValid) {
- StatusCode sc = this->computeValues(bcid);
- if (sc.isFailure()) return 0.;
- }
-
- if (m_calocell_id->is_tile(CellID)) return 0.;
- int i2 = (int) (m_calocell_id->calo_cell_hash(CellID));
- if (i2>=m_ncell) return 0.;
- unsigned int index = m_symCellIndex[i2];
- if (index>=m_eshift_sym.size()) return 0.;
- return m_eshift_sym[index];
-}
-
-void CaloLumiBCIDTool::accumulateLumi(const unsigned int bcid, const float xlumiMC) {
-
- //m_lumiVec.clear();
- unsigned int keep_samples=32;
- unsigned int keep_ofcsamples=32;
- if ( (bcid > keep_samples+5) && (bcid < m_bcidMax-keep_ofcsamples-5)) {
-
- unsigned int a=bcid-(keep_samples+4);
- unsigned int b=bcid+(keep_ofcsamples+4);
- for(unsigned int i=a;i<b;i++){
- float lumi=0.0;
- if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
- m_lumiVec[i]=(lumi);
- }
-
- } else {
-
- int a=bcid-(keep_samples+4);
- if ( a < 0 ) a=0;
- unsigned int b=bcid+(keep_ofcsamples+4);
- if ( b >= m_bcidMax ) b=m_bcidMax;
- for(unsigned int i=(unsigned int)a;i<b;i++){
- float lumi=0.0;
- if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
- m_lumiVec[i]=(lumi);
- }
-
- for(unsigned int i=0;i<keep_ofcsamples+4;i++){
- float lumi=0.0;
- if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
- m_lumiVec[i]=(lumi);
- }
- for(unsigned int i=m_bcidMax-keep_samples-5;i<m_bcidMax;i++){
- float lumi=0.0;
- if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
- m_lumiVec[i]=(lumi);
- }
-
- }
-
-}
diff --git a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
index dc1041587c0f7bf813bd0f906eff450d34fe725b..22737720591cdb15f5727dbffd13bb53b096e347 100644
--- a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
+++ b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
@@ -4,7 +4,6 @@
#include "CaloTools/SimpleNoiseTool.h"
#include "CaloTools/SimpleNoiseToolFromTextFile.h"
#include "CaloTools/CaloAffectedTool.h"
-#include "CaloTools/CaloLumiBCIDTool.h"
#include "../CaloNoiseCondAlg.h"
DECLARE_COMPONENT( CaloNoiseTool )
@@ -13,5 +12,4 @@ DECLARE_COMPONENT( CaloNoiseToolDB )
DECLARE_COMPONENT( SimpleNoiseTool )
DECLARE_COMPONENT( SimpleNoiseToolFromTextFile )
DECLARE_COMPONENT( CaloAffectedTool )
-DECLARE_COMPONENT( CaloLumiBCIDTool )
DECLARE_COMPONENT( CaloNoiseCondAlg )