Merge branch 'add_TGCDigit' into 'master'

MuonPRDTest: Add DoTGCDigit option to NSWPRDValAlg

See merge request atlas/athena!44130

MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx

@@ -50,6 +50,7 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator) :
   declareProperty("RPC_DigitContainerName",         m_RPC_DigitContainerName="RPC_DIGITS");
   declareProperty("CSC_SimContainerName",           m_CSC_SimContainerName="CSC_Hits");
   declareProperty("TGC_SimContainerName",           m_TGC_SimContainerName="TGC_Hits");
+  declareProperty("TGC_DigitContainerName",         m_TGC_DigitContainerName="TGC_DIGITS");
   declareProperty("TGC_RDOContainerName",           m_TGC_RDOContainerName="TGCRDO");
 
   // Input properties: do EDM objects
@@ -75,6 +76,7 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator) :
   declareProperty("doRPCDigit",      m_doRPCDigit=false);
   declareProperty("doCSCHit",        m_doCSCHit=false);
   declareProperty("doTGCHit",        m_doTGCHit=false);
+  declareProperty("doTGCDigit",      m_doTGCDigit=false);
   declareProperty("doTGCRDO",        m_doTGCRDO=false);
 
   // Input properties: NSW Maching algorithm
@@ -247,6 +249,12 @@ StatusCode NSWPRDValAlg::initialize() {
      ATH_CHECK( m_TGCSimHitVar->initializeVariables() );
   }
 
+  if (m_doTGCDigit){
+     m_TgcDigitVar = std::make_unique<TGCDigitVariables>(&(*(evtStore())), m_muonDetMgrDS,
+                                                &m_idHelperSvc->tgcIdHelper(), m_tree, m_TGC_DigitContainerName, msgLevel());
+     ATH_CHECK( m_TgcDigitVar->initializeVariables() );
+  }
+
   if (m_retrieveTgcCabling) {
      const ITGCcablingServerSvc* TgcCabGet = nullptr;
      ATH_CHECK(service("TGCcablingServerSvc", TgcCabGet, true));
@@ -338,6 +346,8 @@ StatusCode NSWPRDValAlg::execute()
 
   if (m_doTGCHit) ATH_CHECK( m_TGCSimHitVar->fillVariables(muonDetMgr) );
 
+  if (m_doTGCDigit) ATH_CHECK( m_TgcDigitVar->fillVariables(muonDetMgr) );
+
   if (m_doTGCRDO) ATH_CHECK( m_TgcRdoVar->fillVariables(muonDetMgr) );
 
   m_tree->Fill();

MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.h

@@ -26,6 +26,7 @@
 #include "CSCSimHitVariables.h"
 #include "CSCDigitVariables.h"
 #include "TGCSimHitVariables.h"
+#include "TGCDigitVariables.h"
 #include "TGCRDOVariables.h"
 #include "sTGCSimHitVariables.h"
 #include "sTGCSDOVariables.h"
@@ -80,6 +81,7 @@ class NSWPRDValAlg:public AthAlgorithm
   std::unique_ptr<RpcDigitVariables>      m_RPCDigitVar;
   std::unique_ptr<CSCSimHitVariables>     m_CSCSimHitVar;
   std::unique_ptr<TGCSimHitVariables>     m_TGCSimHitVar;
+  std::unique_ptr<TGCDigitVariables>      m_TgcDigitVar;
   std::unique_ptr<TGCRDOVariables>        m_TgcRdoVar;
 
   TTree* m_tree; // still needed in NSWMatchingAlg during finalize
@@ -120,7 +122,8 @@ class NSWPRDValAlg:public AthAlgorithm
   BooleanProperty  m_doRPCSDO;           // switch on the output of the RPC SDO
   BooleanProperty  m_doRPCDigit;         // switch on the output of the RPC digitization
   BooleanProperty  m_doTGCHit;           // switch on the output of the TGC simulated hits
-  BooleanProperty  m_doTGCRDO;           // switch on the output of the TGC digitization
+  BooleanProperty  m_doTGCDigit;         // switch on the output of the TGC digitization
+  BooleanProperty  m_doTGCRDO;           // switch on the output of the TGC RDO
 
   unsigned int m_runNumber;
   unsigned int m_eventNumber;
@@ -146,6 +149,7 @@ class NSWPRDValAlg:public AthAlgorithm
   std::string m_RPC_DigitContainerName;
   std::string m_CSC_SimContainerName;
   std::string m_TGC_SimContainerName;
+  std::string m_TGC_DigitContainerName;
   std::string m_TGC_RDOContainerName;
 
   // Matching algorithm