p3 version of TP convertors for HepMC particle link v3

p3 version of TP convertors for HepMC particle link v3

MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CscSimDataCollectionCnv.h"
@@ -33,9 +33,16 @@ CscSimDataCollection* CscSimDataCollectionCnv::createTransient() {
     static const pool::Guid   p0_guid("250EC949-F98B-4F74-9034-178847D1B622");
     static const pool::Guid   p1_guid("DD2A8397-4435-4DA2-AD14-ADD7294694B2");
     static const pool::Guid   p2_guid("023993E1-BAAA-4F36-8CD4-8F03E3983E8D");
+    static const pool::Guid   p3_guid("018F5280-E75C-7B27-9881-75B356B2A282");
     ATH_MSG_DEBUG("createTransient(): main converter");
     CscSimDataCollection* p_collection(nullptr);
-    if( compareClassGuid(p2_guid) ) {
+    if( compareClassGuid(p3_guid) ) {
+      ATH_MSG_DEBUG("createTransient(): T/P version 3 detected");
+      std::unique_ptr< Muon::CscSimDataCollection_p3 >   col_vect( this->poolReadObject< Muon::CscSimDataCollection_p3 >() );
+      p_collection = m_TPConverter_p3.createTransient( col_vect.get(), log );
+    }
+  //----------------------------------------------------------------
+    else if( compareClassGuid(p2_guid) ) {
       ATH_MSG_DEBUG("createTransient(): T/P version 2 detected");
       std::unique_ptr< Muon::CscSimDataCollection_p2 >   col_vect( this->poolReadObject< Muon::CscSimDataCollection_p2 >() );
       p_collection = m_TPConverter_p2.createTransient( col_vect.get(), log );

MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CscSimDataCollectionCnv.h

@@ -9,6 +9,7 @@
 #include "MuonSimData/CscSimDataCollection.h"
 #include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollectionCnv_p1.h"
 #include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollectionCnv_p2.h"
+#include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollectionCnv_p3.h"
 
 // the latest persistent representation type of DataCollection:
 typedef  Muon::CscSimDataCollection_p2  CscSimDataCollection_PERS;
@@ -32,6 +33,7 @@ public:
 private:
     CscSimDataCollectionCnv_p1    m_TPConverter_p1;
     CscSimDataCollectionCnv_p2    m_TPConverter_p2;
+    CscSimDataCollectionCnv_p3    m_TPConverter_p3;
 };
 
 #endif

MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.cxx

@@ -33,9 +33,16 @@ MuonSimDataCollection* MuonSimDataCollectionCnv::createTransient() {
     static const pool::Guid   p0_guid("5B50C32E-A036-4B49-AC97-716E53210BE2");
     static const pool::Guid   p1_guid("0605B4A3-3744-4486-B39D-F9C9E809D868");
     static const pool::Guid   p2_guid("E0AA3013-4EF7-45B6-BDB1-17B21BF60791");
+    static const pool::Guid   p3_guid("018F527E-346B-7A37-8C3D-5E7420A9C76A");
     ATH_MSG_DEBUG("createTransient(): main converter");
     MuonSimDataCollection* p_collection(nullptr);
-    if( compareClassGuid(p2_guid) ) {
+    if( compareClassGuid(p3_guid) ) {
+      ATH_MSG_DEBUG("createTransient(): T/P version 3 detected");
+      std::unique_ptr< Muon::MuonSimDataCollection_p3 >   col_vect( this->poolReadObject< Muon::MuonSimDataCollection_p3 >() );
+      p_collection = m_TPConverter_p3.createTransient( col_vect.get(), log );
+    }
+  //----------------------------------------------------------------
+    else if( compareClassGuid(p2_guid) ) {
       ATH_MSG_DEBUG("createTransient(): T/P version 2 detected");
       std::unique_ptr< Muon::MuonSimDataCollection_p2 >   col_vect( this->poolReadObject< Muon::MuonSimDataCollection_p2 >() );
       p_collection = m_TPConverter_p2.createTransient( col_vect.get(), log );

MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MuonSimDataCollectionCnv.h

@@ -9,6 +9,7 @@
 #include "MuonSimData/MuonSimDataCollection.h"
 #include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollectionCnv_p1.h"
 #include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollectionCnv_p2.h"
+#include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollectionCnv_p3.h"
 
 // the latest persistent representation type of DataCollection:
 typedef  Muon::MuonSimDataCollection_p2  MuonSimDataCollection_PERS;
@@ -32,6 +33,7 @@ public:
 private:
     MuonSimDataCollectionCnv_p1    m_TPConverter_p1;
     MuonSimDataCollectionCnv_p2    m_TPConverter_p2;
+    MuonSimDataCollectionCnv_p3    m_TPConverter_p3;
 };
 
 #endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt

@@ -45,9 +45,11 @@ atlas_install_joboptions( share/*.txt )
 # Set up the tests of the package:
 foreach( name CscMcDataCnv_p1_test CscSimDataCnv_p1_test
       CscSimDataCollectionCnv_p1_test CscSimDataCnv_p2_test
-      CscSimDataCollectionCnv_p2_test MuonMCDataCnv_p1_test
+      CscSimDataCollectionCnv_p2_test CscSimDataCnv_p3_test
+      CscSimDataCollectionCnv_p3_test MuonMCDataCnv_p1_test
       MuonSimDataCnv_p1_test MuonSimDataCollectionCnv_p1_test
       MuonSimDataCnv_p2_test MuonSimDataCollectionCnv_p2_test
+      MuonSimDataCnv_p3_test MuonSimDataCollectionCnv_p3_test
       CscClusterOnTrackCnv_p2_test RpcClusterOnTrackCnv_p3_test
       TgcClusterOnTrackCnv_p2_test MM_ClusterOnTrackCnv_p1_test
       STGC_ClusterOnTrackCnv_p1_test MdtDriftCircleOnTrackCnv_p2_test

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/CscSimDataCnv_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CSCSIMDATACNV_P3_H
+#define CSCSIMDATACNV_P3_H
+
+#include "MuonSimData/CscSimData.h"
+#include "CscSimData_p3.h"
+
+#include "GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p3.h"
+#include "CscMcDataCnv_p1.h"
+
+class MsgStream;
+
+class CscSimDataCnv_p3 : public T_AthenaPoolTPCnvBase<CscSimData, Muon::CscSimData_p3> {
+
+  public:
+    CscSimDataCnv_p3() {};
+    void persToTrans( const Muon::CscSimData_p3 * persObj, CscSimData * transObj, MsgStream & log);
+    void transToPers( const CscSimData * transObj, Muon::CscSimData_p3 * persObj, MsgStream & log);
+
+  private:
+    HepMcParticleLinkCnv_p3 m_mcpartlinkCnv;
+    CscMcDataCnv_p1 m_mcdataCnv;
+
+};
+
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/CscSimDataCollectionCnv_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CSCSIMDATACOLLECTIONCNV_P3_H
+#define CSCSIMDATACOLLECTIONCNV_P3_H
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "MuonSimData/CscSimDataCollection.h"
+#include "CscSimDataCollection_p3.h"
+#include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCnv_p3.h"
+
+class CscSimDataCollectionCnv_p3 : public T_AthenaPoolTPCnvBase <CscSimDataCollection, Muon::CscSimDataCollection_p3> {
+
+   public:
+     CscSimDataCollectionCnv_p3() {};
+     void persToTrans(const Muon::CscSimDataCollection_p3* persCol, CscSimDataCollection* transCol, MsgStream &log);
+     void transToPers(const CscSimDataCollection* transCol, Muon::CscSimDataCollection_p3* persCol, MsgStream &log);
+
+   private:
+     CscSimDataCnv_p3 m_cscsimdataCnv;
+};
+
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/CscSimDataCollection_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CSCSIMDATACOLLECTION_P3_H
+#define CSCSIMDATACOLLECTION_P3_H
+
+#include <vector>
+#include "CscSimData_p3.h"
+#include "Identifier/Identifier.h"
+
+namespace Muon {
+    class CscSimDataCollection_p3 {
+
+      public:
+	CscSimDataCollection_p3() {};
+        std::vector<std::pair<Identifier32::value_type, CscSimData_p3> > m_cscsimdata;
+    };
+}
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/CscSimData_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CSCSIMDATA_P3_H
+#define CSCSIMDATA_P3_H
+
+#include <vector>
+#include "GeneratorObjectsTPCnv/HepMcParticleLink_p3.h"
+#include "CscMcData_p1.h"
+
+namespace Muon {
+    class CscSimData_p3 {
+
+      public:
+	CscSimData_p3() : m_word(0) {};
+	friend class CscSimDataCnv_p3;
+	int m_word;
+	std::vector < std::pair < HepMcParticleLink_p3, CscMcData_p1 > > m_deposits;
+
+    };
+
+}
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/MuonSimDataCnv_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSIMDATACNV_P3_H
+#define MUONSIMDATACNV_P3_H
+
+#include "MuonSimData/MuonSimData.h"
+#include "MuonSimData_p3.h"
+
+#include "GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p3.h"
+#include "MuonMCDataCnv_p1.h"
+
+class MsgStream;
+
+class MuonSimDataCnv_p3 : public T_AthenaPoolTPCnvBase<MuonSimData, Muon::MuonSimData_p3> {
+
+  public:
+    MuonSimDataCnv_p3() {};
+    void persToTrans( const Muon::MuonSimData_p3 * persObj, MuonSimData * transObj, MsgStream & log);
+    void transToPers( const MuonSimData * transObj, Muon::MuonSimData_p3 * persObj, MsgStream & log);
+
+  private:
+    HepMcParticleLinkCnv_p3 m_mcpartlinkCnv;
+    MuonMCDataCnv_p1 m_mcdataCnv;
+
+};
+
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollectionCnv_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSIMDATACOLLECTIONCNV_P3_H
+#define MUONSIMDATACOLLECTIONCNV_P3_H
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "MuonSimData/MuonSimDataCollection.h"
+#include "MuonSimDataCollection_p3.h"
+#include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCnv_p3.h"
+
+class MuonSimDataCollectionCnv_p3 : public T_AthenaPoolTPCnvBase <MuonSimDataCollection, Muon::MuonSimDataCollection_p3> {
+
+   public:
+     MuonSimDataCollectionCnv_p3() {};
+     void persToTrans(const Muon::MuonSimDataCollection_p3* persCol, MuonSimDataCollection* transCol, MsgStream &log);
+     void transToPers(const MuonSimDataCollection* transCol, Muon::MuonSimDataCollection_p3* persCol, MsgStream &log);
+
+   private:
+     MuonSimDataCnv_p3 m_muonsimdataCnv;
+
+};
+
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollection_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSIMDATACOLLECTION_P3_H
+#define MUONSIMDATACOLLECTION_P3_H
+
+#include <vector>
+#include "MuonSimData_p3.h"
+#include "Identifier/Identifier.h"
+
+namespace Muon {
+    class MuonSimDataCollection_p3 {
+
+      public:
+	MuonSimDataCollection_p3() {};
+        std::vector<std::pair<Identifier32::value_type, MuonSimData_p3> > m_muonsimdata;
+    };
+}
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonDigitContainer/MuonSimData_p3.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSIMDATA_P3_H
+#define MUONSIMDATA_P3_H
+
+#include <vector>
+#include "GeneratorObjectsTPCnv/HepMcParticleLink_p3.h"
+#include "MuonMCData_p1.h"
+
+namespace Muon {
+    class MuonSimData_p3 {
+
+      public:
+	MuonSimData_p3() : m_word(0), x(0.), y(0.), z(0.), t(0.) {};
+	friend class MuonSimDataCnv_p3;
+	int m_word;
+	std::vector < std::pair < HepMcParticleLink_p3, MuonMCData_p1 > > m_deposits;
+	float x;
+	float y;
+	float z;
+	float t;
+    };
+}
+#endif

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonEventTPCnvDict.h

@@ -33,8 +33,10 @@
 #include "MuonEventTPCnv/MuonChamberT0s/ChamberT0s_p1.h"
 #include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollection_p1.h"
 #include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollection_p2.h"
+#include "MuonEventTPCnv/MuonDigitContainer/MuonSimDataCollection_p3.h"
 #include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollection_p1.h"
 #include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollection_p2.h"
+#include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCollection_p3.h"
 #include "MuonEventTPCnv/MuonRDO/STGC_RawDataContainer_p1.h"
 #include "MuonEventTPCnv/MuonRDO/STGC_RawDataContainer_p2.h"
 #include "MuonEventTPCnv/MuonRDO/STGC_RawDataContainer_p3.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml

@@ -116,6 +116,11 @@
     <class name="std::vector< std::pair<unsigned int, Muon::MuonSimData_p2> >" />
     <class name="Muon::MuonSimDataCollection_p2" id="E0AA3013-4EF7-45B6-BDB1-17B21BF60791"/>
 
+    <class name="Muon::MuonSimData_p3" />
+    <class pattern="std::*pair*<unsigned int, Muon::MuonSimData_p3>" />
+    <class name="std::vector< std::pair<unsigned int, Muon::MuonSimData_p3> >" />
+    <class name="Muon::MuonSimDataCollection_p3" id="018F527E-346B-7A37-8C3D-5E7420A9C76A"/>
+
     <class name="Muon::CscSimData_p1" />
     <class name="Muon::CscMcData_p1" />
     <class pattern="std::*pair*<HepMcParticleLink_p1, Muon::CscMcData_p1>" />
@@ -168,6 +173,11 @@
     <class name="std::vector< std::pair<unsigned int, Muon::CscSimData_p2> >" />
     <class name="Muon::CscSimDataCollection_p2" id="023993E1-BAAA-4F36-8CD4-8F03E3983E8D"/>
 
+    <class name="Muon::CscSimData_p3" />
+    <class pattern="std::*pair*<unsigned int, Muon::CscSimData_p3>" />
+    <class name="std::vector< std::pair<unsigned int, Muon::CscSimData_p3> >" />
+    <class name="Muon::CscSimDataCollection_p3" id="018F5280-E75C-7B27-9881-75B356B2A282"/>
+
     <!-- <class name="Muon::NSW_PadTriggerSegment_p1" /> -->
     <!-- <class name="std::vector<Muon::NSW_PadTriggerSegment_p1>" /> -->
     <class name="Muon::NSW_PadTriggerData_p1" />

MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscSimDataCnv_p3_test.ref

+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus008.cern.ch on Fri Feb  9 16:59:26 2018
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+ClassIDSvc           INFO  getRegistryEntries: read 1130 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 869 CLIDRegistry entries for module ALL
+HepMcParticleLink    INFO find_proxy: Using TruthEvent as McEventCollection key for this job 

MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/CscSimDataCollectionCnv_p3_test.ref

+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+HepMcParticleLink    INFO find_proxy: Using TruthEvent as McEventCollection key for this job 
+

MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonSimDataCnv_p3_test.ref

+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+HepMcParticleLink    INFO find_proxy: Using TruthEvent as McEventCollection key for this job 

MuonSpectrometer/MuonCnv/MuonEventTPCnv/share/MuonSimDataCollectionCnv_p3_test.ref

+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+HepMcParticleLink    INFO find_proxy: Using TruthEvent as McEventCollection key for this job 

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/CscSimDataCnv_p3.cxx

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonSimData/CscSimData.h"
+#include "MuonEventTPCnv/MuonDigitContainer/CscSimDataCnv_p3.h"
+
+void CscSimDataCnv_p3::persToTrans(const Muon::CscSimData_p3 * persObj, CscSimData * transObj, MsgStream & log){
+   log << MSG::DEBUG << "CscSimDataCnv_p3::persToTrans" << endmsg;
+
+   std::vector<CscSimData::Deposit> deposits;
+   deposits.reserve(persObj->m_deposits.size());
+   for (const std::pair<HepMcParticleLink_p3, Muon::CscMcData_p1>& p :
+          persObj->m_deposits)
+   {
+      HepMcParticleLink transMcPartLink;
+      m_mcpartlinkCnv.persToTrans(&p.first, &transMcPartLink, log);
+      CscMcData transMcData;
+      m_mcdataCnv.persToTrans(&p.second, &transMcData, log);
+      deposits.emplace_back(transMcPartLink, transMcData);
+   }
+
+   *transObj = CscSimData (std::move(deposits),
+                           persObj->m_word);
+}
+
+void CscSimDataCnv_p3::transToPers( const CscSimData * transObj, Muon::CscSimData_p3 * persObj, MsgStream & log){
+  log << MSG::DEBUG << "CscSimDataCnv_p3::transToPers" << endmsg;
+  persObj->m_word = transObj->word();
+  log << MSG::VERBOSE << "\tconverting m_word:\t" << transObj->word() << "\tto\t" << persObj->m_word << endmsg;
+  persObj->m_deposits.clear();
+  persObj->m_deposits.reserve(transObj->getdeposits().size());
+  for (const CscSimData::Deposit& d : transObj->getdeposits()) {
+    HepMcParticleLink_p3 persMcPartLink;
+    m_mcpartlinkCnv.transToPers(&d.first, &persMcPartLink, log);
+    Muon::CscMcData_p1 persMcData;
+    m_mcdataCnv.transToPers(&d.second, &persMcData, log);
+    persObj->m_deposits.emplace_back (persMcPartLink, persMcData);
+  }
+}