Merge branch 'master' into 'master'

Rename xAOD TLB Aux Data class

See merge request faser/calypso!114

Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py

@@ -53,7 +53,7 @@ if __name__ == "__main__":
     itemList = [ "xAOD::EventInfo#*",
                  "xAOD::EventAuxInfo#*",
                  "xAOD::FaserTriggerData#*",
-                 "xAOD::FaserTriggerDataAuxInfo#*" ]
+                 "xAOD::FaserTriggerDataAux#*" ]
     acc.merge(OutputStreamCfg(ConfigFlags, "RDO", itemList))
     ostream = acc.getEventAlgo("OutputStreamRDO")
 

Event/FaserByteStreamCnvSvc/python/FaserByteStreamCnvSvcConfig.py

@@ -13,7 +13,7 @@ def FaserEventSelectorByteStreamCfg(configFlags, **kwargs):
 # Load ByteStreamCnvSvc
     byteSvc = CompFactory.FaserByteStreamCnvSvc
     byteSvcInstance = byteSvc(name = "FaserByteStreamCnvSvc")
-    byteSvcInstance.InitCnvs += [ "xAOD::FaserTriggerDataAuxInfo" , "xAOD::FaserTriggerData"  ]
+    byteSvcInstance.InitCnvs += [ "xAOD::FaserTriggerDataAux" , "xAOD::FaserTriggerData"  ]
     result.addService(byteSvcInstance)
 
 # Load EventSelectorByteStream

Event/FaserByteStreamCnvSvc/share/jobOptions_faserBSToRDO.py

@@ -71,7 +71,7 @@ xaodStream.AddItem( "xAOD::EventInfo#*" )
 xaodStream.AddItem( "xAOD::EventAuxInfo#*" )
 # Currently, this doesn't write the Aux data...
 xaodStream.AddItem( "xAOD::FaserTriggerData#*")
-xaodStream.AddItem( "xAOD::FaserTriggerDataAuxInfo#*")
+xaodStream.AddItem( "xAOD::FaserTriggerDataAux#*")
 # Tracker RDOs
 # xaodStream.AddItem( "FaserSCT_RDO_Container#*" )
 xaodStream.Print()

Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py

@@ -10,7 +10,7 @@ def FaserByteStreamCnvSvcBaseCfg(flags, **kwargs):
     result.addService(adxProvider)
 
     adxProvider.TypeNames += [ "xAOD::FaserTriggerData/FaserTriggerData",
-                               "xAOD::FaserTriggerDataAuxInfo/FaserTriggerDataAuxInfo." ]
+                               "xAOD::FaserTriggerDataAux/FaserTriggerDataAux." ]
 
     adxProvider.TypeNames += [
         "ScintWaveformContainer/CaloWaveforms",

Event/FaserByteStreamCnvSvcBase/share/BSAddProvSvc_jobOptions.py

@@ -7,7 +7,7 @@ if not hasattr( svcMgr, "FaserByteStreamAddressProviderSvc" ):
 # Correnct syntax for non-containers
 svcMgr.FaserByteStreamAddressProviderSvc.TypeNames += [ 
     "xAOD::FaserTriggerData/FaserTriggerData",
-    "xAOD::FaserTriggerDataAuxInfo/FaserTriggerDataAuxInfo."
+    "xAOD::FaserTriggerDataAux/FaserTriggerDataAux."
 ]
 
 # Add the different Scintillator containers

Tracker/TrackerEventCnv/TrackerEventAthenaPool/TrackerEventAthenaPool/FaserSCT_RawDataContainer_p4.h

@@ -26,7 +26,7 @@ class FaserSCT_RawDataContainer_p4
 /// Default constructor
   FaserSCT_RawDataContainer_p4();
   friend class FaserSCT_RawDataContainerCnv_p4;
- private:
+  //private:
   std::vector<TrackerRawDataCollection_p1>  m_collections;
   std::vector<TrackerRawData_p2>            m_rawdata;
   std::vector<FaserSCT3_RawData_p4>         m_sct3data;

Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx

@@ -16,7 +16,7 @@
 #include "GaudiKernel/IRegistry.h"
 
 #include "xAODFaserTrigger/FaserTriggerData.h"
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"
 
 #include "StoreGate/StoreGateSvc.h"
 
@@ -36,7 +36,7 @@ FaserTriggerByteStreamAuxCnv::FaserTriggerByteStreamAuxCnv(ISvcLocator* svcloc)
 
 const CLID& FaserTriggerByteStreamAuxCnv::classID() 
 {
-  return ClassID_traits<xAOD::FaserTriggerDataAuxInfo>::ID();
+  return ClassID_traits<xAOD::FaserTriggerDataAux>::ID();
 }
 
 long FaserTriggerByteStreamAuxCnv::storageType() 
@@ -95,20 +95,20 @@ StatusCode FaserTriggerByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr, DataOb
 
 
   xAOD::FaserTriggerData triggerData;
-  xAOD::FaserTriggerDataAuxInfo* pTriggerDataAux = new xAOD::FaserTriggerDataAuxInfo();
+  xAOD::FaserTriggerDataAux* pTriggerDataAux = new xAOD::FaserTriggerDataAux();
   triggerData.setStore(pTriggerDataAux);
 
   CHECK( m_tool->convert(re, &triggerData) );
 
   pObj = StoreGateSvc::asStorable(pTriggerDataAux);
 
-  ATH_MSG_DEBUG("Created xAOD::FaserTriggerDataAuxInfo for run/event =" << runNumber << " / " << eventNumber);
+  ATH_MSG_DEBUG("Created xAOD::FaserTriggerDataAux for run/event =" << runNumber << " / " << eventNumber);
   return StatusCode::SUCCESS;
 }
 
 StatusCode FaserTriggerByteStreamAuxCnv::createRep(DataObject* /*pObj*/, IOpaqueAddress*& /*pAddr*/) 
 {
-  ATH_MSG_DEBUG("Nothing to be done for xAOD::FaserTriggerDataAuxInfo createReps");
+  ATH_MSG_DEBUG("Nothing to be done for xAOD::FaserTriggerDataAux createReps");
   return StatusCode::SUCCESS;
 }
 

Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx

@@ -6,7 +6,7 @@
 
 #include "FaserByteStreamCnvSvcBase/FaserByteStreamAddress.h"
 #include "xAODFaserTrigger/FaserTriggerData.h"
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"
 #include "EventFormats/DAQFormats.hpp"
 
 #include "AthenaKernel/errorcheck.h"
@@ -61,10 +61,10 @@ StatusCode FaserTriggerByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObjec
   ATH_MSG_DEBUG("Creating Objects");
 
   const std::string nm = *(pRE_Addr->par());
-  const std::string nmAux = nm + "AuxInfo.";
+  const std::string nmAux = nm + "Aux.";
 
   xAOD::FaserTriggerData* pTriggerData = new xAOD::FaserTriggerData();
-  DataLink<xAOD::FaserTriggerDataAuxInfo> link(nmAux);
+  DataLink<xAOD::FaserTriggerDataAux> link(nmAux);
   pTriggerData->setStore(link);
   pObj = StoreGateSvc::asStorable(pTriggerData);
 

Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx

@@ -6,7 +6,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 
 #include "xAODFaserTrigger/FaserTriggerData.h"
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"
 
 #include "EventFormats/TLBDataFragment.hpp"
 

xAOD/xAODFaserTrigger/CMakeLists.txt

@@ -16,7 +16,7 @@ atlas_add_library( xAODFaserTrigger
 atlas_add_xaod_smart_pointer_dicts(
    INPUT xAODFaserTrigger/selection.xml
    OUTPUT _selectionFile
-   OBJECTS "xAOD::FaserTriggerData_v1")
+   OBJECTS "xAOD::FaserTriggerData_v1" "xAOD::FaserTriggerDataAux_v1")
 
 atlas_add_dictionary( xAODFaserTriggerDict
    xAODFaserTrigger/xAODFaserTriggerDict.h
@@ -25,4 +25,4 @@ atlas_add_dictionary( xAODFaserTriggerDict
    EXTRA_FILES Root/dict/*.cxx )
 
 # Understand what this does...
-# atlas_generate_cliddb( xAODFaserTrigger )
+atlas_generate_cliddb( xAODFaserTrigger )

xAOD/xAODFaserTrigger/Root/FaserTriggerDataAuxInfo_v1.cxx → xAOD/xAODFaserTrigger/Root/FaserTriggerDataAux_v1.cxx

@@ -5,11 +5,11 @@
 // $Id: $
 
 // Local include(s):
-#include "xAODFaserTrigger/versions/FaserTriggerDataAuxInfo_v1.h"
+#include "xAODFaserTrigger/versions/FaserTriggerDataAux_v1.h"
 
 namespace xAOD {
 
-  FaserTriggerDataAuxInfo_v1::FaserTriggerDataAuxInfo_v1()
+  FaserTriggerDataAux_v1::FaserTriggerDataAux_v1()
     : AuxInfoBase(),
       header(0), eventId(0), orbitId(0), bcid(0), 
       inputBitsNextClk(0), inputBits(0), tbp(0), tap(0) {

xAOD/xAODFaserTrigger/Root/xAODFaserTriggerCLIDs.cxx

@@ -5,4 +5,4 @@
 //simple includes to force the CLASS_DEF etc to be encountered during compile
 
 #include "xAODFaserTrigger/FaserTriggerData.h"
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"

xAOD/xAODFaserTrigger/xAODFaserTrigger/FaserTriggerDataAuxInfo.h → xAOD/xAODFaserTrigger/xAODFaserTrigger/FaserTriggerDataAux.h

@@ -4,19 +4,19 @@
   Copyright (C) 2020 CERN for the benefit of the FASER collaboration
 */
 
-#ifndef XAODFASERTRIGGER_FASERTRIGGERDATAAUXINFO_H
-#define XAODFASERTRIGGER_FASERTRIGGERDATAAUXINFO_H
+#ifndef XAODFASERTRIGGER_FASERTRIGGERDATAAUX_H
+#define XAODFASERTRIGGER_FASERTRIGGERDATAAUX_H
 
 // Local include(s):
-#include "xAODFaserTrigger/versions/FaserTriggerDataAuxInfo_v1.h"
+#include "xAODFaserTrigger/versions/FaserTriggerDataAux_v1.h"
 
 namespace xAOD {
   /// Declare the latest version of the class
-  typedef FaserTriggerDataAuxInfo_v1 FaserTriggerDataAuxInfo;
+  typedef FaserTriggerDataAux_v1 FaserTriggerDataAux;
 }
 
 // Set up a CLID for the container:
 #include "xAODCore/CLASS_DEF.h"
-CLASS_DEF( xAOD::FaserTriggerDataAuxInfo, 82583928, 1 )
+CLASS_DEF( xAOD::FaserTriggerDataAux, 155975504, 1 )
 
-#endif // XAODFASERTRIGGER_FASERTRIGGERDATAAUXINFO_H
+#endif // XAODFASERTRIGGER_FASERTRIGGERDATAAUX_H

xAOD/xAODFaserTrigger/xAODFaserTrigger/selection.xml

@@ -6,8 +6,8 @@
 	 id="965196C8-AC56-421C-9AC7-D7DB62E2AFFC"/>
   <typedef name="xAOD::FaserTriggerData" />
 
-  <class name="xAOD::FaserTriggerDataAuxInfo_v1" 
+  <class name="xAOD::FaserTriggerDataAux_v1" 
 	 id="5F26C42B-3BF1-44CA-A127-172ED5797936"/>
-  <typedef name="xAOD::FaserTriggerDataAuxInfo" />
+  <typedef name="xAOD::FaserTriggerDataAux" />
 
 </lcgdict>

xAOD/xAODFaserTrigger/xAODFaserTrigger/versions/FaserTriggerDataAuxInfo_v1.h → xAOD/xAODFaserTrigger/xAODFaserTrigger/versions/FaserTriggerDataAux_v1.h

@@ -4,8 +4,8 @@
   Copyright (C) 2020 CERN for the benefit of the FASER collaboration
 */
 
-#ifndef XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUXINFO_V1_H
-#define XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUXINFO_V1_H
+#ifndef XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUX_V1_H
+#define XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUX_V1_H
 
 // System include(s):
 extern "C" {
@@ -26,11 +26,11 @@ namespace xAOD {
   /// $Revision:  $
   /// $Date: $
 
-  class FaserTriggerDataAuxInfo_v1 : public AuxInfoBase {
+  class FaserTriggerDataAux_v1 : public AuxInfoBase {
 
   public:
     /// Default constructor
-    FaserTriggerDataAuxInfo_v1();
+    FaserTriggerDataAux_v1();
 
   private:
     /// @name TriggerLogicBoard payload
@@ -51,8 +51,8 @@ namespace xAOD {
 
 // Set up the StoreGate inheritance of the class:
 #include "xAODCore/BaseInfo.h"
-SG_BASE( xAOD::FaserTriggerDataAuxInfo_v1, xAOD::AuxInfoBase );
+SG_BASE( xAOD::FaserTriggerDataAux_v1, xAOD::AuxInfoBase );
 
-#endif // XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUXINFO_V1_H
+#endif // XAODFASERTRIGGER_VERSIONS_FASERTRIGGERDATAAUX_V1_H
 
 

xAOD/xAODFaserTrigger/xAODFaserTrigger/xAODFaserTriggerDict.h

@@ -7,9 +7,9 @@
 
 // Local include(s):
 #include "xAODFaserTrigger/FaserTriggerData.h"
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"
 #include "xAODFaserTrigger/versions/FaserTriggerData_v1.h"
-#include "xAODFaserTrigger/versions/FaserTriggerDataAuxInfo_v1.h"
+#include "xAODFaserTrigger/versions/FaserTriggerDataAux_v1.h"
 
 // EDM include(s).
 #include "xAODCore/tools/DictHelpers.h"

xAOD/xAODFaserTriggerAthenaPool/CMakeLists.txt

@@ -6,8 +6,8 @@ atlas_subdir( xAODFaserTriggerAthenaPool )
 # Component(s) in the package:
 atlas_add_poolcnv_library( xAODFaserTriggerAthenaPoolPoolCnv
    src/*.h src/*.cxx
-   FILES xAODFaserTrigger/FaserTriggerData.h xAODFaserTrigger/FaserTriggerDataAuxInfo.h
-   TYPES_WITH_NAMESPACE xAOD::FaserTriggerData xAOD::FaserTriggerDataAuxInfo
+   FILES xAODFaserTrigger/FaserTriggerData.h xAODFaserTrigger/FaserTriggerDataAux.h
+   TYPES_WITH_NAMESPACE xAOD::FaserTriggerData xAOD::FaserTriggerDataAux
    CNV_PFX xAOD
    LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities xAODFaserTrigger )
 

xAOD/xAODFaserTriggerAthenaPool/src/xAODFaserTriggerDataAuxInfoCnv.h → xAOD/xAODFaserTriggerAthenaPool/src/xAODFaserTriggerDataAuxCnv.h

@@ -4,13 +4,13 @@
   Copyright (C) 2020 CERN for the benefit of the FASER collaboration
 */
 
-#ifndef XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXINFOCNV_H
-#define XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXINFOCNV_H
+#ifndef XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXCNV_H
+#define XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXCNV_H
 
-#include "xAODFaserTrigger/FaserTriggerDataAuxInfo.h"
+#include "xAODFaserTrigger/FaserTriggerDataAux.h"
 #include "AthenaPoolCnvSvc/T_AthenaPoolAuxContainerCnv.h"
 
-typedef T_AthenaPoolAuxContainerCnv<xAOD::FaserTriggerDataAuxInfo> xAODFaserTriggerDataAuxInfoCnv;
+typedef T_AthenaPoolAuxContainerCnv<xAOD::FaserTriggerDataAux> xAODFaserTriggerDataAuxCnv;
 
 
-#endif // XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXINFOCNV_H
+#endif // XAODFASERTRIGGERDATAATHENAPOOL_XAODFASERTRIGGERDATAAUXCNV_H