Merge branch 'master-steering-simon-4' into 'master'

Add functionality for decision creation to TrigCompositeUtils and migrate all clients

See merge request atlas/athena!13561

Former-commit-id: 5233d06d

Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx

@@ -476,3 +476,14 @@ namespace xAOD {
    /////////////////////////////////////////////////////////////////////////////
 
 } // namespace xAOD
+
+std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc) {
+  os << "TrigComposite_v1 '" << tc.name() << "' link: name, key, index, CLID" << std::endl;
+  for (size_t i=0; i<tc.linkColNames().size(); ++i){
+    os << tc.linkColNames()[i] << ", ";
+    os << tc.linkColKeys()[i] << ", ";
+    os << tc.linkColIndices()[i] << ", ";
+    os << tc.linkColClids()[i] << std::endl;
+  }
+  return os;
+}

Event/xAOD/xAODTrigger/test/ut_xaodtrigger_trigcomposite_test.cxx

@@ -61,14 +61,21 @@ int populateObject(xAOD::TrigComposite* obj) {
 
    std::cout << "Set detail ok." << std::endl;
 
+   // create a MuonRoIContainer in order to have "valid" ElementLinks
+   // they will have made up SG key hashes but they are internally "valid"
+   auto mrc = new xAOD::MuonRoIContainer();
+   for (unsigned int i = 0; i<20; i++){
+     xAOD::MuonRoI* roi = new xAOD::MuonRoI();
+     mrc->push_back( roi );
+   }
    // Now test the ElementLink functionality in a basic way:
    obj->setObjectLink( "MuonRoI",
-                       ElementLink<xAOD::MuonRoIContainer>( 123, 456 ) );
+                       ElementLink<xAOD::MuonRoIContainer>( 123, 11, mrc->at(11)) );
 
    // Test the ElementLinkVector functionality in a basic way:
    ElementLinkVector<xAOD::MuonRoIContainer> elementLinks;
-   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 789, 012 ) );
-   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 345, 678 ) );
+   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 789, 13, mrc->at(13) ) );
+   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 345, 17, mrc->at(17) ) );
    obj->addObjectCollectionLinks("ManyMuonRoIs", elementLinks);
 
    return 0;
@@ -179,19 +186,19 @@ int testLinks(const xAOD::TrigComposite* obj, const size_t expectedSize = 3) {
    SIMPLE_ASSERT( obj->linkColIndices().size() == expectedSize );
    SIMPLE_ASSERT( obj->linkColClids().size() == expectedSize );
    SIMPLE_ASSERT( obj->linkColKeys()[ 0 ] == 123 );
-   SIMPLE_ASSERT( obj->linkColIndices()[ 0 ] == 456 );
+   SIMPLE_ASSERT( obj->linkColIndices()[ 0 ] == 11 );
    SIMPLE_ASSERT( obj->linkColClids()[ 0 ] ==
                   ClassID_traits< xAOD::MuonRoIContainer >::ID() );
 
    std::cout << "Basic link functionality OK" << std::endl;
 
    ElementLink< xAOD::MuonRoIContainer > getMuonRoILink = obj->objectLink<xAOD::MuonRoIContainer>("MuonRoI");
-   SIMPLE_ASSERT(getMuonRoILink == ElementLink<xAOD::MuonRoIContainer>( 123, 456 ));
+   SIMPLE_ASSERT(getMuonRoILink == ElementLink<xAOD::MuonRoIContainer>( 123, 11 ));
 
    ElementLinkVector<xAOD::MuonRoIContainer> getMuonRoILinks = obj->objectCollectionLinks<xAOD::MuonRoIContainer>("ManyMuonRoIs");
    ElementLinkVector<xAOD::MuonRoIContainer> elementLinks;
-   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 789, 012 ) );
-   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 345, 678 ) );
+   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 789, 13 ) );
+   elementLinks.push_back( ElementLink<xAOD::MuonRoIContainer>( 345, 17 ) );
    SIMPLE_ASSERT(getMuonRoILinks == elementLinks);
 
    std::cout << "Link recovery OK" << std::endl;
@@ -254,7 +261,12 @@ int main() {
    // Copy over all other links
    SIMPLE_ASSERT( fullCopy->copyAllLinksFrom( obj ) == true );
    // Add another too
-   fullCopy->setObjectLink( "feature", ElementLink<xAOD::MuonRoIContainer>( 111, 222 ) );
+   auto mrc = new xAOD::MuonRoIContainer();
+   for (unsigned int i = 0; i<20; i++){
+     xAOD::MuonRoI* roi = new xAOD::MuonRoI();
+     mrc->push_back( roi );
+   }
+   fullCopy->setObjectLink( "feature", ElementLink<xAOD::MuonRoIContainer>( 111, 19, mrc->at(0) ) );
    SIMPLE_ASSERT( testLinks(fullCopy, 4) == 0 );
 
    std::cout << "Full-copy of element links OK" << std::endl;
@@ -285,7 +297,7 @@ int main() {
 
    // Check we can still access the element link unique to fullCopy
    ElementLink<xAOD::MuonRoIContainer> getFeatureLink = fullCopy->objectLink<xAOD::MuonRoIContainer>("feature");
-   SIMPLE_ASSERT(getFeatureLink == ElementLink<xAOD::MuonRoIContainer>( 111, 222 ));
+   SIMPLE_ASSERT(getFeatureLink == ElementLink<xAOD::MuonRoIContainer>( 111, 19, mrc->at(0) ));
 
    // Make new objects to test the manual link copy
    xAOD::TrigComposite* manualCopy = new xAOD::TrigComposite();
@@ -298,7 +310,7 @@ int main() {
    SIMPLE_ASSERT( testLinks(manualCopy, 4) == 0 );
 
    ElementLink<xAOD::MuonRoIContainer> getFeatureLinkAgain = manualCopy->objectLink<xAOD::MuonRoIContainer>("featureWithNewName");
-   SIMPLE_ASSERT(getFeatureLinkAgain == ElementLink<xAOD::MuonRoIContainer>( 111, 222 ));
+   SIMPLE_ASSERT(getFeatureLinkAgain == ElementLink<xAOD::MuonRoIContainer>( 111, 19, mrc->at(0) ));
 
    std::cout << "Copy link-by-link OK" << std::endl;
 

Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h

@@ -233,4 +233,10 @@ namespace xAOD {
 // Include the template implementation:
 #include "TrigComposite_v1.icc"
 
+/**
+ * @brief print helper for TrigComposite
+ */
+std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc);
+
+
 #endif // XAODTRIGGER_VERSIONS_TRIGCOMPOSITE_V1_H

Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc

@@ -50,41 +50,56 @@ namespace xAOD {
     bool result = getDetail(name, temp);
     return std::make_pair(result, temp);
   }
-
-   template< class CONTAINER >
-   bool
-   TrigComposite_v1::setObjectLink( const std::string& name,
-                                    const ElementLink< CONTAINER >& link ) {
-
-      // Do different things depending on whether this variable already
-      // exists or not:
-      if( hasObjectLink( name ) ) {
-         // Find the right object:
-         const std::vector< std::string >& names = linkColNames();
-         for( size_t i = 0; i < names.size(); ++i ) {
-            if( names[ i ] != name ) continue;
-            // Extract the information out of the ElementLink:
-            linkColKeysNC()[ i ] = link.key();
-            linkColIndicesNC()[ i ] = link.index();
-            linkColClidsNC()[ i ] = ClassID_traits< CONTAINER >::ID();
-            // We're done:
-            return true;
-         }
-         // Some error happened...
-         std::cerr << "xAOD::TrigComposite_v1::setObjectLink ERROR Internal "
-                   << "logic error found" << std::endl;
-         return false;
-      } else {
-         // Add a new object:
-         linkColNamesNC().push_back( name );
-         linkColKeysNC().push_back( link.key() );
-         linkColIndicesNC().push_back( link.index() );
-         linkColClidsNC().push_back( ClassID_traits< CONTAINER >::ID() );
-         // And we're done:
-         return true;
+  
+  template< class CONTAINER >
+  bool
+  TrigComposite_v1::setObjectLink( const std::string& name,
+                                   const ElementLink< CONTAINER >& link ) {
+    
+    // Check link has valid persistent state, i.e. hash key is not
+    // zero, otherwise attempting to access its string key will seg
+    // fault later, e.g. in remapping.
+    if( link.key() == 0 ) {
+      std::cerr << "xAOD::TrigComposite_v1::setObjectLink ERROR "
+                << "link has invalid key hash of zero" << std::endl;
+      return false;
+    }
+       
+    if( ! link.isValid() ) {
+      std::cerr << "xAOD::TrigComposite_v1::setObjectLink ERROR "
+                << "link is not valid" << std::endl;
+      return false;
+    }
+       
+    // Do different things depending on whether this variable already
+    // exists or not:
+    if( hasObjectLink( name ) ) {
+      // Find the right object:
+      const std::vector< std::string >& names = linkColNames();
+      for( size_t i = 0; i < names.size(); ++i ) {
+        if( names[ i ] != name ) continue;
+        // Extract the information out of the ElementLink:
+        linkColKeysNC()[ i ] = link.key();
+        linkColIndicesNC()[ i ] = link.index();
+        linkColClidsNC()[ i ] = ClassID_traits< CONTAINER >::ID();
+        // We're done:
+        return true;
       }
-   }
-
+      // Some error happened...
+      std::cerr << "xAOD::TrigComposite_v1::setObjectLink ERROR Internal "
+                << "logic error found" << std::endl;
+      return false;
+    } else {
+      // Add a new object:
+      linkColNamesNC().push_back( name );
+      linkColKeysNC().push_back( link.key() );
+      linkColIndicesNC().push_back( link.index() );
+      linkColClidsNC().push_back( ClassID_traits< CONTAINER >::ID() );
+      // And we're done:
+      return true;
+    }
+  }
+  
    template< class CONTAINER >
    ElementLink< CONTAINER >
    TrigComposite_v1::objectLink( const std::string& name ) const {

Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx

@@ -97,9 +97,8 @@ StatusCode TrigBjetEtHypoAlgMT::execute_r( const EventContext& context ) const {
   // ========================================================================================================================== 
 
   // Decisions
-  std::unique_ptr< TrigCompositeUtils::DecisionContainer > outputDecision( new TrigCompositeUtils::DecisionContainer() );
-  std::unique_ptr< TrigCompositeUtils::DecisionAuxContainer > outputAuxDecision( new TrigCompositeUtils::DecisionAuxContainer() );
-  outputDecision->setStore( outputAuxDecision.get() );
+  SG::WriteHandle<TrigCompositeUtils::DecisionContainer> handle = TrigCompositeUtils::createAndStore( decisionOutput(), context ); 
+  auto outputDecisions = handle.ptr();
 
   // ==========================================================================================================================
   //    ** Compute Decisions
@@ -116,7 +115,7 @@ StatusCode TrigBjetEtHypoAlgMT::execute_r( const EventContext& context ) const {
     for ( unsigned int index(0); index<nDecisions; index++ ) {
       //      const std::string decisionName = name()+"_roi_"+std::to_string(index);
       //      ATH_MSG_DEBUG( "   ** " << decisionName );
-      newDecisions.push_back( TrigCompositeUtils::newDecisionIn( outputDecision.get() ) );//,decisionName ) );
+      newDecisions.push_back( TrigCompositeUtils::newDecisionIn( outputDecisions ) );//,decisionName ) );
     }
 
     bool pass = false;
@@ -140,18 +139,16 @@ StatusCode TrigBjetEtHypoAlgMT::execute_r( const EventContext& context ) const {
       ATH_MSG_DEBUG( "Linking Jets `" << m_jetLink.value() << "` to output decision." );
     }
     
-    for( unsigned int index(0); index<nDecisions; index++ )
-      TrigCompositeUtils::linkToPrevious( newDecisions.at(index),decisionInput().key(),counter );
+    for( unsigned int index(0); index<nDecisions; index++ ){
+      TrigCompositeUtils::linkToPrevious( newDecisions.at(index),decisionInput().key(),0 );
+    }
+
     counter++;
-  }
+    }
 
   // ==========================================================================================================================
   //    ** Store Output
   // ==========================================================================================================================
-
-  // Save Output Decisions
-  SG::WriteHandle< TrigCompositeUtils::DecisionContainer > handle =  SG::makeHandle( decisionOutput(), context );
-  CHECK( handle.record( std::move(outputDecision),std::move(outputAuxDecision) ) );
   ATH_MSG_DEBUG( "Exiting with " << handle->size() << " decisions" );
 
   return StatusCode::SUCCESS;

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx

@@ -45,9 +45,10 @@ StatusCode TrigL2CaloHypoAlgMT::execute_r( const EventContext& context ) const {
 
 
   // new decisions
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore( aux.get() );
+
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
 
   // input for decision
   std::vector<ITrigL2CaloHypoTool::ClusterInfo> toolInput;
@@ -69,7 +70,7 @@ StatusCode TrigL2CaloHypoAlgMT::execute_r( const EventContext& context ) const {
     ATH_MSG_DEBUG ( "Cluster handle size: " << clusterHandle->size() << "..." );
 
     // create new decision
-    auto d = newDecisionIn( decisions.get(), name() );
+    auto d = newDecisionIn( decisions, name() );
 
 
     toolInput.emplace_back( d, roi, clusterHandle.cptr()->at(0), previousDecision );
@@ -95,8 +96,7 @@ StatusCode TrigL2CaloHypoAlgMT::execute_r( const EventContext& context ) const {
   }
  
   {// make output handle and debug
-    auto outputHandle = SG::makeHandle(decisionOutput(), context);
-    ATH_CHECK( outputHandle.record( std::move( decisions ), std::move( aux ) ) );
+
     ATH_MSG_DEBUG ( "Exit with "<<outputHandle->size() <<" decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx

@@ -7,6 +7,7 @@
 #include "AthViews/ViewHelper.h"
 
 
+using TrigCompositeUtils::createAndStore; 
 using TrigCompositeUtils::DecisionContainer;
 using TrigCompositeUtils::DecisionAuxContainer;
 using TrigCompositeUtils::DecisionIDContainer;
@@ -47,10 +48,9 @@ StatusCode TrigL2ElectronHypoAlgMT::execute_r( const EventContext& context ) con
 
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
   
-  // new output
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore( aux.get() );
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
 
   // // extract mapping of cluster pointer to an index in the cluster decision collection
 
@@ -84,7 +84,7 @@ StatusCode TrigL2ElectronHypoAlgMT::execute_r( const EventContext& context ) con
     ATH_MSG_DEBUG ( "electron handle size: " << electronsHandle->size() << "..." );
 
     for ( auto electronIter = electronsHandle->begin(); electronIter != electronsHandle->end(); ++electronIter, electronCounter++ ) {
-      auto d = newDecisionIn( decisions.get() );
+      auto d = newDecisionIn( decisions );
       d->setObjectLink( "feature", ViewHelper::makeLink<xAOD::TrigElectronContainer>( *viewELInfo.link, electronsHandle, electronCounter ) );
       
       auto clusterPtr = (*electronIter)->emCluster();
@@ -111,9 +111,6 @@ StatusCode TrigL2ElectronHypoAlgMT::execute_r( const EventContext& context ) con
     ATH_CHECK( tool->decide( hypoToolInput ) );    
   } 
 
-  auto outputHandle = SG::makeHandle(decisionOutput(), context);
-  CHECK( outputHandle.record(std::move(decisions), std::move(aux) ) );
-  
   ATH_MSG_DEBUG( "Exiting with "<< outputHandle->size() <<" decisions");
   //debug
   for (auto outh: *outputHandle){

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx

@@ -7,7 +7,7 @@
 #include "AthViews/ViewHelper.h"
 
 
-
+using TrigCompositeUtils::createAndStore; 
 using TrigCompositeUtils::DecisionContainer;
 using TrigCompositeUtils::DecisionAuxContainer; 
 using TrigCompositeUtils::DecisionIDContainer; 
@@ -68,10 +68,9 @@ StatusCode TrigL2PhotonHypoAlgMT::execute_r( const EventContext& context ) const
   }
   ATH_MSG_DEBUG( "Cluster ptr to decision map has size " << clusterToIndexMap.size() );
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore( aux.get() );
-
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
 
   std::vector<TrigL2PhotonHypoTool::PhotonInfo> hypoToolInput;
  
@@ -89,7 +88,7 @@ StatusCode TrigL2PhotonHypoAlgMT::execute_r( const EventContext& context ) const
     ATH_MSG_DEBUG ( "electron handle size: " << photonsHandle->size() << "..." );
 
     for ( auto photonIter = photonsHandle->begin(); photonIter != photonsHandle->end(); ++photonIter, photonCounter++ ) {
-      auto d = newDecisionIn( decisions.get(), name() );
+      auto d = newDecisionIn( decisions, name() );
       d->setObjectLink( "feature", ViewHelper::makeLink<xAOD::TrigPhotonContainer>( *viewELInfo.link, photonsHandle, photonCounter ) );
       
       auto clusterPtr = (*photonIter)->emCluster();
@@ -116,8 +115,6 @@ StatusCode TrigL2PhotonHypoAlgMT::execute_r( const EventContext& context ) const
     ATH_CHECK( tool->decide( hypoToolInput ) );    
   } 
 
-  auto outputHandle = SG::makeHandle(decisionOutput(), context);
-  ATH_CHECK( outputHandle.record(std::move(decisions), std::move(aux) ) );
   
   ATH_MSG_DEBUG( "Exiting with "<< outputHandle->size() <<" decisions");
   //debug

Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx

@@ -53,11 +53,9 @@ StatusCode TrigJetHypoAlgMT::execute_r( const EventContext& context ) const {
 
   auto prevDecisions = h_prevDecisions.get();
 
-  // Make a new Decisions container which will contain the previous
-  // decisions, and the one for this hypo.
-  auto newDecisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  newDecisions->setStore(aux.get());
+  // new output decisions                                                      
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto newDecisions = outputHandle.ptr();
 
   // read in a jets collection, and obtain a bare pointer to it
   auto h_jets = SG::makeHandle(m_jetsKey, context );
@@ -77,8 +75,6 @@ StatusCode TrigJetHypoAlgMT::execute_r( const EventContext& context ) const {
  
 
   // output the decisions for all chains for this event.
-  auto outputHandle = SG::makeHandle(decisionOutput(), context);
-  CHECK( outputHandle.record( std::move( newDecisions ), std::move( aux ) ) );
   ATH_MSG_DEBUG ( "Exit with "<<outputHandle->size() <<" decisions"); 
 
 
@@ -100,12 +96,12 @@ StatusCode TrigJetHypoAlgMT::execute_r( const EventContext& context ) const {
 
 StatusCode
 TrigJetHypoAlgMT::decide(const xAOD::JetContainer* jets,
-                         std::unique_ptr<DecisionContainer>& nDecisions,
+                         DecisionContainer* nDecisions,
                          const DecisionContainer* oDecisions) const{
 
  
   auto previousDecision = (*oDecisions)[0];
-  auto newdecision = TrigCompositeUtils::newDecisionIn(nDecisions.get());
+  auto newdecision = TrigCompositeUtils::newDecisionIn(nDecisions);
 
   
   const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs{
@@ -151,7 +147,7 @@ TrigJetHypoAlgMT::decide(const xAOD::JetContainer* jets,
 //     if (pass) {
 //       // create a new Decision object. This object has been placed in the
 //       // nDecisions container.
-//       auto decision = TrigCompositeUtils::newDecisionIn(nDecisions.get());
+//       auto decision = TrigCompositeUtils::newDecisionIn(nDecisions);
 //       TrigCompositeUtils::addDecisionID(decisionId, decision);
 //     }
 //     // what if does not pass?

Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h

@@ -32,7 +32,7 @@ class TrigJetHypoAlgMT : public ::HypoBase {
  private:
 
   StatusCode decide(const xAOD::JetContainer*,
-                    std::unique_ptr<TrigCompositeUtils::DecisionContainer>& newDecisions,
+                    TrigCompositeUtils::DecisionContainer* newDecisions,
                     const TrigCompositeUtils::DecisionContainer* previousDecisions
 		    /* , */
                     /* const ToolHandle<ITrigJetHypoToolMT>&xs */

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx

@@ -65,9 +65,9 @@ StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
   }  
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
   // end of common
  
 
@@ -94,7 +94,7 @@ StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
     const xAOD::L2StandAloneMuon* muon = *muonEL;
 
     // create new decision
-    auto newd = newDecisionIn( decisions.get() );
+    auto newd = newDecisionIn( decisions );
 
     // push_back to toolInput
     toolInput.emplace_back( newd, roi, muon, previousDecision );
@@ -129,8 +129,6 @@ StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
 
 
   {// make output handle and debug, in the base class
-    auto outputHandle = SG::makeHandle(decisionOutput(), context);
-    ATH_CHECK( outputHandle.record( std::move( decisions ), std::move( aux ) ) );
     ATH_MSG_DEBUG ( "Exit with "<<outputHandle->size() <<" decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx

@@ -61,9 +61,9 @@ StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
   }  
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
   // end of common
  
   std::vector<TrigMuisoHypoTool::MuisoInfo> toolInput; 
@@ -83,7 +83,7 @@ StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
     const xAOD::L2IsoMuon* muon = *muonEL;
 
     // create new decision
-    auto newd = newDecisionIn( decisions.get() );
+    auto newd = newDecisionIn( decisions );
 
     // push_back to toolInput
     toolInput.emplace_back( newd, muon, previousDecision );
@@ -115,8 +115,6 @@ StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
 
 
   {// make output handle and debug, in the base class
-    auto outputHandle = SG::makeHandle(decisionOutput(), context);
-    ATH_CHECK( outputHandle.record( std::move( decisions ), std::move( aux ) ) );
     ATH_MSG_DEBUG ( "Exit with "<<outputHandle->size() <<" decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx

@@ -66,9 +66,9 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) c
   }
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
   // end of common
   
   std::vector<TrigMuonEFCombinerHypoTool::MuonEFInfo> toolInput;
@@ -99,8 +99,8 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) c
 
     const xAOD::Muon* muon = *muonEL;
 
-    // create new dicions
-    auto newd = newDecisionIn( decisions.get() );
+    // create new decisions
+    auto newd = newDecisionIn( decisions );
 
     // pussh_back to toolInput
     toolInput.emplace_back( newd, roi, muon, previousDecision );
@@ -133,8 +133,6 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) c
   } // End of tool algorithms */	
 
   { // make output handle and debug, in the base class
-    auto outputHandle = SG::makeHandle( decisionOutput(), context );
-    ATH_CHECK( outputHandle.record( std::move(decisions), std::move(aux) ));
     ATH_MSG_DEBUG ( "Exit with " << outputHandle->size() << " decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx

@@ -66,9 +66,9 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) con
   }
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
   // end of common
   
   std::vector<TrigMuonEFMSonlyHypoTool::MuonEFInfo> toolInput;
@@ -99,8 +99,8 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) con
 
     const xAOD::Muon* muon = *muonEL;
 
-    // create new dicions
-    auto newd = newDecisionIn( decisions.get() );
+    // create new decisions
+    auto newd = newDecisionIn( decisions );
 
     // pussh_back to toolInput
     toolInput.emplace_back( newd, roi, muon, previousDecision );
@@ -133,8 +133,6 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) con
   } // End of tool algorithms */	
 
   { // make output handle and debug, in the base class
-    auto outputHandle = SG::makeHandle( decisionOutput(), context );
-    ATH_CHECK( outputHandle.record( std::move(decisions), std::move(aux) ));
     ATH_MSG_DEBUG ( "Exit with " << outputHandle->size() << " decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx

@@ -66,9 +66,8 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::execute_r( const EventContext& conte
   ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
 
   // prepare output decisions
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
 
   std::vector<TrigMuonEFTrackIsolationHypoTool::EFIsolationMuonInfo> toolInput;
   size_t counter = 0;
@@ -96,7 +95,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::execute_r( const EventContext& conte
     const xAOD::Muon* muon = *muonEL;
 
     // create new dicions
-    auto newd = newDecisionIn( decisions.get() );
+    auto newd = newDecisionIn( decisions );
 
     toolInput.emplace_back( newd, roi, muon, previousDecision );
 
@@ -128,9 +127,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::execute_r( const EventContext& conte
     }
   } // End of tool algorithm
 
-  { // make output handle and debug, in the base class
-    auto outputHandle = SG::makeHandle( decisionOutput(), context );
-    ATH_CHECK( outputHandle.record( std::move( decisions ), std::move( aux ) ) );
+  { //  debu printout
     ATH_MSG_DEBUG ( "Exit with "<< outputHandle->size() <<" decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {   

Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx

@@ -66,9 +66,9 @@ StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
   }
   ATH_MSG_DEBUG( "Running with " << previousDecisionsHandle->size() << " implicit ReadHandles for previous decisions");
 
-  auto decisions = std::make_unique<DecisionContainer>();
-  auto aux = std::make_unique<DecisionAuxContainer>();
-  decisions->setStore(aux.get());
+  // new output decisions
+  SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context ); 
+  auto decisions = outputHandle.ptr();
   // end of common
 
   std::vector<TrigmuCombHypoTool::CombinedMuonInfo> toolInput;
@@ -98,7 +98,7 @@ StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
     const xAOD::L2CombinedMuon* muComb = *muCombEL;
     
     // create new decisions
-    auto newd = newDecisionIn( decisions.get() );
+    auto newd = newDecisionIn( decisions );
 
     toolInput.emplace_back( TrigmuCombHypoTool::CombinedMuonInfo{ newd, muComb, muFast, previousDecision} );
 
@@ -120,9 +120,7 @@ StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
     ATH_MSG_DEBUG("Go to " << tool);
     ATH_CHECK( tool->decide( toolInput ) );
   }
-  {// make output handle and debug, in the base class
-    auto outputHandle =  SG::makeHandle( decisionOutput(), context );
-    ATH_CHECK( outputHandle.record( std::move( decisions ), std::move( aux ) ) );
+  {// debug printout
     ATH_MSG_DEBUG( "Exit with " << outputHandle->size() << " decisions");
     TrigCompositeUtils::DecisionIDContainer allPassingIDs;
     if ( outputHandle.isValid() ) {

Trigger/TrigSteer/DecisionHandling/CMakeLists.txt

@@ -46,7 +46,7 @@ atlas_add_component( DecisionHandling
 atlas_add_test( TrigCompositeUtils_test
                 SOURCES test/TrigCompositeUtils_test.cxx
                 LINK_LIBRARIES  TestTools xAODTrigger DecisionHandlingLib
-                AthContainers )
+                AthContainers SGtests )
 
 atlas_add_test( Combinators_test
                 SOURCES test/Combinators_test.cxx

Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h

@@ -8,6 +8,7 @@
 #include <set>
 #include <memory>
 #include <functional>
+#include <iostream>
 
 #include "AthLinks/ElementLink.h"
 #include "AthLinks/ElementLinkVector.h"
@@ -15,6 +16,7 @@
 #include "StoreGate/WriteHandleKey.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "StoreGate/WriteHandle.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 #include "AthContainers/AuxElement.h"
 #include "xAODTrigger/TrigCompositeContainer.h"
@@ -22,25 +24,61 @@
 
 namespace TrigCompositeUtils {
 
-  // alias types, for readability and to simplify future evolution
+  /// alias types, for readability and to simplify future evolution
   typedef SG::WriteHandle<DecisionContainer> DecisionWriteHandle;
+
+  /**
+   * @brief Creates and right away records the Container CONT with the key.
+   * Returns the WriteHandle. 
+   * No Aux store.
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+   **/
+  template<class CONT>
+    SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
+
+  /**
+   * @brief Creates and right away records the Container CONT with the key.
+   * Returns the WriteHandle. 
+   * With Aux store.
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+   **/
+  template<class CONT, class AUX>
+    SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
+
+  /**
+   * @brief Creates and right away records the DecisionContainer with the key.
+   * Returns the WriteHandle. 
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+   **/
+  SG::WriteHandle<DecisionContainer> createAndStore( const SG::WriteHandleKey<DecisionContainer>& key, const EventContext& ctx = Gaudi::Hive::currentContext() );
+
   /**
-   * @brief creates and right away stores the DecisionContainer under the key
+   * @brief Creates and right away records the DecisionContainer using the provided WriteHandle.
    **/
-  DecisionWriteHandle createAndStore(const SG::WriteHandleKey<DecisionContainer>& key, const EventContext& ctx);
+
+  void createAndStore( SG::WriteHandle<DecisionContainer>& handle );
 
   /**
-   * @brief helper method to that created the Decision objects, places it in the container and returns
+   * @brief Helper method to create a Decision object, place it in the container and return a pointer to it.
    * This is to make this:
    * auto d = newDecisionIn(output);
    * instead of:
    * auto d = new Decision; 
    * output->push_back(d);    
-   * a version with the name assigns the name to the TC object
+   * If provided, the name is assigned to the TC object
+   * Note that the supplied DecisionContainer must have been recorded in the event store.
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
    **/  
-  Decision* newDecisionIn (DecisionContainer* dc);
-  Decision* newDecisionIn (DecisionContainer* dc, const std::string& name);
+  Decision* newDecisionIn ( DecisionContainer* dc, const std::string& name = "", const EventContext& ctx = Gaudi::Hive::currentContext() );
 
+  /**
+   * @brief Helper method to create a Decision object, place it in the container and return a pointer to it. RoI, view and feature links will be copied from the previous to the new decision and a "seed" link made between them
+   * @arg the container in which to place the new Decision
+   * @arg the previous decision to which the new one should be connected
+   * If provided, the name is assigned to the TC object
+   * Note that the supplied DecisionContainer must have been recorded in the event store.
+   **/ 
+Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std::string& name = "", const EventContext& ctx = Gaudi::Hive::currentContext() );
 
   /**
    * @brief Appends the decision (given as ID) to the decision object
@@ -51,19 +89,24 @@ namespace TrigCompositeUtils {
 
       
   /**
-   * @brief Extracts DecisionIDs stored in the Decsion object 
+   * @brief Extracts DecisionIDs stored in the Decision object 
    **/
   void decisionIDs( const Decision* d, DecisionIDContainer& id );
 
   /**
-   * @brief Another variant of the above method
+   * @brief Another variant of the above method to access DecisionIDs stored in
+ the Decision object, returns const accessor
    **/
   const std::vector<int>& decisionIDs( const Decision* d ); 
+
+  /**
+   * @brief Another variant of the above method to access DecisionIDs stored in the Decision object, returns read/write accessor
+   **/ 
   std::vector<int>& decisionIDs( Decision* d );
 
   
   /**
-   * @brief return true if thre is no positive decision stored
+   * @brief return true if there is no positive decision stored
    **/
   bool allFailed( const Decision* d );
   
@@ -73,7 +116,7 @@ namespace TrigCompositeUtils {
   bool isAnyIDPassing( const Decision* d,  const DecisionIDContainer& required);
 
   /**
-   * @brief checks if required ID is in the set of the decisions
+   * @brief checks if required decision ID is in the set of IDs in the container
    **/
   bool passed( DecisionID id, const DecisionIDContainer& );
   
@@ -98,11 +141,8 @@ namespace TrigCompositeUtils {
    * @ret true if success
    **/
   bool copyLinks(const Decision* src, Decision* dest);
-
-
-
-
-  /**
+  
+ /**
    * @brief traverses TC links for another TC fufilling the prerequisite specified by the filter
    * @return matching TC or nullptr
    **/
@@ -178,5 +218,6 @@ namespace TrigCompositeUtils {
 
 }
 
+#include "DecisionHandling/TrigCompositeUtils.icc"
 
 #endif // DecisionHandling_TrigCompositeUtils_h

Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc

+/*
+ *
+ */
+namespace TrigCompositeUtils {
+
+  /**
+   * @brief Creates and right away records the Container CONT with the key.
+   * No Aux store.
+   * Returns the WriteHandle. 
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+   **/
+  template<class CONT>
+  SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
+    SG::WriteHandle<CONT> handle( key, ctx );
+    auto data = std::make_unique<CONT>() ;
+    handle.record( std::move( data ) ).ignore();
+    return handle;
+  }
+
+  /**
+   * @brief Creates and right away records the Container CONT with the key.
+   * With Aux store.
+   * Returns the WriteHandle. 
+   * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+   **/
+  template<class CONT, class AUX>
+  SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
+    SG::WriteHandle<CONT> handle( key, ctx );
+    auto data = std::make_unique<CONT>() ;
+    auto aux = std::make_unique<AUX>() ;
+    data->setStore( aux.get() );
+    handle.record( std::move( data ), std::move( aux )  ).ignore();
+    return handle;
+  }
+
+
+}

Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref

+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r3)
+                                          running on pc-tbed-pub-23.cern.ch on Thu Oct  4 17:39:52 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
+ClassIDSvc           INFO  getRegistryEntries: read 7465 CLIDRegistry entries for module ALL
+Context: s: 0  e: 0
+Current context: s: 0  e: 0
+ClassIDSvc           INFO  getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+initialize SG::WriteHandleKey<DecisionContainer> whkT
+call createAndStore( whkT ) with default context, twice
+StoreGateSvc_Impl WARNING  setupProxy:: error setting up proxy for key arbitrary and clid 1333228823
+ Pre-existing valid DataProxy @0x29a4bd0 found in Store for key arbitrary with clid 1333228823
+StoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x29a50b0
+ recorded with key arbitrary of type xAOD::TrigCompositeContainer (CLID 1333228823) in DataObject @0x29a5400
+VarHandle(Store...  ERROR /build3/atnight/localbuilds/nightlies/master/athena/Control/StoreGate/src/VarHandleBase.cxx:734 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
+                    FATAL /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-09-25T2105/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/src/Control/StoreGate/StoreGate/WriteHandle.icc:887 (StatusCode SG::WriteHandle<T>::record(std::unique_ptr<_Tp>, std::unique_ptr<U>, bool) [with AUXSTORE = xAOD::TrigCompositeAuxContainer_v1; T = DataVector<xAOD::TrigComposite_v1>]): code 0: this->record(std::move(data))
+handle name "arbitrary" isPresent 1 isValid 1
+handle name "arbitrary" isPresent 1 isValid 0
+
+initialize SG::WriteHandleKey<DecisionContainer> whk1
+call createAndStore( whk1 ) with default context
+handle name myDecisions1 store StoreGateSvc_Impl
+initialize SG::WriteHandleKey<DecisionContainer> whk2
+call createAndStore( whk2, ctx )
+handle name myDecisions2 store StoreGateSvc_Impl container size 0
+testing insert decisions
 1 from d1
 2 from d1
 1 from d1 and d2
@@ -5,3 +38,39 @@
 3 from d1 and d2
  either 3 or 7 contained in d1 NO
  either 3 or 7 contained in d2 YES
+Call setObjectLink with a bad ElementLink that has no recorded collection. Expect cerr output to follow.
+xAOD::TrigComposite_v1::setObjectLink ERROR link has invalid key hash of zero
+Call setObjectLink with a bad ElementLink that has no corresponding collection. Expect cerr output to follow.
+xAOD::TrigComposite_v1::setObjectLink ERROR link is not valid
+
+New decision d3b with name & context 
+d3b: TrigComposite_v1 'd3b' link: name, key, index, CLID
+self, 1042135810, 3, 1333228823
+testlink, 1042135810, 1, 1333228823
+
+el2 1042135810 1
+d3: TrigComposite_v1 '' link: name, key, index, CLID
+self, 1042135810, 2, 1333228823
+seed, 1042135810, 1, 1333228823
+
+d4: TrigComposite_v1 '' link: name, key, index, CLID
+self, 1042135810, 4, 1333228823
+seed, 1042135810, 1, 1333228823
+
+el: key 1042135810 index 1
+create d5 
+set link 
+d5: TrigComposite_v1 'd5' link: name, key, index, CLID
+self, 1042135810, 5, 1333228823
+feature, 1042135810, 1, 1333228823
+
+create d6 
+d6: TrigComposite_v1 'd6' link: name, key, index, CLID
+self, 1042135810, 6, 1333228823
+feature, 1042135810, 1, 1333228823
+seed, 1042135810, 5, 1333228823
+
+get d5 feature link 
+get d6 feature link 
+compare feature links 
+get self and seed links