From 4ed43a1f7069149d6dde698ed27ae2a6a8e5dea0 Mon Sep 17 00:00:00 2001 From: Hong Ma <hong.ma@cern.ch> Date: Mon, 8 Jun 2015 21:37:06 +0200 Subject: [PATCH] move LArHit* converters to LArSimEventTPCnv (LArTPCnv-00-06-00) * tagging LArTPCnv-00-06-00 move LArHit* converters to LArSimEventTPCnv (requested by John Chapman) --- .../LArCnv/LArTPCnv/LArTPCnv/LArHitCnv_p1.h | 32 ------ .../LArTPCnv/LArTPCnv/LArHitContainerCnv_p1.h | 18 --- .../LArTPCnv/LArTPCnv/LArHitContainerCnv_p2.h | 25 ---- .../LArTPCnv/LArTPCnv/LArHitContainer_p1.h | 57 ---------- .../LArTPCnv/LArTPCnv/LArHitContainer_p2.h | 39 ------- .../LArTPCnv/LArTPCnv/LArHitFloatCnv_p1.h | 32 ------ .../LArTPCnv/LArHitFloatContainerCnv_p1.h | 27 ----- .../LArTPCnv/LArHitFloatContainerCnv_p2.h | 26 ----- .../LArCnv/LArTPCnv/LArTPCnv/LArHit_p1.h | 34 ------ .../LArCnv/LArTPCnv/LArTPCnv/LArTPCnvDict.h | 5 - .../LArTPCnv/LArTPCnv/OLD_selection.xml | 1 - .../LArCnv/LArTPCnv/LArTPCnv/selection.xml | 3 - .../LArCnv/LArTPCnv/cmt/requirements | 2 - .../LArCnv/LArTPCnv/src/LArHitCnv_p1.cxx | 36 ------ .../LArTPCnv/src/LArHitContainerCnv_p2.cxx | 107 ------------------ .../LArCnv/LArTPCnv/src/LArHitFloatCnv_p1.cxx | 34 ------ .../src/LArHitFloatContainerCnv_p1.cxx | 26 ----- .../src/LArHitFloatContainerCnv_p2.cxx | 102 ----------------- .../LArCnv/LArTPCnv/src/LArTPCnv.cxx | 32 ------ 19 files changed, 638 deletions(-) delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitCnv_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p2.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p2.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatCnv_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p2.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHit_p1.h delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/src/LArHitCnv_p1.cxx delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/src/LArHitContainerCnv_p2.cxx delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatCnv_p1.cxx delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p1.cxx delete mode 100644 LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p2.cxx diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitCnv_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitCnv_p1.h deleted file mode 100644 index b0864ca3d22..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitCnv_p1.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARHITCNV_P1_H -#define LARHITCNV_P1_H - -/* -Transient/Persistent converter for LArHit class -Author: Davide Costanzo -*/ - -#include "LArSimEvent/LArHit.h" -#include "LArTPCnv/LArHit_p1.h" - -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" - -class MsgStream; - - -class LArHitCnv_p1 : public T_AthenaPoolTPCnvBase<LArHit, LArHit_p1> -{ -public: - - LArHitCnv_p1() {} - - virtual void persToTrans(const LArHit_p1* persObj, LArHit* transObj, MsgStream &log); - virtual void transToPers(const LArHit* transObj, LArHit_p1* persObj, MsgStream &log); -}; - - -#endif diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p1.h deleted file mode 100644 index f9688106091..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p1.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARTPCNV_LARHITCONTAINERCNV_P1_H -#define LARTPCNV_LARHITCONTAINERCNV_P1_H - -#define private public -#include "LArTPCnv/LArHitContainer_p1.h" -#undef private -#include "LArSimEvent/LArHitContainer.h" -#include "LArHitCnv_p1.h" -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" - -typedef T_AthenaHitsVectorCnv< LArHitContainer, LArHitContainer_p1, LArHitCnv_p1 > LArHitContainerCnv_p1; - - -#endif //not LARTPCNV_LARHITCONTAINERCNV_P1_H diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p2.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p2.h deleted file mode 100644 index 41da8880bbb..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainerCnv_p2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARTPCNV_LARHITCONTAINERCNV_P2_H -#define LARTPCNV_LARHITCONTAINERCNV_P2_H - -#define private public -#include "LArTPCnv/LArHitContainer_p2.h" -#undef private -#include "LArSimEvent/LArHitContainer.h" -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" - - -class LArHitContainerCnv_p2 : public T_AthenaPoolTPCnvBase<LArHitContainer, LArHitContainer_p2> -{ - public: - LArHitContainerCnv_p2() {}; - - virtual void persToTrans(const LArHitContainer_p2* persColl, LArHitContainer* transColl, MsgStream &log) ; - virtual void transToPers(const LArHitContainer* transColl, LArHitContainer_p2* persColl, MsgStream &log) ; - private: -}; - -#endif // not LARTPCNV_LARHITCONTAINERCNV_P2_H diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p1.h deleted file mode 100644 index f9b2de960db..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p1.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARHITCONTAINER_P1_H -#define LARHITCONTAINER_P1_H - -/** - -@class LArHitContainer_p1 -@brief Persistent represenation of a LArHitContainer, -@author: Davide Costanzo - -*/ - -#include <vector> -#include <string> -#include "LArTPCnv/LArHit_p1.h" - - -class LArHitContainer_p1 -{ -public: - /// typedefs - typedef std::vector<LArHit_p1> HitVector; - typedef HitVector::const_iterator const_iterator; - typedef HitVector::iterator iterator; - - - /// Default constructor - LArHitContainer_p1 (); - - // Accessors - const std::string& name() const; - const HitVector& getVector() const; -private: - std::vector<LArHit_p1> m_cont; - std::string m_name; -}; - - -// inlines - -inline -LArHitContainer_p1::LArHitContainer_p1 () {} - -inline -const std::string& -LArHitContainer_p1::name() const -{return m_name;} - -inline -const std::vector<LArHit_p1>& -LArHitContainer_p1::getVector() const -{return m_cont;} - -#endif diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p2.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p2.h deleted file mode 100644 index 89a09c62731..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitContainer_p2.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARHITCONTAINER_P2_H -#define LARHITCONTAINER_P2_H -/** -@class LArHitContainer_p2 -@brief Persistent represenation of a LArHitContainer, -@author: Ilija Vukotic -*/ -#include <vector> -#include <string> - -class LArHitContainer_p2 -{ -public: - - /// Default constructor - LArHitContainer_p2 (); - - // Accessors - const std::string& name() const; -private: - std::vector<unsigned int> m_channelHash; - std::vector<unsigned int> m_energy; // 18 bits compressed - std::vector<unsigned short> m_time; // store as unsigned short - std::string m_name; -}; - - -// inlines - -inline LArHitContainer_p2::LArHitContainer_p2 () {} - -inline const std::string& LArHitContainer_p2::name() const -{return m_name;} - -#endif diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatCnv_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatCnv_p1.h deleted file mode 100644 index 8091e240e34..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatCnv_p1.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARHITFLOATCNV_P1_H -#define LARHITFLOATCNV_P1_H - -/* -Transient/Persistent converter for LArHit class -Author: Davide Costanzo -*/ - -#include "LArSimEvent/LArHitFloat.h" -#include "LArTPCnv/LArHit_p1.h" - -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" - -class MsgStream; - - -class LArHitFloatCnv_p1 : public T_AthenaPoolTPCnvBase<LArHitFloat, LArHit_p1> -{ -public: - - LArHitFloatCnv_p1() {} - - virtual void persToTrans(const LArHit_p1* persObj, LArHitFloat* transObj, MsgStream &log); - virtual void transToPers(const LArHitFloat* transObj, LArHit_p1* persObj, MsgStream &log); -}; - - -#endif diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p1.h deleted file mode 100644 index bb4a3f43f28..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p1.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARTPCNV_LARHITFLOATCONTAINERCNV_P1_h -#define LARTPCNV_LARHITFLOATCONTAINERCNV_P1_h - -#define private public -#include "LArTPCnv/LArHitContainer_p1.h" -#undef private -#include "LArSimEvent/LArHitFloatContainer.h" -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" -#include "LArTPCnv/LArHitFloatCnv_p1.h" - - -class LArHitFloatContainerCnv_p1 : public T_AthenaPoolTPCnvBase<LArHitFloatContainer, LArHitContainer_p1> -{ - public: - LArHitFloatContainerCnv_p1() {}; - - virtual void persToTrans(const LArHitContainer_p1* persColl, LArHitFloatContainer* transColl, MsgStream &log) ; - virtual void transToPers(const LArHitFloatContainer* transColl, LArHitContainer_p1* persColl, MsgStream &log) ; - private: - LArHitFloatCnv_p1 m_LArHitFloatCnv_p1; -}; - -#endif // not LARTPCNV_LARHITFLOATCONTAINERCNV_P1_h diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p2.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p2.h deleted file mode 100644 index 872c2cf7be2..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHitFloatContainerCnv_p2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARTPCNV_LARHITFLOATCONTAINERCNV_p2_H -#define LARTPCNV_LARHITFLOATCONTAINERCNV_p2_H - -#define private public -#include "LArTPCnv/LArHitContainer_p2.h" -#undef private -#include "LArSimEvent/LArHitFloatContainer.h" -#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" - - -class LArHitFloatContainerCnv_p2 : public T_AthenaPoolTPCnvBase<LArHitFloatContainer, LArHitContainer_p2> -{ - public: - LArHitFloatContainerCnv_p2() {}; - - virtual void persToTrans(const LArHitContainer_p2* persColl, LArHitFloatContainer* transColl, MsgStream &log) ; - virtual void transToPers(const LArHitFloatContainer* transColl, LArHitContainer_p2* persColl, MsgStream &log) ; - private: -}; - - -#endif // not LARTPCNV_LARHITFLOATCONTAINERCNV_p2_H diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHit_p1.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHit_p1.h deleted file mode 100644 index 5f2d4860039..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArHit_p1.h +++ /dev/null @@ -1,34 +0,0 @@ -// This file's extension implies that it's C, but it's really -*- C++ -*-. - -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef LARHIT_P1_H -#define LARHIT_P1_H -/** @class LArHit_p1 - @brief Persistent LArHit class, version p1. -*/ - -class LArHit_p1 { - public: - LArHit_p1() - : m_channelID(0), - m_energy(0), - m_time(0) - {}; - friend class LArHitCnv_p1; - friend class LArHitFloatCnv_p1; - - private: - /** identifier of the cell in which this hit occured. */ - unsigned int m_channelID; - - /** energy (in MeV) deposited in this hit */ - float m_energy; - - // time (in ns) - float m_time; -}; - -#endif diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArTPCnvDict.h b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArTPCnvDict.h index 8e6f2a1d461..4b6f6f7bbb4 100644 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArTPCnvDict.h +++ b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/LArTPCnvDict.h @@ -7,9 +7,6 @@ #define LARTPCNV_LARTPCNVDICT_H #include "LArTPCnv/LArDigitContainer_p1.h" -#include "LArTPCnv/LArHit_p1.h" -#include "LArTPCnv/LArHitContainer_p1.h" -#include "LArTPCnv/LArHitContainer_p2.h" #include "LArTPCnv/LArRawChannel_p1.h" #include "LArTPCnv/LArRawChannel_p2.h" #include "LArTPCnv/LArRawChannelCollection_p1.h" @@ -20,8 +17,6 @@ #include "LArTPCnv/LArRawChannelContainer_p4.h" #include "LArRawEvent/LArDigitContainer.h" -#include "LArSimEvent/LArHit.h" -#include "LArSimEvent/LArHitFloat.h" #include "LArRawEvent/LArRawChannel.h" #include "LArRawEvent/LArRawChannelContainer.h" diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/OLD_selection.xml b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/OLD_selection.xml index c3e9a4a5ae2..6b68cda93a1 100644 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/OLD_selection.xml +++ b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/OLD_selection.xml @@ -1,6 +1,5 @@ <lcgdict> - <class name="LArHitContainer_p1" id="ED1ECB80-B38C-46DE-94BF-22F9379796DB" /> <class name="LArRawChannel_p1" /> <class name="LArRawChannelCollection_p1" /> <class name="std::vector<LArRawChannel_p1>" /> diff --git a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/selection.xml b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/selection.xml index fdf7677981f..e81df9f1f72 100644 --- a/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/selection.xml +++ b/LArCalorimeter/LArCnv/LArTPCnv/LArTPCnv/selection.xml @@ -1,7 +1,4 @@ <lcgdict> - <class name="LArHit_p1" /> - <class name="std::vector<LArHit_p1>" /> - <class name="LArHitContainer_p2" id="1F1DE705-E0CE-4F0E-941A-C405CB2CD137" /> <class name="LArRawChannel_p2" /> <class name="LArRawChannelCollection_p2" /> <class name="std::vector<LArRawChannel_p2>" /> diff --git a/LArCalorimeter/LArCnv/LArTPCnv/cmt/requirements b/LArCalorimeter/LArCnv/LArTPCnv/cmt/requirements index 600ea3acea2..5bbce9b499a 100644 --- a/LArCalorimeter/LArCnv/LArTPCnv/cmt/requirements +++ b/LArCalorimeter/LArCnv/LArTPCnv/cmt/requirements @@ -4,7 +4,6 @@ author RD Schaffer <R.D.Schaffer@cern.ch> use AtlasPolicy AtlasPolicy-* use AtlasReflex AtlasReflex-* External -use LArSimEvent LArSimEvent-* LArCalorimeter use LArRawEvent LArRawEvent-* LArCalorimeter use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL use LArRecEvent LArRecEvent-* LArCalorimeter @@ -12,7 +11,6 @@ use LArRecEvent LArRecEvent-* LArCalorimeter private use AthenaKernel AthenaKernel-* Control use Identifier Identifier-* DetectorDescription -use EventCommonTPCnv EventCommonTPCnv-* Event use CaloIdentifier CaloIdentifier-* Calorimeter end_private diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitCnv_p1.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitCnv_p1.cxx deleted file mode 100644 index d9c74521cf7..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitCnv_p1.cxx +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#define private public -#define protected public -#include "LArSimEvent/LArHit.h" -#undef private -#undef protected -#include "Identifier/Identifier.h" - -#include "LArTPCnv/LArHit_p1.h" -#include "LArTPCnv/LArHitCnv_p1.h" - - -void -LArHitCnv_p1::persToTrans(const LArHit_p1* persObj, LArHit* transObj, MsgStream &log) -{ - log << MSG::DEBUG << "LArHitCnv_p1::persToTrans called " << endreq; - - transObj->m_ID = Identifier(persObj->m_channelID); - transObj->m_energy = (double) persObj->m_energy; - transObj->m_time = (double) persObj->m_time; -} - - -void -LArHitCnv_p1::transToPers(const LArHit* transObj, LArHit_p1* persObj, MsgStream &log) -{ - log << MSG::DEBUG << "LArHitCnv_p1::transToPers called " << endreq; - persObj->m_channelID = transObj->m_ID.get_identifier32().get_compact(); - persObj->m_energy = (float) transObj->m_energy; - persObj->m_time = (float) transObj->m_time; -} - - diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitContainerCnv_p2.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitContainerCnv_p2.cxx deleted file mode 100644 index a81100d444a..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitContainerCnv_p2.cxx +++ /dev/null @@ -1,107 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#define private public -#define protected public -#include "LArSimEvent/LArHit.h" -#include "LArSimEvent/LArHitContainer.h" -#undef private -#undef protected -#include "Identifier/Identifier.h" - -#include "Identifier/IdentifierHash.h" -#include "CaloIdentifier/CaloCell_ID.h" -#include "CaloIdentifier/CaloIdManager.h" - -#include "EventCommonTPCnv/Compressor.h" - -// LArHitContainerCnv_p2, used for T/P separation -// author Ilija Vukotic - -#include "LArTPCnv/LArHitContainerCnv_p2.h" -#include "map" - -void LArHitContainerCnv_p2::transToPers(const LArHitContainer* transCont, LArHitContainer_p2* persCont, MsgStream &log) -{ //static int ev=0; - - size_t size = transCont->size(); - log << MSG::DEBUG << " *** Writing LArHitContainer_p2 of size:"<<size<<endreq; - - persCont->m_channelHash.reserve(size); - std::vector<float> tempE; tempE.reserve(size); - std::vector<float> tempT; tempT.reserve(size); - - const CaloCell_ID* cellIdHelper = (CaloIdManager::instance())->getCaloCell_ID();// getDM_ID - - - LArHitContainer::const_iterator it = transCont->begin(); - - std::multimap <unsigned int, unsigned int> map_hashPositions;// first hash ; second its position in container - - for (unsigned int w=0;w<size;++w){ - IdentifierHash hashId = cellIdHelper->calo_cell_hash((*it)->m_ID); - map_hashPositions.insert(std::pair<unsigned int, int>((unsigned int)hashId, w)); -// if (!ev) std::cout<<hashId<<"\t"<<((*it)->m_ID)<<std::endl; - ++it; - } - - std::multimap<unsigned int, unsigned int>::const_iterator iter; - unsigned int old=0; -// int count=0; - for (iter=map_hashPositions.begin(); iter != map_hashPositions.end(); ++iter) { - //cout <<"container position:"<< iter->second << " \t hash:" << iter->first << endl; - unsigned int pHash=(iter->first)-old; // to store as a difference - old=iter->first; - unsigned int pos=iter->second; - persCont->m_channelHash.push_back(pHash); - tempE.push_back( (float) (transCont->At(pos))->m_energy ); - tempT.push_back( (float) (transCont->At(pos))->m_time ); -// if (!ev) std::cout<<"Writing Hash: "<<iter->first<<"\t E: "<< (float) (transCont->At(pos))->m_energy<<"\t T: "<< (float) (transCont->At(pos))->m_time<<std::endl; -// count++; - } -// std::cout<<"ILIJA : "<<count<<std::endl; - - Compressor A; A.setNrBits(18); - A.reduce(tempE,persCont->m_energy); // packs energy - Compressor B; - B.reduceToUS(tempT, persCont->m_time); - persCont->m_name = transCont->Name(); //stores name - -// ev++; -} - - - -void LArHitContainerCnv_p2::persToTrans(const LArHitContainer_p2* persCont, LArHitContainer* transCont, MsgStream &log) -{ -// static int dog=0; - size_t cells=persCont->m_channelHash.size(); - log << MSG::DEBUG << " *** Reading LArHitContainer of size: "<<cells<<endreq; - transCont->clear(); - transCont->reserve(cells); - transCont->setName(persCont->name() ); - - - const CaloCell_ID* cellIdHelper = (CaloIdManager::instance())->getCaloCell_ID();// getDM_ID - - - Compressor A; - std::vector<float> tempE; tempE.reserve(cells); - std::vector<float> tempT; tempT.reserve(cells); - - A.expandFromUStoFloat(persCont->m_time,tempT); - A.expandToFloat(persCont->m_energy,tempE); - unsigned int sum=0; - for (unsigned int i=0;i<cells;++i){ - LArHit* trans=new LArHit(); - sum+= persCont->m_channelHash[i]; - trans->m_ID=cellIdHelper->cell_id(sum); - trans->m_energy =(double)tempE[i]; - trans->m_time =(double)(tempT[i]); -// if(!dog) std::cout<<"Reading hash: "<< sum <<"\t E: "<< (double)tempE[i]<<"\t T: "<<(tempT[i]) <<std::endl; - transCont->push_back(trans); - } -// dog++; -} - diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatCnv_p1.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatCnv_p1.cxx deleted file mode 100644 index 18a16e83920..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatCnv_p1.cxx +++ /dev/null @@ -1,34 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#define private public -#define protected public -#include "LArSimEvent/LArHitFloat.h" -#undef private -#undef protected -#include "Identifier/Identifier.h" - -#include "LArTPCnv/LArHit_p1.h" -#include "LArTPCnv/LArHitFloatCnv_p1.h" - - -void -LArHitFloatCnv_p1::persToTrans(const LArHit_p1* persObj, LArHitFloat* transObj, MsgStream &log) -{ - log << MSG::DEBUG << "LArHitFloatCnv_p1::persToTrans called " << endreq; - - transObj->m_ID = Identifier(persObj->m_channelID); - transObj->m_energy = persObj->m_energy; - transObj->m_time = persObj->m_time; -} - - -void -LArHitFloatCnv_p1::transToPers(const LArHitFloat* transObj, LArHit_p1* persObj, MsgStream &log) -{ - log << MSG::DEBUG << "LArHitFloatCnv_p1::transToPers called " << endreq; - persObj->m_channelID = transObj->m_ID.get_identifier32().get_compact(); - persObj->m_energy = transObj->m_energy; - persObj->m_time = transObj->m_time; -} diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p1.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p1.cxx deleted file mode 100644 index 1127d756e76..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p1.cxx +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#define private public -#define protected public -#include "LArSimEvent/LArHitFloatContainer.h" -#undef private -#undef protected - -#include "LArTPCnv/LArHitFloatContainerCnv_p1.h" - -void LArHitFloatContainerCnv_p1::transToPers(const LArHitFloatContainer* /*transCont*/, LArHitContainer_p1* /*persCont*/, MsgStream &log) -{ - log << MSG::ERROR << "Writing LArHitContainer_p1 not supported any more. Current version is LArHitChannelContainer_p2" << endreq; -} - -void LArHitFloatContainerCnv_p1::persToTrans(const LArHitContainer_p1* persCont, LArHitFloatContainer* transCont, MsgStream &log) -{ - log << MSG::DEBUG << " reading LArHitContaner_p1 " << endreq; - std::size_t nChannels = persCont->m_cont.size(); - transCont->resize(nChannels); - for (std::size_t i=0;i<nChannels;i++) - m_LArHitFloatCnv_p1.persToTrans(&(persCont->m_cont[i]),&(transCont->at(i)),log); - -} diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p2.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p2.cxx deleted file mode 100644 index ff936ffcce0..00000000000 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArHitFloatContainerCnv_p2.cxx +++ /dev/null @@ -1,102 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#define private public -#define protected public -#include "LArSimEvent/LArHitFloat.h" -#include "LArSimEvent/LArHitFloatContainer.h" -#undef private -#undef protected -#include "Identifier/Identifier.h" - -#include "Identifier/IdentifierHash.h" -#include "CaloIdentifier/CaloCell_ID.h" -#include "CaloIdentifier/CaloIdManager.h" - -#include "EventCommonTPCnv/Compressor.h" - -// LArHitFloatContainerCnv_p2, used for T/P separation -// author Ilija Vukotic - -#include "LArTPCnv/LArHitFloatContainerCnv_p2.h" -#include "map" - -void LArHitFloatContainerCnv_p2::transToPers(const LArHitFloatContainer* transCont, LArHitContainer_p2* persCont, MsgStream &log) -{ //static int ev=0; - - size_t size = transCont->size(); - log << MSG::DEBUG << " *** Writing LArHitContainer_p2 of size:"<<size<<endreq; - - persCont->m_channelHash.reserve(size); - std::vector<float> tempE; tempE.reserve(size); - std::vector<float> tempT; tempT.reserve(size); - - const CaloCell_ID* cellIdHelper = (CaloIdManager::instance())->getCaloCell_ID();// getDM_ID - - - LArHitFloatContainer::const_iterator it = transCont->begin(); - - std::multimap <unsigned int, unsigned int> map_hashPositions;// first hash ; second its position in container - - for (unsigned int w=0;w<size;++w){ - IdentifierHash hashId = cellIdHelper->calo_cell_hash((*it).m_ID); - map_hashPositions.insert(std::pair<unsigned int, int>((unsigned int)hashId, w)); -// if (!ev) std::cout<<hashId<<"\t"<<((*it)->m_ID)<<std::endl; - ++it; - } - - std::multimap<unsigned int, unsigned int>::const_iterator iter; - unsigned int old=0; -// int count=0; - for (iter=map_hashPositions.begin(); iter != map_hashPositions.end(); ++iter) { - //cout <<"container position:"<< iter->second << " \t hash:" << iter->first << endl; - unsigned int pHash=(iter->first)-old; // to store as a difference - old=iter->first; - unsigned int pos=iter->second; - persCont->m_channelHash.push_back(pHash); - tempE.push_back( (transCont->at(pos)).m_energy ); - tempT.push_back( (transCont->at(pos)).m_time ); -// if (!ev) std::cout<<"Writing Hash: "<<iter->first<<"\t E: "<< (float) (transCont->At(pos))->m_energy<<"\t T: "<< (float) (transCont->At(pos))->m_time<<std::endl; -// count++; - } -// std::cout<<"ILIJA : "<<count<<std::endl; - - Compressor A; A.setNrBits(18); - A.reduce(tempE,persCont->m_energy); // packs energy - Compressor B; - B.reduceToUS(tempT, persCont->m_time); - persCont->m_name = "" ; //stores name - -// ev++; -} - - - -void LArHitFloatContainerCnv_p2::persToTrans(const LArHitContainer_p2* persCont, LArHitFloatContainer* transCont, MsgStream &log) -{ -// static int dog=0; - size_t cells=persCont->m_channelHash.size(); - log << MSG::DEBUG << " *** Reading LArHitContainer of size: "<<cells<<endreq; - transCont->clear(); - transCont->reserve(cells); - - const CaloCell_ID* cellIdHelper = (CaloIdManager::instance())->getCaloCell_ID();// getDM_ID - - - Compressor A; - std::vector<float> tempE; tempE.reserve(cells); - std::vector<float> tempT; tempT.reserve(cells); - - A.expandFromUStoFloat(persCont->m_time,tempT); - A.expandToFloat(persCont->m_energy,tempE); - unsigned int sum=0; - for (unsigned int i=0;i<cells;++i){ - sum+= persCont->m_channelHash[i]; - LArHitFloat hit(cellIdHelper->cell_id(sum),tempE[i],tempT[i]); -// if(!dog) std::cout<<"Reading hash: "<< sum <<"\t E: "<< (double)tempE[i]<<"\t T: "<<(tempT[i]) <<std::endl; - transCont->push_back(hit); - } -// dog++; -} - diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArTPCnv.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArTPCnv.cxx index 8c0773a7d3e..ad69702ba0e 100644 --- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArTPCnv.cxx +++ b/LArCalorimeter/LArCnv/LArTPCnv/src/LArTPCnv.cxx @@ -7,15 +7,7 @@ #include "LArTPCnv/LArDigitContainer_p1.h" -#include "LArTPCnv/LArHit_p1.h" -#define private public -#define protected public -#include "LArTPCnv/LArHitContainer_p1.h" -#undef private -#undef protected - -#include "LArTPCnv/LArHitContainer_p2.h" #include "LArTPCnv/LArRawChannel_p1.h" #include "LArTPCnv/LArRawChannel_p2.h" #include "LArTPCnv/LArRawChannelCollection_p1.h" @@ -27,12 +19,6 @@ #include "LArRawEvent/LArDigitContainer.h" #include "LArTPCnv/LArDigitContainerCnv_p1.h" -#include "LArSimEvent/LArHit.h" -#include "LArSimEvent/LArHitFloat.h" -#include "LArTPCnv/LArHitContainerCnv_p1.h" -#include "LArTPCnv/LArHitFloatContainerCnv_p1.h" -#include "LArTPCnv/LArHitContainerCnv_p2.h" -#include "LArTPCnv/LArHitFloatContainerCnv_p2.h" #include "LArRawEvent/LArRawChannel.h" #include "LArRawEvent/LArRawChannelContainer.h" #include "LArTPCnv/LArRawChannelContainerCnv_p1.h" @@ -61,24 +47,6 @@ DECLARE_TPCNV_FACTORY(LArFebErrorSummaryCnv_p1, LArFebErrorSummary_p1, Athena::TPCnvVers::Current) -DECLARE_TPCNV_FACTORY(LArHitContainerCnv_p1, - LArHitContainer, - LArHitContainer_p1, - Athena::TPCnvVers::Old) - -DECLARE_TPCNV_FACTORY(LArHitContainerCnv_p2, - LArHitContainer, - LArHitContainer_p2, - Athena::TPCnvVers::Current) - -// We can't really handle multiple transient classes using the same p class. -// Just drop this for now --- i don't think this is relevant for either -// ARA or trigger. -//DECLARE_TPCNV_FACTORY(LArHitFloatContainerCnv_p2, -// LArHitFloatContainer, -// LArHitContainer_p2, -// Athena::TPCnvVers::Current) - DECLARE_TPCNV_FACTORY(LArNoisyROSummaryCnv_p1, LArNoisyROSummary, LArNoisyROSummary_p1, -- GitLab