From 26d10f6bb86f18238f675f2c96edadd40b8f2633 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Fri, 12 Jan 2024 14:24:36 -0800
Subject: [PATCH] First generation of 20 packages compiled.

---
 .../CaloIdCnv/src/EcalIDDetDescrCnv.cxx       |  2 +-
 .../CMakeLists.txt                            |  2 +-
 .../GenEventExample/src/GenEventReadAlg.cxx   | 21 ++++++++++++--
 .../src/EventInfoByteStreamAuxCnv.cxx         |  2 +-
 .../src/EventInfoByteStreamxAODCnv.cxx        |  2 +-
 MagneticField/MagFieldElements/CMakeLists.txt |  3 +-
 .../src/EmulsionIDDetDescrCnv.cxx             |  2 +-
 .../NeutrinoSimEventAthenaPool/CMakeLists.txt |  4 +--
 .../ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx |  2 +-
 .../ScintIdCnv/src/TriggerIDDetDescrCnv.cxx   |  2 +-
 .../ScintIdCnv/src/VetoIDDetDescrCnv.cxx      |  2 +-
 .../ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx    |  2 +-
 .../ScintSimEventAthenaPool/CMakeLists.txt    |  4 +--
 .../TrackerAlignGenTools/CMakeLists.txt       |  3 +-
 .../src/FaserSCT_IDDetDescrCnv.cxx            |  2 +-
 .../FaserSCT_Digitization/CMakeLists.txt      |  2 +-
 .../TrackerEventAthenaPool/CMakeLists.txt     |  2 +-
 .../TrackerSimEventAthenaPool/CMakeLists.txt  |  2 +-
 .../TrkDetStripClusterImporter/CMakeLists.txt |  2 +-
 .../Acts/FaserActsGeometry/CMakeLists.txt     |  2 +-
 .../Acts/FaserActsKalmanFilter/CMakeLists.txt |  2 +-
 .../src/FaserTriggerByteStreamAuxCnv.cxx      |  2 +-
 .../src/FaserTriggerByteStreamCnv.cxx         |  2 +-
 .../WaveEventAthenaPool/CMakeLists.txt        |  2 +-
 package_filters.txt                           | 28 +++++++++++++++++++
 .../Root/FaserTriggerData_v1.cxx              |  1 +
 26 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx b/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
index 38c121254..476f70b4a 100644
--- a/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
+++ b/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ EcalIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_ecalId);
+    pObj = SG::asStorable(m_ecalId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt b/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
index c80211c6d..5f2e90339 100644
--- a/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( FaserCaloSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel FaserCaloSimEventTPCnv FaserCaloSimEvent )
 
 # Install files from the package:
-atlas_install_headers( FaserCaloSimEventAthenaPool )
+# atlas_install_headers( FaserCaloSimEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
diff --git a/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx b/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
index 2810c5d0e..7dca6220b 100644
--- a/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
+++ b/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
@@ -35,9 +35,26 @@ StatusCode GenEventReadAlg::execute()
     const HepMC::GenEvent* theEvent = h_mcEvents->at(0);
     if (theEvent->particles_size() != 1 && theEvent->vertices_size() != 1) return StatusCode::FAILURE;
     // h_mcEvents->at(0)->print( msg().stream() );
+#ifdef HEPMC3
+    const HepMC::ConstGenParticlePtr& pHat {theEvent->particles().front()};
+    for (auto p : theEvent->particles())
+    {
+        m_cosThetaHist->Fill(-p->momentum().y()/p->momentum().rho());
+        m_phiHist->Fill(atan2(p->momentum().x(), p->momentum().z()));
+    }
+
+    for (auto v : theEvent->vertices())
+    {
+        HepMC::FourVector vOffset { v->position().x() , v->position().y(), v->position().z() - m_zOffset, v->position().t() };
+        m_rVertexHist->Fill(vOffset.rho());
+        m_rPerpHist->Fill(pow(vOffset.rho(), 2) - pow((vOffset.x() * pHat->momentum().x() +
+                                                       vOffset.y() * pHat->momentum().y() + 
+                                                       vOffset.z() * pHat->momentum().z())/pHat->momentum().rho(), 2));
+    }
+#else
+    const HepMC::GenParticle* pHat { nullptr };
     auto pParticles    = theEvent->particles_begin();
     auto pParticlesEnd = theEvent->particles_end();
-    const HepMC::GenParticle* pHat { nullptr };
     for (; pParticles != pParticlesEnd ; ++pParticles)
     {
         const HepMC::GenParticle* p = *pParticles;
@@ -45,7 +62,6 @@ StatusCode GenEventReadAlg::execute()
         m_cosThetaHist->Fill(-p->momentum().y()/p->momentum().rho());
         m_phiHist->Fill(atan2(p->momentum().x(), p->momentum().z()));
     }
-
     auto pVertices    = theEvent->vertices_begin();
     auto pVerticesEnd = theEvent->vertices_end();
     for (; pVertices != pVerticesEnd; ++pVertices)
@@ -57,6 +73,7 @@ StatusCode GenEventReadAlg::execute()
                                                        vOffset.y() * pHat->momentum().y() + 
                                                        vOffset.z() * pHat->momentum().z())/pHat->momentum().rho(), 2));
     }
+#endif
 
     return StatusCode::SUCCESS;
 }
diff --git a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
index 531e74c5a..64b67feb7 100644
--- a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
+++ b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
@@ -257,7 +257,7 @@ StatusCode EventInfoByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr, DataObjec
 
   // record EventInfo
   evtInfo.setEventFlags(xAOD::EventInfo::Core, m_robDataProvider->getEventStatus());
-  pObj = StoreGateSvc::asStorable(pEvtInfoAux);
+  pObj = SG::asStorable(pEvtInfoAux);
 
   ATH_MSG_DEBUG(" New xAOD::EventAuxInfo made, run/event= " << runNumber 
 		<< "/" << eventNumber
diff --git a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
index 29feaa277..10d950d5c 100644
--- a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
+++ b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
@@ -67,7 +67,7 @@ StatusCode EventInfoByteStreamxAODCnv::createObj(IOpaqueAddress* pAddr, DataObje
   xAOD::EventInfo* pEvtInfo = new xAOD::EventInfo();
   DataLink<xAOD::EventAuxInfo> link(nmAux);
   pEvtInfo->setStore(link);
-  pObj = StoreGateSvc::asStorable(pEvtInfo);
+  pObj = SG::asStorable(pEvtInfo);
 
   ATH_MSG_DEBUG(" New xAOD::EventInfo made, run/event= " << pEvtInfo->runNumber() << "/" << pEvtInfo->eventNumber());
 
diff --git a/MagneticField/MagFieldElements/CMakeLists.txt b/MagneticField/MagFieldElements/CMakeLists.txt
index 9bd3b3560..2676060f7 100644
--- a/MagneticField/MagFieldElements/CMakeLists.txt
+++ b/MagneticField/MagFieldElements/CMakeLists.txt
@@ -17,5 +17,6 @@ atlas_add_library( MagFieldElements
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} PathResolver)
 
 # Install files from the package:
-atlas_install_headers( MagFieldElements )
+# obsolete
+# atlas_install_headers( MagFieldElements )
 
diff --git a/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx b/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
index fc8cde7bd..ab12a0600 100644
--- a/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
+++ b/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ EmulsionIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_emulsionId);
+    pObj = SG::asStorable(m_emulsionId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt b/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
index ecaa1b03b..87cd41fea 100644
--- a/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
+++ b/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( NeutrinoSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel NeutrinoSimEventTPCnv NeutrinoSimEvent )
 
 # Install files from the package:
-atlas_install_headers( NeutrinoSimEventAthenaPool )
-#atlas_install_joboptions( share/*.py )
+# atlas_install_headers( NeutrinoSimEventAthenaPool )
+# atlas_install_joboptions( share/*.py )
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
index 2840f5bcf..598d7b363 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ PreshowerIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_preshowerId);
+    pObj = SG::asStorable(m_preshowerId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
index 17a737dd6..2bda625d3 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ TriggerIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_triggerId);
+    pObj = SG::asStorable(m_triggerId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
index 0b8ab0722..72a6c68a5 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ VetoIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_vetoId);
+    pObj = SG::asStorable(m_vetoId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
index 82d3ab337..301b88ed0 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ VetoNuIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_vetonuId);
+    pObj = SG::asStorable(m_vetonuId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt b/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
index 8983143e6..707291c9c 100644
--- a/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
+++ b/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( ScintSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel ScintSimEventTPCnv ScintSimEvent )
 
 # Install files from the package:
-atlas_install_headers( ScintSimEventAthenaPool )
-#atlas_install_joboptions( share/*.py )
+# atlas_install_headers( ScintSimEventAthenaPool )
+# atlas_install_joboptions( share/*.py )
 
diff --git a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
index 5fa0ad816..144e514fb 100644
--- a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
+++ b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
@@ -23,5 +23,6 @@ atlas_add_component( TrackerAlignGenTools
                      LINK_LIBRARIES TrackerAlignGenToolsLib )
 
 # Install files from the package:
-atlas_install_headers( TrackerAlignGenTools )
+# obsolete
+# atlas_install_headers( TrackerAlignGenTools )
 
diff --git a/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx b/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
index 95447c912..d086c0b0e 100644
--- a/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
+++ b/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
@@ -211,7 +211,7 @@ FaserSCT_IDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_sctId);
+    pObj = SG::asStorable(m_sctId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt b/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
index 417ffa67a..f6dd2274c 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_add_component( FaserSCT_Digitization
 #                ENVIRONMENT THREADS=10 )
 
 # Install files from the package:
-atlas_install_headers( FaserSCT_Digitization )
+# atlas_install_headers( FaserSCT_Digitization )
 atlas_install_python_modules( python/*.py )
 #atlas_install_joboptions( share/*.py )
 atlas_install_scripts( test/FaserSCT_DigitizationDbg.py )
diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
index 87b41d357..cf057e82c 100644
--- a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
+++ b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
@@ -65,7 +65,7 @@ atlas_add_dictionary( TrackerEventAthenaPoolCnvDict
 #    LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
 
 # Install files from the package:
-atlas_install_headers( TrackerEventAthenaPool )
+# atlas_install_headers( TrackerEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
 # Set up (a) test(s) for the converter(s):
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
index c5718df7b..5b9019ea4 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
+++ b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( TrackerSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel TrackerSimEventTPCnv TrackerSimEvent )
 
 # Install files from the package:
-atlas_install_headers( TrackerSimEventAthenaPool )
+# atlas_install_headers( TrackerSimEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
diff --git a/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt b/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
index a275b9a8f..3e96f34af 100644
--- a/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
+++ b/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
@@ -21,4 +21,4 @@ atlas_add_component( TrkDetStripClusterImporter
                      AthenaBaseComps xAODFaserTracking GaudiKernel AthenaKernel 
 )
 # Install files from the package:
-atlas_install_headers( TrkDetStripClusterImporter )
\ No newline at end of file
+# atlas_install_headers( TrkDetStripClusterImporter )
\ No newline at end of file
diff --git a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
index 58c40ebec..a98e94027 100755
--- a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
@@ -82,7 +82,7 @@ atlas_add_component( FaserActsGeometry
 )
 
 # Install files from the package:
-atlas_install_headers( FaserActsGeometry )
+# atlas_install_headers( FaserActsGeometry )
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/*.py )
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
index 143f819de..5e3263443 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
@@ -142,6 +142,6 @@ atlas_add_component(FaserActsKalmanFilter
 )
 
 # Install files from the package:
-atlas_install_headers(FaserActsKalmanFilter)
+# atlas_install_headers(FaserActsKalmanFilter)
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/*.py )
diff --git a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
index 942c0c700..fbd60fce7 100644
--- a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
+++ b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
@@ -100,7 +100,7 @@ StatusCode FaserTriggerByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr, DataOb
 
   CHECK( m_tool->convert(re, &triggerData) );
 
-  pObj = StoreGateSvc::asStorable(pTriggerDataAux);
+  pObj = SG::asStorable(pTriggerDataAux);
 
   ATH_MSG_DEBUG("Created xAOD::FaserTriggerDataAux for run/event =" << runNumber << " / " << eventNumber);
   return StatusCode::SUCCESS;
diff --git a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
index 293992772..77a185f68 100644
--- a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
+++ b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
@@ -66,7 +66,7 @@ StatusCode FaserTriggerByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObjec
   xAOD::FaserTriggerData* pTriggerData = new xAOD::FaserTriggerData();
   DataLink<xAOD::FaserTriggerDataAux> link(nmAux);
   pTriggerData->setStore(link);
-  pObj = StoreGateSvc::asStorable(pTriggerData);
+  pObj = SG::asStorable(pTriggerData);
 
   ATH_MSG_DEBUG("New FaserTriggerData made");
 
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
index 864bc5da6..db8532180 100644
--- a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_add_dictionary( WaveEventAthenaPoolCnvDict
    LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
 
 # Install files from the package:
-atlas_install_headers( WaveEventAthenaPool )
+# atlas_install_headers( WaveEventAthenaPool )
 
 
 
diff --git a/package_filters.txt b/package_filters.txt
index 02a9f09fe..f77c2958a 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -1,23 +1,51 @@
 
++Calorimeter/CaloRecTools
 -Calorimeter/.*
++Control/CalypsoExample/GenEventExample
 -Control/.*
 +Database/ConnectionManagement/FaserAuthentication
+#+Derivation/DerivationAlgs
+#+Derivation/DerivationTools
 -Derivation/.*
++DetectorDescription/DetDescrCnvSvc
 +DetectorDescription/FaserDetDescr
++DetectorDescription/GeoModel/GeoModelInterfaces
 -DetectorDescription/.*
++Event/FaserByteStreamCnvSvcBase
+#+Event/FaserByteStreamCnvSvc
++Event/FaserEventStorage
 -Event/.*
 -FaserGeometryCommon/.*
 -Generators/.*
++LHCData/LHCDataTools
 -LHCData/.*
++MagneticField/MagFieldElements
 -MagneticField/.*
 -Monitoring
 -Neutrino/.*
 -PhysicsAnalysis/.*
 -Scintillator/.*
+#+Simulation/G4Extensions/Pythia8Decayer
+#+Simulation/G4Faser/G4FaserAlg
+#+Simulation/G4Utilities/Geo2G4
++Simulation/ISF/ISF_Core/FaserISF_Interfaces
++Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
 -Simulation/.*
+#+Tracker/TrackerAlignTools/TrackerAlignGenTools
++Tracker/TrackerConditions/FaserSCT_ConditionsData
+#+Tracker/TrackerConditions/FaserSiPropertiesTool
++Tracker/TrackerRawEvent/TrackerSimData
+#+Tracker/TrackerRecTools/FaserSiClusterizationTool
 -Tracker/.*
 -Tracking/.*
 -Trigger/.*
+#+Waveform/WaveDigiTools
+#+Waveform/WaveRecTools
 -Waveform/.*
++graphics/VTI12/VTI12Gui
 -graphics/.*
++xAOD/xAODFaserBase
++xAOD/xAODFaserLHC
++xAOD/xAODFaserTrigger
++xAOD/xAODFaserWaveform
 -xAOD/.*
diff --git a/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx b/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
index ac68351c8..4447ac451 100644
--- a/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
+++ b/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
@@ -9,6 +9,7 @@
 
 // Local include(s):
 #include "xAODFaserTrigger/versions/FaserTriggerData_v1.h"
+#include <bitset>
 
 namespace xAOD {
 
-- 
GitLab