From f0e1c82b61ee145adddd797cfaf55790518e2477 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Tue, 17 Nov 2020 10:03:07 +0100 Subject: [PATCH] DPDUtils: delete obsolete package Package only contains one obsolete "tagging" tool and other unused job options and python modules. Package has not seen updates in a long time. --- PhysicsAnalysis/DPDUtils/CMakeLists.txt | 44 ----- .../DPDUtils/DPDUtils/DPDTagTool.h | 54 ------ PhysicsAnalysis/DPDUtils/doc/packagedoc.h | 18 -- PhysicsAnalysis/DPDUtils/python/Bookkeeper.py | 61 ------- PhysicsAnalysis/DPDUtils/python/__init__.py | 3 - .../DPDUtils/share/DPDTagTool_jobOptions.py | 14 -- .../DPDUtils/share/TruthSlimming.py | 38 ---- .../share/example.fdr_makeDPD_config.py | 75 -------- PhysicsAnalysis/DPDUtils/share/slimJets.py | 41 ----- PhysicsAnalysis/DPDUtils/share/slimTracks.py | 32 ---- PhysicsAnalysis/DPDUtils/src/DPDTagTool.cxx | 167 ------------------ .../src/components/DPDUtils_entries.cxx | 3 - 12 files changed, 550 deletions(-) delete mode 100644 PhysicsAnalysis/DPDUtils/CMakeLists.txt delete mode 100644 PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h delete mode 100644 PhysicsAnalysis/DPDUtils/doc/packagedoc.h delete mode 100644 PhysicsAnalysis/DPDUtils/python/Bookkeeper.py delete mode 100644 PhysicsAnalysis/DPDUtils/python/__init__.py delete mode 100755 PhysicsAnalysis/DPDUtils/share/DPDTagTool_jobOptions.py delete mode 100644 PhysicsAnalysis/DPDUtils/share/TruthSlimming.py delete mode 100644 PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py delete mode 100644 PhysicsAnalysis/DPDUtils/share/slimJets.py delete mode 100644 PhysicsAnalysis/DPDUtils/share/slimTracks.py delete mode 100644 PhysicsAnalysis/DPDUtils/src/DPDTagTool.cxx delete mode 100644 PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx diff --git a/PhysicsAnalysis/DPDUtils/CMakeLists.txt b/PhysicsAnalysis/DPDUtils/CMakeLists.txt deleted file mode 100644 index ce6768266bed..000000000000 --- a/PhysicsAnalysis/DPDUtils/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# Package: DPDUtils -################################################################################ - -# Declare the package name: -atlas_subdir( DPDUtils ) - -# Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - Calorimeter/CaloEvent - Control/AthenaBaseComps - Control/AthenaKernel - Control/AthenaPython - Control/StoreGate - Database/AthenaPOOL/AthenaPoolUtilities - Event/NavFourMom - GaudiKernel - PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils - PhysicsAnalysis/EventTag/TagEvent - Reconstruction/Jet/JetEvent - Reconstruction/MuonIdentification/muonEvent - Reconstruction/Particle - Reconstruction/egamma/egammaEvent - Trigger/TrigAnalysis/TrigDecisionTool - PRIVATE - Database/AthenaPOOL/DBDataModel - Event/EventBookkeeperMetaData - Reconstruction/tauEvent ) - -# External dependencies: -find_package( CLHEP ) -find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) - -# Component(s) in the package: -atlas_add_component( DPDUtils - src/*.cxx - src/components/*.cxx - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities NavFourMom GaudiKernel UserAnalysisUtilsLib TagEvent JetEvent muonEvent Particle egammaEvent TrigDecisionToolLib DBDataModel EventBookkeeperMetaData tauEvent ) - -# Install files from the package: -atlas_install_headers( DPDUtils ) -atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) -atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 ) diff --git a/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h b/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h deleted file mode 100644 index 1293a612bfdd..000000000000 --- a/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef DPDTAGTOOL_H -#define DPDTAGTOOL_H -/** - * @author Tulay Cuhadar Donszelmann - * @author Balint Radics - * @date Jan 2009 - */ - -#include <string> -#include <map> - -#include "GaudiKernel/Algorithm.h" -#include "AthenaBaseComps/AthAlgTool.h" -#include "StoreGate/StoreGateSvc.h" -#include "TagEvent/TagFragmentCollection.h" -#include "AthenaPoolUtilities/AthenaAttributeSpecification.h" -#include "GaudiKernel/ServiceHandle.h" - -////////////////////////////////////////////////////////////////////////////// - - -// Interface ID for DPDTagTool -static const InterfaceID IID_DPDTagTool("DPDTagTool", 1, 0); - -class DPDTagTool : public AthAlgTool { - - public: - - // Standard Constructor - DPDTagTool(const std::string&, const std::string&, const IInterface*); - - // AlgTool and IAlgTool interface methods - static const InterfaceID& interfaceID() { return IID_DPDTagTool; }; - - // Overriding initialize, finalize and execute - virtual StatusCode initialize(); - virtual StatusCode attributeSpecification(std::map<std::string,AthenaAttributeType>&, const int); - virtual StatusCode execute(TagFragmentCollection&, const int); - virtual StatusCode stop(); - virtual StatusCode finalize(); - - private: - ServiceHandle<StoreGateSvc> m_pMetaDataStore; - - std::string m_desdskimdecisioncontainer; - std::string m_daodskimdecisioncontainer; - -}; - -#endif // DPDTAGTOOL_H diff --git a/PhysicsAnalysis/DPDUtils/doc/packagedoc.h b/PhysicsAnalysis/DPDUtils/doc/packagedoc.h deleted file mode 100644 index 7d7628abc6fe..000000000000 --- a/PhysicsAnalysis/DPDUtils/doc/packagedoc.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** -@page DPDUtils_page DPDUtils Package - -This package contains utilities (both C++ and python) aiding in creating -DPDs from AODs/ESDs - -@author Sven Menke - -@section DPDUtils_DPDUtilsIntro Introduction - -C++ code and python fragments needed to produce DPDs from AODs/ESDs -(like slimming, thinning) should go in this package. - -*/ diff --git a/PhysicsAnalysis/DPDUtils/python/Bookkeeper.py b/PhysicsAnalysis/DPDUtils/python/Bookkeeper.py deleted file mode 100644 index 802e8ab02aef..000000000000 --- a/PhysicsAnalysis/DPDUtils/python/Bookkeeper.py +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -################################ -# Bookkeeper tool for skimming # -################################ - -# Creation: David Cote (DESY), August 2008 -# -# WARNING: development version. Please do not use yet! ;-) -# -# Steps are: -# 1) get a connection to all skims via MSMgr (implemented) -# 2) implement a base class to PyAthena.Alg skims, in order to bookkeep the cut-flow of each skims -# 3) persistify the bookkeeping info in metadata during finalize() stage. - -from __future__ import print_function - -from OutputStreamAthenaPool.MultipleStreamManager import MSMgr - -import AthenaPython.PyAthena as PyAthena -from AthenaPython.PyAthena import StatusCode - -class Bookkeeper( PyAthena.Alg ): - - def __init__ ( self, name = "Bookkeeper", **kw ) : - kw['name'] = name - super(Bookkeeper,self).__init__(**kw) - - def initialize(self): - self.evtCount=0 - self.skimList=[] - from AthenaCommon.AlgSequence import AlgSequence - theJob = AlgSequence() - for Stream in MSMgr.StreamList: - print ("Stream :%s "%Stream.Name) - print ("AcceptedAlgs are:") - skimNameList=Stream.Stream.AcceptAlgs - for skimName in skimNameList: - skim=getattr(theJob,skimName) - if isinstance(skim,PyAthena.Alg): - self.skimList.append(skim) - print (" -%s (accepted)"%skimName) - else: - print ("WARNING: %s will be ignored by the bookkeeper... (only PyAthena.Alg skims are supported)"%skimName) - return StatusCode.Success - - def execute(self): - #in the first event, check that the number of skims is still the same... - #Or better, go through this stuff every time a skim is added to the MSMgr - - for skim in self.skimList: - print (skim.filterPassed()) - self.evtCount+=1 - return StatusCode.Success - - def finalize(self): - print ("processed %i events."%self.evtCount) - return StatusCode.Success - - - diff --git a/PhysicsAnalysis/DPDUtils/python/__init__.py b/PhysicsAnalysis/DPDUtils/python/__init__.py deleted file mode 100644 index 8c8e3326aa82..000000000000 --- a/PhysicsAnalysis/DPDUtils/python/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -# hook for DPDUtils py-module diff --git a/PhysicsAnalysis/DPDUtils/share/DPDTagTool_jobOptions.py b/PhysicsAnalysis/DPDUtils/share/DPDTagTool_jobOptions.py deleted file mode 100755 index b1b04c0fce65..000000000000 --- a/PhysicsAnalysis/DPDUtils/share/DPDTagTool_jobOptions.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -include.block ("DPDUtils/DPDTagTool_jobOptions.py") - -########### DPD analysis Tag options ################ - -from DPDUtils.DPDUtilsConf import DPDTagTool as ConfiguredDPDTagTool -DPDTagTool=ConfiguredDPDTagTool( - DESDSkimDecisionCollection="StreamESD_SkimDecisionsContainer", -##### DAODSkimDecisionCollection="StreamAOD_SkimDecisionsContainer" -) - -ToolSvc += DPDTagTool - diff --git a/PhysicsAnalysis/DPDUtils/share/TruthSlimming.py b/PhysicsAnalysis/DPDUtils/share/TruthSlimming.py deleted file mode 100644 index 100a8a1adfbe..000000000000 --- a/PhysicsAnalysis/DPDUtils/share/TruthSlimming.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -########################## -# Truth Slimming -######################## - - -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() -from AthenaCommon.AppMgr import ToolSvc -from McParticleAlgs.McAodFlags import jobproperties as jp -jp.McAodFlags.doTruthEtIsolations = True - -# Deal with truth: -# -from McParticleAlgs.JobOptCfg import McAodBuilder -# from McParticleTools.McParticleToolsConf import NoopFilterTool -from McParticleTools.McParticleToolsConf import OldSpclMcFilterTool -from McParticleTools.McParticleToolsConf import TruthParticleCnvTool -topSequence += McAodBuilder( - "McAodBuilder", - OutputLevel = INFO, - FilterTool = OldSpclMcFilterTool( - McEvents = "GEN_AOD", - McEventsOutput = "GEN_DPD", - DoEtIsolations = jp.McAodFlags.doTruthEtIsolations(), - IncludeSimul=False, - IncludePartonShowers=False, - ptGammaMin = 5000. - ), - CnvTool = TruthParticleCnvTool( - McEvents = "GEN_DPD", - TruthParticlesOutput = "SpclMC", - DoEtIsolations = jp.McAodFlags.doTruthEtIsolations() - ) - ) -ToolSvc.TruthIsolationTool.McEventsOutput="GEN_DPD" - diff --git a/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py b/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py deleted file mode 100644 index d3c93bb269d4..000000000000 --- a/PhysicsAnalysis/DPDUtils/share/example.fdr_makeDPD_config.py +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -##################################################################### -# -# DPD Group Configuration example -# -# Authors: Davide Costanzo, Nicolas Kerschen, Anastopoulos Christos -#==================================================================== -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -from AthenaCommon.Configurable import ConfigurablePyAlgorithm -#Jet Slimming -include( "DPDUtils/slimJets.py" ) -slimJets=slimJets("slimJets") -topSequence += ConfigurablePyAlgorithm("slimJets") - -#Track Slimming -include( "DPDUtils/slimTracks.py" ) -slimTracks=slimTracks("slimTracks") -topSequence += ConfigurablePyAlgorithm("slimTracks") - - -#Electron Filter -#include( "DPDUtils/ElectronFilterAlgorithm.py" ) -#filAlg=ElectronFilterAlgorithm("ElectronFilter") -#topSequence += ConfigurablePyAlgorithm("ElectronFilter") - -include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -include( "TrkEventAthenaPool/TrkEventAthenaPool_joboptions.py" ) -include( "RecAthenaPool/RecAthenaPool_joboptions.py" ) -include( "ParticleEventAthenaPool/ParticleEventAthenaPool_joboptions.py" ) -include( "G4SimAthenaPOOL/G4SimAthenaPOOL_joboptions.py" ) -include ( "EventAthenaPool/EventAthenaPool_joboptions.py") -include ( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py") -include ("McParticleEventAthenaPool/McParticleEventAthenaPool_joboptions.py") -include( "InDetEventAthenaPool/InDetEventAthenaPool_joboptions.py" ) -include ("TrackParticleTruthAthenaPool/TrackParticleTruthAthenaPool_joboptions.py") - -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -StreamDPD = AthenaPoolOutputStream( "StreamDPD" ) - -######################Write Item List########################################## -StreamDPD.ItemList = ['EventInfo#*', 'TrackRecordCollection#*'] -StreamDPD.ItemList += ['ElectronContainer#ElectronAODCollection'] -StreamDPD.ItemList += ['egDetailContainer#egDetailAOD'] -StreamDPD.ItemList += ['Analysis::MuonContainer#StacoMuonCollection'] -StreamDPD.ItemList += ['JetKeyDescriptor#JetKeyMap'] -StreamDPD.ItemList += ['JetCollection#Cone4H1TowerJets'] -StreamDPD.ItemList += ['JetCollection#Cone4TruthJets'] -StreamDPD.ItemList += ['Rec::TrackParticleContainer#TrackParticleCandidate'] -StreamDPD.ItemList += ['Rec::TrackParticleContainer#StacoTrackParticles'] -StreamDPD.ItemList += ['VxContainer#*'] - - -#electron Filter -#StreamDPD.AcceptAlgs=["ElectronFilter"] - -#============================================================= -# -# End of job options file -# -############################################################### - - - - - - - - - - - diff --git a/PhysicsAnalysis/DPDUtils/share/slimJets.py b/PhysicsAnalysis/DPDUtils/share/slimJets.py deleted file mode 100644 index be21f92f3c95..000000000000 --- a/PhysicsAnalysis/DPDUtils/share/slimJets.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -############################################################### -# -# Jet Slimming -# -#============================================================== - - -from GaudiPython import PyAlgorithm - -class slimJets( PyAlgorithm ): - def __init__ ( self, name ) : - PyAlgorithm.__init__(self,name) - self.name = name - - def initialize(self): - printfunc ("Initializing filterAlg") - return True - - def execute(self): - jets = PyParticleTools.getJets("Cone4H1TowerJets") - for jet in jets: - jet.constituent("Tracks").removeAll() - for key in jet.infoKeys(): - if key != "IP3D" and key != "SV1": - jet.removeInfo(key) - - jets = PyParticleTools.getJets("Cone4TruthJets") - for jet in jets: - jet.constituent("Tracks").removeAll() - for key in jet.infoKeys(): - if key != "IP3D" and key != "SV1": - jet.removeInfo(key) - - return True - - def finalize(self): - return True - - diff --git a/PhysicsAnalysis/DPDUtils/share/slimTracks.py b/PhysicsAnalysis/DPDUtils/share/slimTracks.py deleted file mode 100644 index ba41359f9098..000000000000 --- a/PhysicsAnalysis/DPDUtils/share/slimTracks.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -############################################################### -# -# Track Slimming -# -#============================================================== - - -from GaudiPython import PyAlgorithm - -class slimTracks( PyAlgorithm ): - def __init__ ( self, name ) : - PyAlgorithm.__init__(self,name) - self.name = name - - def initialize(self): - printfunc ("Initializing filterAlg") - return True - - def execute(self): - trs = PyParticleTools.getTrackParticles("TrackParticleCandidate") - for tr in trs: - if tr.pt()<5*GeV: - tr.removeSummary() - tr.removeErrorMatrix() - return True - - def finalize(self): - return True - - diff --git a/PhysicsAnalysis/DPDUtils/src/DPDTagTool.cxx b/PhysicsAnalysis/DPDUtils/src/DPDTagTool.cxx deleted file mode 100644 index 4e906c951b02..000000000000 --- a/PhysicsAnalysis/DPDUtils/src/DPDTagTool.cxx +++ /dev/null @@ -1,167 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#include "DPDUtils/DPDTagTool.h" - -#include "CLHEP/Units/SystemOfUnits.h" -#include "AthenaBaseComps/FilteredAlgorithm.h" - -#include "AthenaPoolUtilities/TagMetadataKey.h" -#include "TagEvent/DPDAttributeNames.h" - -#include "EventBookkeeperMetaData/SkimDecisionCollection.h" -#include "DBDataModel/CollectionMetadata.h" -#include <string> - - -DPDTagTool::DPDTagTool(const std::string& type, const std::string& name, const IInterface* parent) : - AthAlgTool(type, name, parent), - m_pMetaDataStore("StoreGateSvc/MetaDataStore",name) { - declareProperty("DESDSkimDecisionCollection", m_desdskimdecisioncontainer="StreamESD_SkimDecisionsContainer"); - //declareProperty("DAODSkimDecisionCollection", m_daodskimdecisioncontainer="StreamAOD_SkimDecisionsContainer"); - - declareInterface<DPDTagTool>(this); - -} - -StatusCode DPDTagTool::initialize() { - - ATH_MSG_DEBUG("in initialize()"); - ATH_CHECK( m_pMetaDataStore.retrieve() ); - return StatusCode::SUCCESS; -} - - -StatusCode DPDTagTool::attributeSpecification(std::map<std::string,AthenaAttributeType>& attrMap, const int) { - - ATH_MSG_DEBUG("in attributeSpecification()"); - - // Build the attribute list - DAODStreams and DESDStreams - // attrMap[ DPDAttributeNames[DPDId::Daod] ] =AthenaAttributeType(std::string("unsigned int"), DPDAttributeUnitNames[DPDId::Daod], DPDAttributeGroupNames[DPDId::Daod]); - - attrMap[ DPDAttributeNames[DPDId::Desd] ] =AthenaAttributeType(std::string("unsigned int"), DPDAttributeUnitNames[DPDId::Desd], DPDAttributeGroupNames[DPDId::Desd]); - - - return StatusCode::SUCCESS; - -} - -StatusCode DPDTagTool::execute(TagFragmentCollection& dpdTagColl, const int){ - - - ATH_MSG_DEBUG("in execute()"); - // get bit mappings - DPDBits bits; - - // Get DESD container - const SkimDecisionCollection* aSkimDecisionContainer(0) ; - ATH_CHECK( evtStore()->retrieve(aSkimDecisionContainer, m_desdskimdecisioncontainer) ); - - //Fill DESD - unsigned int tempDesd = 0x0; - ATH_MSG_DEBUG("DESD map has " << bits.desdMap.size() << "elements"); - std::map<const std::string, unsigned int>::iterator map_it; - for (map_it = bits.desdMap.begin(); map_it != bits.desdMap.end(); ++map_it){ - SkimDecisionCollection::const_iterator it = aSkimDecisionContainer->begin(); - SkimDecisionCollection::const_iterator it_end = aSkimDecisionContainer->end(); - for( ; it != it_end; ++it ) { - ATH_MSG_DEBUG("Skim Name: " << (*it)->getName() << ", value : " << (*it)->isAccepted()); - if ( ((*map_it).first == (*it)->getName()) && (*it)->isAccepted() ) { - tempDesd |= 1 << (*map_it).second; - } - } - } - - dpdTagColl.insert(DPDAttributeNames[DPDId::Desd],tempDesd); - - // Get DAOD container - // StreamAOD_SkimDecisionsContainer is removed from AOD (DAODWord removed from autumn 2010 reprocessing) -/* - const SkimDecisionCollection* aodSkimDecisionContainer(0) ; - m_sc = m_storeGate->retrieve(aodSkimDecisionContainer, m_daodskimdecisioncontainer); - if (!m_sc.isSuccess() || (0 == aodSkimDecisionContainer) ) { - ATH_MSG_WARNING("Could not find DAOD SkimDecisionContainer " << m_daodskimdecisioncontainer); - return(StatusCode::SUCCESS); - } - - //Fill DAOD - unsigned int tempDaod = 0x0; - ATH_MSG_DEBUG("DAOD map has " << bits.daodMap.size() << "elements"); - for (map_it = bits.daodMap.begin(); map_it != bits.daodMap.end(); ++map_it){ - SkimDecisionCollection::const_iterator it = aodSkimDecisionContainer->begin(); - SkimDecisionCollection::const_iterator it_end = aodSkimDecisionContainer->end(); - for( ; it != it_end; ++it ) { - ATH_MSG_DEBUG("DAOD Skim Name: " << (*it)->getName() << ", value : " << (*it)->isAccepted()); - if ( ((*map_it).first == (*it)->getName()) && (*it)->isAccepted() ) { - tempDaod |= 1 << (*map_it).second; - } - } - } - - - // Finally write the DAODStream to the TAG file - dpdTagColl.insert(DPDAttributeNames[DPDId::Daod],tempDaod); -*/ - - return StatusCode::SUCCESS; - -} - -StatusCode DPDTagTool::finalize() { - - ATH_MSG_DEBUG( "In finalize()" ); - - return StatusCode::SUCCESS; - -} - -StatusCode DPDTagTool::stop() { - - ATH_MSG_INFO("stop method"); - - DPDBits bits; - // std::map<const std::string, unsigned int> combMap = bits.daodMap; - std::map<const std::string, unsigned int> combMap; - std::map<std::string,unsigned int>::iterator iter; - for( iter = bits.desdMap.begin(); iter != bits.desdMap.end(); ++iter ) { - combMap.insert( make_pair(iter->first, iter->second ) ); - } - - // Add DAOD & DESD bit map to metadata - std::map<std::string,std::string> bitmap; - for (std::map<const std::string, unsigned int>::iterator it = combMap.begin(); it != combMap.end(); ++it) { - std::stringstream bitname; - //std::string ns = "DAOD"; - std::string ns; - if ( (*it).first.compare(0,16,"Other_StreamDESD") == 0 ) ns = "DESD"; - TagMetadataKey tkey; - tkey.setKey(ns+"_StreamBit"); - bitname << "(b=" << (*it).second << ")"; - tkey.setQual(bitname.str()); - bitmap.insert(std::make_pair(tkey.toString(), (*it).first)); - } - - CollectionMetadataContainer* bitmaplist = new CollectionMetadataContainer(); - CollectionMetadata* newmap = new CollectionMetadata(bitmap); - bitmaplist->push_back(newmap); - - StatusCode sc = m_pMetaDataStore->record(bitmaplist,"DPDTagTool"); - if (!sc.isSuccess()) { - //ATH_MSG_ERROR("Unable to store DAOD & DESD maps to CollectionMetadataContainer" ); - ATH_MSG_ERROR("Unable to store DESD maps to CollectionMetadataContainer" ); - } else { - //ATH_MSG_INFO( "DAOD & DESD maps copied to MetaDataStore"); - ATH_MSG_INFO( "DESD maps copied to MetaDataStore"); - ATH_MSG_INFO("Size: " << newmap->size()); - ATH_MSG_INFO("Contents: "); - CollectionMetadata::const_iterator i = newmap->begin(); - for (CollectionMetadata::const_iterator j=i; j != newmap->end(); ++j) { - ATH_MSG_INFO(" "<<j->first<<" "<<j->second); - } - } - - return StatusCode::SUCCESS; - -} - diff --git a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx deleted file mode 100644 index 799f68309cc7..000000000000 --- a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include "DPDUtils/DPDTagTool.h" -DECLARE_COMPONENT( DPDTagTool ) - -- GitLab