Merge branch 'main_HGTD_cluster_test' into 'main'

Main hgtd cluster test

See merge request atlas/athena!68222

Event/xAOD/xAODInDetMeasurement/CMakeLists.txt

@@ -4,7 +4,8 @@
 atlas_subdir( xAODInDetMeasurement )
 
 # External dependencies:
-find_package( xAODUtilities )
+#find_package( xAODUtilities InDetEventTPCnv)
+find_package( xAODUtilities)
 
 atlas_add_library( xAODInDetMeasurement
     xAODInDetMeasurement/*.h xAODInDetMeasurement/versions/*.h Root/*.cxx
@@ -14,11 +15,13 @@ atlas_add_library( xAODInDetMeasurement
 atlas_add_xaod_smart_pointer_dicts(
     INPUT xAODInDetMeasurement/selection.xml
     OUTPUT _selectionFile
-    CONTAINERS 
-       "xAOD::PixelClusterContainer_v1" 
-       "xAOD::StripClusterContainer_v1" 
+    CONTAINERS
+       "xAOD::PixelClusterContainer_v1"
+       "xAOD:HGTDClusterContainer_v1"
+       "xAOD::StripClusterContainer_v1"
        "xAOD::SpacePointContainer_v1" )
 
+
 atlas_add_dictionary( xAODInDetMeasurementDict
     xAODInDetMeasurement/xAODInDetMeasurementDict.h
     ${_selectionFile}
@@ -30,6 +33,12 @@ atlas_add_test( xAODInDetMeasurement_PixelCluster_test
    SOURCES test/xAODInDetMeasurement_PixelCluster_test.cxx
    LINK_LIBRARIES xAODInDetMeasurement )
 
+atlas_add_test( xAODInDetMeasurement_HGTDCluster_test
+   SOURCES test/xAODInDetMeasurement_HGTDCluster_test.cxx
+   LINK_LIBRARIES xAODInDetMeasurement )
+
+
+
 atlas_add_test( xAODInDetMeasurement_StripCluster_test
    SOURCES test/xAODInDetMeasurement_StripCluster_test.cxx
    LINK_LIBRARIES xAODInDetMeasurement )
@@ -37,3 +46,4 @@ atlas_add_test( xAODInDetMeasurement_StripCluster_test
 atlas_add_test( xAODInDetMeasurement_SpacePoint_test
    SOURCES test/xAODInDetMeasurement_SpacePoint_test.cxx
    LINK_LIBRARIES xAODInDetMeasurement )
+

Event/xAOD/xAODInDetMeasurement/Root/HGTDClusterAuxContainer_v1.cxx

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "xAODInDetMeasurement/versions/HGTDClusterAuxContainer_v1.h"
+
+namespace xAOD {
+HGTDClusterAuxContainer_v1::HGTDClusterAuxContainer_v1()
+    : AuxContainerBase() {
+    AUX_VARIABLE(identifier);
+    AUX_VARIABLE(identifierHash);
+    AUX_MEASUREMENTVAR(localPosition, 3);
+    AUX_MEASUREMENTVAR(localCovariance, 3);
+    AUX_VARIABLE(rdoList);
+    AUX_VARIABLE(totList);
+}
+}  // namespace xAOD

Event/xAOD/xAODInDetMeasurement/Root/HGTDCluster_v1.cxx

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+// EDM include(s):
+#include "xAODCore/AuxStoreAccessorMacros.h"
+// Local include(s):
+#include "xAODInDetMeasurement/versions/HGTDCluster_v1.h"
+
+// rdoList
+static const SG::AuxElement::Accessor<std::vector<Identifier::value_type> >
+    rdoListAcc("rdoList");
+
+
+void xAOD::HGTDCluster_v1::setRDOlist(const std::vector<Identifier>& rdoList) {
+    std::vector<Identifier::value_type> rdos(rdoList.size());
+    for (std::size_t i(0); i < rdos.size(); ++i) {
+        rdos[i] = rdoList[i].get_compact();
+    }
+    rdoListAcc(*this) = rdos;
+}
+
+const std::vector<Identifier> xAOD::HGTDCluster_v1::rdoList() const {
+    const std::vector<Identifier::value_type>& values = rdoListAcc(*this);
+    std::vector<Identifier> rdos(values.size());
+    for (std::size_t i(0); i < rdos.size(); ++i) {
+        rdos[i].set_literal(values[i]);
+    }
+    return rdos;
+}
+
+
+// totList
+AUXSTORE_OBJECT_SETTER_AND_GETTER(xAOD::HGTDCluster_v1, std::vector<int>, totList,
+				  setToTlist)

Event/xAOD/xAODInDetMeasurement/Root/dict/ContainerProxies.cxx

@@ -9,10 +9,12 @@
 #include "xAODInDetMeasurement/versions/PixelClusterContainer_v1.h"
 #include "xAODInDetMeasurement/versions/StripClusterContainer_v1.h"
 #include "xAODInDetMeasurement/versions/SpacePointContainer_v1.h"
+#include "xAODInDetMeasurement/versions/HGTDClusterContainer_v1.h"
 
 // Set up the collection proxies:
 ADD_NS_DV_PROXY( xAOD, PixelClusterContainer_v1 );
 ADD_NS_DV_PROXY( xAOD, StripClusterContainer_v1 );
 ADD_NS_DV_PROXY( xAOD, SpacePointContainer_v1 );
+ADD_NS_DV_PROXY( xAOD, HGTDClusterContainer_v1 );
 
 

Event/xAOD/xAODInDetMeasurement/share/xAODInDetMeasurement_HGTDCluster_test.ref

+ --------- MEASUREMENT BASE ------------
+Identifier Hash = 156237
+Identifier = 96851257
+Local Position = 0.1
+0.5
+3.2
+Local Covariance = 0.012     0	0
+    0 0.012	0
+    0	0       0.005	
+ --------- HGTD CLUSTER INFO -----------
+RDOs = [0x200921680c00000, 0x298094737200000, 0x24e105292800000, 0x298094737200000, 0xaa1cdd0d200000, 0x200921680c00000]
+ToTs = [1, 2, 3, 4, 5, 6] 

Event/xAOD/xAODInDetMeasurement/test/xAODInDetMeasurement_HGTDCluster_test.cxx

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+// System include(s):
+#include <iostream>
+
+// Local include(s):
+#include "xAODInDetMeasurement/HGTDClusterContainer.h"
+#include "xAODInDetMeasurement/HGTDClusterAuxContainer.h"
+#include "xAODInDetMeasurement/Utilities.h"
+
+#include "GeoPrimitives/GeoPrimitives.h"
+
+#include "xAODMeasurementBase/MeasurementDefs.h"
+
+template< typename T >
+std::ostream& operator<< ( std::ostream& out,
+                           const std::vector< T >& vec ) {
+
+   out << "[";
+   for( size_t i = 0; i < vec.size(); ++i ) {
+      out << vec[ i ];
+      if( i < vec.size() - 1 ) {
+         out << ", ";
+      }
+   }
+   out << "]";
+   return out;
+}
+
+/// Function fill one HGTD cluster with information
+
+void fill( xAOD::HGTDCluster& HGTDCluster) {
+
+    constexpr xAOD::DetectorIDHashType idHash(156237);
+
+    constexpr xAOD::DetectorIdentType id(96851257);
+
+    Eigen::Matrix<float,3,1> localPosition(0.1, 0.5, 3.2);
+
+    Eigen::Matrix<float,3,3> localCovariance;
+    localCovariance.setZero();
+    localCovariance(0, 0) = 0.012;
+    localCovariance(1, 1) = 0.012;
+    localCovariance(2,2)  = 0.005;
+
+    HGTDCluster.setMeasurement<3>(idHash, localPosition, localCovariance);
+    HGTDCluster.setIdentifier(id);
+
+    std::vector < Identifier > rdoList = { Identifier(Identifier::value_type(0x200921680c00000)),
+                                           Identifier(Identifier::value_type(0x298094737200000)),
+                                           Identifier(Identifier::value_type(0x24e105292800000)),
+                                           Identifier(Identifier::value_type(0x298094737200000)),
+                                           Identifier(Identifier::value_type(0xaa1cdd0d200000)),
+                                           Identifier(Identifier::value_type(0x200921680c00000)) };
+
+    HGTDCluster.setRDOlist(rdoList);
+
+    std::vector < int > tots = {1, 2, 3, 4, 5, 6};
+
+    HGTDCluster.setToTlist(tots);
+    return;
+}
+
+void print ( const xAOD::HGTDCluster& HGTDCluster) {
+    std::cout << " --------- MEASUREMENT BASE ------------ " << std::endl;
+    std::cout << "Identifier Hash = " << HGTDCluster.identifierHash() << std::endl;
+    std::cout << "Identifier = " << HGTDCluster.identifier() << std::endl;
+    std::cout << "Local Position = " << HGTDCluster.localPosition<3>() << std::endl;
+    std::cout << "Local Covariance = " << HGTDCluster.localCovariance<3>() << std::endl;
+    std::cout << " --------- HGTD CLUSTER INFO ----------- " << std::endl;
+    std::cout << "RDOs = " << HGTDCluster.rdoList() << std::endl;
+    std::cout << "ToTs = " << HGTDCluster.totList() << std::endl;
+    return;
+}
+
+int main() {
+
+    // create the main containers to test:
+    xAOD::HGTDClusterAuxContainer aux;
+    xAOD::HGTDClusterContainer tpc;
+
+    tpc.setStore(&aux);
+
+    // add one HGTD cluster to the container
+    xAOD::HGTDCluster * pix = new xAOD::HGTDCluster();
+    tpc.push_back(pix);
+
+    // fill information
+    fill(*pix);
+
+    //print information
+    print(*pix);
+
+    return 0;
+}

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/HGTDCluster.h

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTER_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTER_H
+
+#include "xAODInDetMeasurement/versions/HGTDCluster_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+    /// Define the version of the pixel cluster class
+    typedef HGTDCluster_v1 HGTDCluster;
+}
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::HGTDCluster, 239123881, 1 )
+
+#endif // XAODINDETMEASUREMENT_HGTDCLUSTER_H
\ No newline at end of file

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/HGTDClusterAuxContainer.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_H
+
+// Local include(s):
+#include "xAODInDetMeasurement/versions/HGTDClusterAuxContainer_v1.h"
+
+namespace xAOD {
+   /// Definition of the current HGTD cluster auxiliary container
+   ///
+   typedef HGTDClusterAuxContainer_v1 HGTDClusterAuxContainer;
+}
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::HGTDClusterAuxContainer, 1379454273, 1 )
+
+#endif // XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_H
\ No newline at end of file

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/HGTDClusterContainer.h

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_H
+
+#include "xAODInDetMeasurement/HGTDCluster.h"
+#include "xAODInDetMeasurement/versions/HGTDClusterContainer_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+    /// Define the version of the HGTD cluster container
+    typedef HGTDClusterContainer_v1 HGTDClusterContainer;
+}
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::HGTDClusterContainer, 1419540398, 1 )
+
+#endif // XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_H
\ No newline at end of file

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/selection.xml

@@ -11,6 +11,16 @@
            id="AC1AEA8C-20D8-4206-B785-0B4538EFF66B" />
     <typedef name="xAOD::PixelClusterAuxContainer" />
 
+    <class name="xAOD::HGTDCluster_v1" />
+    <class name="xAOD::HGTDClusterContainer_v1" 
+	   id="D7E0027E-A4F2-4051-88CA-3FC696A9C65F" />
+    <typedef name="xAOD::HGTDCluster" />
+    <typedef name="xAOD::HGTDClusterContainer" />
+
+    <class name="xAOD::HGTDClusterAuxContainer_v1"
+           id="B9F8256A-DEC7-4DDB-A024-36F0C322ADDC" />
+    <typedef name="xAOD::HGTDClusterAuxContainer" />
+
     <class name="xAOD::StripCluster_v1" />
     <class name="xAOD::StripClusterContainer_v1"
            id="BF692A4A-BF3E-4626-8DD4-135C58E6C0AB" />

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/versions/HGTDClusterAuxContainer_v1.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_V1_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_V1_H
+
+#include <vector>
+
+#include "Identifier/Identifier.h"
+#include "Identifier/IdentifierHash.h"
+#include "xAODCore/AuxContainerBase.h"
+#include "xAODMeasurementBase/MeasurementDefs.h"
+
+
+namespace xAOD {
+    /// Auxiliary store for HGTD clusters
+    class HGTDClusterAuxContainer_v1 : public AuxContainerBase {
+        public:
+            /// Default constructor
+            HGTDClusterAuxContainer_v1();
+
+        private:
+        /// @name Defining uncalibrated measurement parameters
+            /// @{
+            std::vector<DetectorIdentType> identifier;
+            std::vector<DetectorIDHashType> identifierHash;
+            std::vector<PosAccessor<3>::element_type> localPosition;
+            std::vector<CovAccessor<3>::element_type> localCovariance;
+            /// @}
+
+        /// @name Defining HGTD cluster parameters
+        /// @{
+        std::vector<std::vector<Identifier::value_type> > rdoList;
+        std::vector<std::vector<int> > totList;
+
+    };
+}
+
+// Set up the StoreGate inheritance for the class:
+#include "xAODCore/BaseInfo.h"
+SG_BASE(xAOD::HGTDClusterAuxContainer_v1, xAOD::AuxContainerBase);
+
+
+#endif // XAODINDETMEASUREMENT_HGTDCLUSTERAUXCONTAINER_V1_H
+

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/versions/HGTDClusterContainer_v1.h

+/*
+ * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ */
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_V1_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_V1_H
+
+
+// Core include(s):
+#include "AthContainers/DataVector.h"
+#include "xAODInDetMeasurement/versions/HGTDCluster_v1.h"
+
+namespace xAOD {
+    /// The container is a simple typedef for now
+    typedef DataVector< xAOD::HGTDCluster_v1 > HGTDClusterContainer_v1;
+}
+
+#endif // XAODINDETMEASUREMENT_HGTDCLUSTERCONTAINER_V1_H

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/versions/HGTDCluster_v1.h

+/**
+ * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ *
+ * @file HGTDCluster_v1.h
+ * @author Dimitrios Ntounis <dimitrios.ntounis@cern.ch>
+ * @date 2024
+ * @brief Class to represent HGTDCluster_v1 in the xAOD format.
+ */
+
+#ifndef XAODINDETMEASUREMENT_HGTDCLUSTER_V1_H
+#define XAODINDETMEASUREMENT_HGTDCLUSTER_V1_H
+
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "Identifier/Identifier.h"
+#include "xAODMeasurementBase/versions/UncalibratedMeasurement_v1.h"
+
+namespace xAOD {
+
+/// @class PixelCluster_v1
+/// Class describing HGTD clusters
+
+
+class HGTDCluster_v1 : public UncalibratedMeasurement_v1 {
+
+    public:
+
+    /// Default constructor
+    HGTDCluster_v1() = default;
+    /// Virtual destructor
+    virtual ~HGTDCluster_v1() = default;
+
+
+    /// Returns the type of the HGTD cluster as a simple enumeration
+    xAOD::UncalibMeasType type() const override final {
+        return xAOD::UncalibMeasType::HGTDClusterType;
+    }
+    unsigned int numDimensions() const override final { return 3; }
+
+
+    /// Returns the list of identifiers of the channels building the cluster
+    const std::vector<Identifier> rdoList() const;
+
+
+
+    /// Returns the list of Time Over Threshold of the channels building the cluster
+    const std::vector<int>& totList() const;
+
+
+    /// @name Functions to set HGTD cluster properties
+    /// @{
+
+    /// Sets the list of identifiers of the channels building the cluster
+    void setRDOlist(const std::vector<Identifier>& rdolist);
+
+    /// Sets the list of ToT of the channels building the cluster
+    void setToTlist(const std::vector<int>& tots);
+
+    /// @}
+
+};
+
+} // namespace xAOD
+#include "AthContainers/DataVector.h"
+DATAVECTOR_BASE(xAOD::HGTDCluster_v1, xAOD::UncalibratedMeasurement_v1);
+#endif // XAODHGTDCluster_v1_H

Event/xAOD/xAODInDetMeasurement/xAODInDetMeasurement/xAODInDetMeasurementDict.h

@@ -11,6 +11,14 @@
 #include "xAODInDetMeasurement/versions/PixelClusterContainer_v1.h"
 #include "xAODInDetMeasurement/versions/PixelClusterAuxContainer_v1.h"
 
+#include "xAODInDetMeasurement/HGTDCluster.h"
+#include "xAODInDetMeasurement/HGTDClusterContainer.h"
+#include "xAODInDetMeasurement/HGTDClusterAuxContainer.h"
+#include "xAODInDetMeasurement/versions/HGTDCluster_v1.h"
+#include "xAODInDetMeasurement/versions/HGTDClusterContainer_v1.h"
+#include "xAODInDetMeasurement/versions/HGTDClusterAuxContainer_v1.h"
+
+
 #include "xAODInDetMeasurement/StripCluster.h"
 #include "xAODInDetMeasurement/StripClusterContainer.h"
 #include "xAODInDetMeasurement/versions/StripCluster_v1.h"
@@ -32,6 +40,7 @@ namespace {
   struct GCCXML_DUMMY_INSTANTIATION_XAODINDETMEASUREMENT {
         // Type(s) needed for the dictionary generation to succeed.
         XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, PixelClusterContainer_v1 );
+        XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, HGTDClusterContainer_v1 );
         XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, StripClusterContainer_v1 );
         XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, SpacePointContainer_v1 );
         xAOD::ArrayFloat3 array_type1;

Event/xAOD/xAODMeasurementBase/xAODMeasurementBase/MeasurementDefs.h

@@ -32,6 +32,7 @@ enum class UncalibMeasType {
     TgcStripType = 5,
     MMClusterType = 6,
     sTgcStripType = 7,
+    HGTDClusterType = 8,
 };
 
 /// @ detector ID element hash