From 64766a44e436faaa7cc0e954f3ec18d48be5282a Mon Sep 17 00:00:00 2001
From: Peter Van Gemmeren <peter.van.gemmeren@cern.ch>
Date: Wed, 11 Feb 2015 17:22:10 +0100
Subject: [PATCH] Clean up dictionaries (removing TP converter entries) to
optimize ROOT6 header parsing and VMEM consumption
(TrigFTK_RawDataTPCnv-00-00-03)
---
...TK_RawDataTPCnvDict1.h => TrigFTK_RawDataTPCnvDict.h} | 9 +++++----
.../{selection1.xml => selection.xml} | 0
Trigger/TrigFTK/TrigFTK_RawDataTPCnv/cmt/requirements | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
rename Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/{TrigFTK_RawDataTPCnvDict1.h => TrigFTK_RawDataTPCnvDict.h} (60%)
rename Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/{selection1.xml => selection.xml} (100%)
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict1.h b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
similarity index 60%
rename from Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict1.h
rename to Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
index a9153df97567d..f6ad12cec0f9b 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict1.h
+++ b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
@@ -2,14 +2,15 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT1_H
-#define TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT1_H
+#ifndef TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT_H
+#define TRIGFTK_RAWDATATPCNV_TRIGINDETEVENTTPCNVDICT_H
+#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
+#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_tlp1.h"
-#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_tlp1.h"
//dummy instances of all objects using std::vector<TPObjRef> for the dictionary
-struct dummy_TrigFTK_RawDataTPCnvDict1
+struct dummy_TrigFTK_RawDataTPCnvDict
{
std::vector<FTK_RawTrackContainer_p1> m_dummyFTK_RawTrackContainer_p1;
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection1.xml b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection.xml
similarity index 100%
rename from Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection1.xml
rename to Trigger/TrigFTK/TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnv/selection.xml
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/cmt/requirements b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/cmt/requirements
index f83b20d17b297..8100afe20a825 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/cmt/requirements
+++ b/Trigger/TrigFTK/TrigFTK_RawDataTPCnv/cmt/requirements
@@ -34,8 +34,8 @@ use AtlasReflex AtlasReflex-* External
# of transient classes. If we make a single dictionary,
# the compiler runs out of memory on the generated source.
-apply_pattern lcgdict dict=TrigFTK_RawDataTPCnv1 \
- selectionfile=selection1.xml \
- headerfiles="../TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict1.h"
+apply_pattern lcgdict dict=TrigFTK_RawDataTPCnv \
+ selectionfile=selection.xml \
+ headerfiles="../TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h"
end_private
--
GitLab