AtlasTest/TestTools/share/post.sh

 #!/usr/bin/env bash
 #
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 #
 #/** @file post.sh
 # @brief sh script that checks the return code of an executable and compares
@@ -339,7 +339,7 @@ else
        else
            echo "$RED post.sh> ERROR: reference output ${reflog} not available $RESET"
            echo " post.sh> Either create a reference file or use a different POST_EXEC_SCRIPT."
-           echo " post.sh> see: https://gitlab.cern.ch/atlas/athena/-/tree/master/AtlasTest/TestTools"
+           echo " post.sh> see: https://gitlab.cern.ch/atlas/athena/-/tree/main/AtlasTest/TestTools"
            exit 1
        fi
    else

Build/AtlasBuildScripts/gitlab_merge.sh

 #!/usr/bin/env bash
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 #
 # Script to merge a set of MRs with given labels into the local branch.
 #
 
 # Defaults
-branch='master'
+branch='main'
 remote='origin'
 
 usage() {

Build/AtlasBuildScripts/setup_project_build_env.sh

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 #
 # Script that is used by the build_env.sh scripts of the individual projects.
 # It takes care of setting up a functional build environment for an ATLAS
@@ -74,7 +74,7 @@ atlas_env_setup() {
       ATLAS_EXT_DIR="${ATLAS_BUILD_DIR}/install/${ATLAS_EXT_PROJECT_NAME}/${ATLAS_PROJECT_VERSION}/InstallArea"
       if [ ! -d ${ATLAS_EXT_DIR} ]; then
 	      echo "Warning: Didn't find ${ATLAS_EXT_PROJECT_NAME} under ${ATLAS_EXT_DIR}"
-         echo "         (Hopefully this is intentional and you have done e.g. asetup AthenaExternals,master,latest)"
+         echo "         (Hopefully this is intentional and you have done e.g. asetup AthenaExternals,main,latest)"
       else
          echo "Setting up ${ATLAS_EXT_PROJECT_NAME} from: ${ATLAS_EXT_DIR}"
          source ${ATLAS_EXT_DIR}/*/setup.sh

Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py

@@ -484,6 +484,11 @@ def defineHistogram(flags, varname, type='TH1F', path=None,
         assert type not in ['TEfficiency', 'TTree', 'TGraph'],'only default merge defined for non-histogram objects'
         settings['merge'] = merge
 
+    # LB histograms always need to be published online (ADHI-4947)
+    if settings['kLBNHistoryDepth']>0 and _isOnline(flags):
+        settings['kAlwaysCreate'] = True
+        log.debug('Setting kAlwaysCreate for lumiblock histogram "%s"', varname)
+
     # Check that kLBNHistoryDepth and kLive are both non-negative
     assert settings['kLBNHistoryDepth']>=0, f'Histogram "{alias}" has invalid kLBNHistoryDepth.'
     assert settings['kLive']>=0, f'Histogram "{alias}" has invalid kLive.'

Control/AthenaMonitoringKernel/test/test_defineHistogram.py

@@ -154,6 +154,12 @@ class Test( unittest.TestCase ):
       true = '{"alias": "var", "allvars": ["var"], "convention": "", "merge": "", "path": "EXPERT", "title": "var", "treeDef": "", "type": "TH1F", "weight": "", "cutMask": "", "xarray": [], "xbins": 100, "xlabels": [], "xmax": 1.0, "xmin": 0.0, "xvar": "var", "yarray": [], "ybins": 0.0, "ylabels": [], "ymax": 0.0, "ymin": 0.0, "yvar": "", "zbins": 0.0, "zlabels": [], "zmax": 0.0, "zmin": 0.0, "zvar": "", "Sumw2": false, "kLBNHistoryDepth": 0, "kAddBinsDynamically": false, "kRebinAxes": false, "kCanRebin": false, "kVec": false, "kVecUO": false, "kCumulative": false, "kLive": 1, "kAlwaysCreate": false}'
       self.assertEqual(json.loads(check), json.loads(true))
 
+   def test_LBN( self ):
+      flags = initConfigFlags()
+      flags.Common.isOnline = True
+      check = defineHistogram(flags, 'var', path='EXPERT', opt='kLBNHistoryDepth=1')
+      self.assertEqual(json.loads(check)['kAlwaysCreate'], True)
+
    def test_badAlias( self ):
       flags = initConfigFlags()
       check = defineHistogram(flags, 'var;alias;more')

ForwardDetectors/AFP/AFP_Calibration/test/test_AFP_Calibration.sh

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 # test the whole AFP calibration loop
 
 # prerequisite - have AODs from AFP_Calibration stream
 # cd /afs/cern.ch/work/p/pbalek/workspace/public/data17_13TeV.00338480.calibration_AFP.AOD
-# asetup Athena,master,latest,here
+# asetup Athena,main,latest,here
 # for inputfile in `ls -d -1 /afs/cern.ch/work/p/pbalek/public/data17_13TeV.00338480.calibration_AFP.daq.RAW/*`
-# 	do python ~/AFP/reco_master_Athena/athena/ForwardDetectors/ForwardRec/python/AFPRecConfig.py --filesInput=${inputfile}
+# 	do python ~/AFP/reco_main_Athena/athena/ForwardDetectors/ForwardRec/python/AFPRecConfig.py --filesInput=${inputfile}
 # 	mv AOD.pool.root `echo $inputfile | sed -e 's/daq.RAW/AOD/g' -e 's/data$/root/'`
 # done
 
 # move to temp folder
 cd /tmp/${USER}
 setupATLAS
-asetup Athena,master,latest,here
+asetup Athena,main,latest,here
 
 # setup this branch, e.g.
 cd /afs/cern.ch/work/p/pbalek/public/afp_calibration_athena/build

InnerDetector/InDetConfig/python/TRT_ElectronPidToolsConfig.py

@@ -62,11 +62,11 @@ def __TRT_dEdxToolBaseCfg(flags, name, **kwargs):
     kwargs.setdefault("TRT_dEdx_isData", not flags.Input.isMC)
     
     if "TRT_LocalOccupancyTool" not in kwargs:
-        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TrigTRT_LocalOccupancyCfg(flags)))
+        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags)))
 
     if "AssociationTool" not in kwargs:
-        from InDetConfig.InDetAssociationToolsConfig import TrigPrdAssociationToolCfg
-        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(TrigPrdAssociationToolCfg(flags)))
+        from InDetConfig.InDetAssociationToolsConfig import InDetPrdAssociationToolCfg
+        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(InDetPrdAssociationToolCfg(flags)))
 
     acc.setPrivateTools(CompFactory.TRT_ToT_dEdx(name,**kwargs))
     return acc
@@ -81,8 +81,19 @@ def TRT_dEdxToolCfg(flags, name="TRT_dEdxTool", **kwargs):
     return acc
 
 def TrigTRT_dEdxToolCfg(flags, name="TrigTRT_dEdxTool", **kwargs):
-    """trigger version should not add LumiBlockMuWriterCfg to views as it is scheduled globally""" 
-    return __TRT_dEdxToolBaseCfg(flags, name, **kwargs)
+    """trigger version should not add LumiBlockMuWriterCfg to views as it is scheduled globally"""
+    
+    acc = ComponentAccumulator()
+    
+    if "TRT_LocalOccupancyTool" not in kwargs:
+        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TrigTRT_LocalOccupancyCfg(flags)))
+
+    if "AssociationTool" not in kwargs:
+        from InDetConfig.InDetAssociationToolsConfig import TrigPrdAssociationToolCfg
+        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(TrigPrdAssociationToolCfg(flags)))
+
+    acc.setPrivateTools(acc.popToolsAndMerge(__TRT_dEdxToolBaseCfg(flags, name, **kwargs)))
+    return acc
 
 def TRT_ElectronPidToolCfg(flags, name="TRT_ElectronPidTool", **kwargs):
     from TRT_ConditionsAlgs.TRT_ConditionsAlgsConfig import TRTHTCondAlgCfg, TRTPIDNNCondAlgCfg

InnerDetector/InDetRawAlgs/InDetOverlay/CMakeLists.txt

@@ -58,20 +58,24 @@ atlas_install_joboptions( share/StoreGateTestCommon.txt )
 # Configuration tests
 atlas_add_test( BCMOverlayConfig_test
                 SCRIPT test/BCMOverlayConfig_test.py
+                PRIVATE_WORKING_DIRECTORY
                 PROPERTIES TIMEOUT 600
                 POST_EXEC_SCRIPT nopost.sh )
 
 atlas_add_test( PixelOverlayConfig_test
                 SCRIPT test/PixelOverlayConfig_test.py
+                PRIVATE_WORKING_DIRECTORY
                 PROPERTIES TIMEOUT 600
                 POST_EXEC_SCRIPT nopost.sh )
 
 atlas_add_test( SCTOverlayConfig_test
                 SCRIPT test/SCTOverlayConfig_test.py
+                PRIVATE_WORKING_DIRECTORY
                 PROPERTIES TIMEOUT 600
                 POST_EXEC_SCRIPT nopost.sh )
 
 atlas_add_test( TRTOverlayConfig_test
                 SCRIPT test/TRTOverlayConfig_test.py
+                PRIVATE_WORKING_DIRECTORY
                 PROPERTIES TIMEOUT 600
                 POST_EXEC_SCRIPT nopost.sh )

InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx

@@ -77,8 +77,6 @@ namespace InDet {
   ///////////////////////////////////////////////////////////////////
   StatusCode TRT_RIO_Maker::execute(const EventContext& ctx) const {
     // TRT_DriftCircle container registration
-
-
     SG::WriteHandle<InDet::TRT_DriftCircleContainer> rioContainer(m_rioContainerKey, ctx);
     if(m_rioContainerCacheKey.key().empty()){
       rioContainer = std::make_unique<InDet::TRT_DriftCircleContainer>(m_pTRTHelper->straw_layer_hash_max(),EventContainers::Mode::OfflineFast);
@@ -90,19 +88,30 @@ namespace InDet {
     ATH_CHECK(rioContainer.isValid());
     ATH_MSG_DEBUG( "Container "<< rioContainer.name() << " initialised" );
     SG::ReadHandle<TRT_RDO_Container> rdoContainer(m_rdoContainerKey, ctx);
-    ATH_CHECK(rdoContainer.isValid());    
-    
+    ATH_CHECK(rdoContainer.isValid());
+
+    const bool hasExternalCache = rdoContainer->hasExternalCache();
+    std::unique_ptr<DataPool<TRT_DriftCircle>> dataItemsPool = nullptr;
+    if (!hasExternalCache) {
+      dataItemsPool = std::make_unique<DataPool<TRT_DriftCircle>>(ctx);
+      dataItemsPool->reserve(100000);  // Some large default size
+    }
+
     // Get TRT_RDO and produce TRT_RIO collections
     if (!m_roiSeeded) {//Full-scan mode
 
       for(const auto *const rdoCollections : *rdoContainer) {
         const InDetRawDataCollection<TRT_RDORawData>* currentCollection(rdoCollections);
         InDet::TRT_DriftCircleContainer::IDC_WriteHandle lock = rioContainer->getWriteHandle(currentCollection->identifyHash());
-        if( lock.OnlineAndPresentInAnotherView() ) continue;
-        std::unique_ptr<TRT_DriftCircleCollection> p_rio(m_driftcircle_tool->convert(m_mode_rio_production,
-          currentCollection, ctx, m_trtBadChannels));
-        if(p_rio && !p_rio->empty()) {
-           ATH_CHECK(lock.addOrDelete(std::move(p_rio)));
+        if (lock.OnlineAndPresentInAnotherView()) {
+          continue;
+        }
+        std::unique_ptr<TRT_DriftCircleCollection> p_rio(
+            m_driftcircle_tool->convert(m_mode_rio_production,
+                                        currentCollection, ctx, dataItemsPool.get(),
+                                        m_trtBadChannels));
+        if (p_rio && !p_rio->empty()) {
+          ATH_CHECK(lock.addOrDelete(std::move(p_rio)));
         }
      }
     }else{
@@ -122,18 +131,21 @@ namespace InDet {
             const InDetRawDataCollection<TRT_RDORawData>* RDO_Collection (rdoContainer->indexFindPtr(id));
             if (!RDO_Collection) continue;
             InDet::TRT_DriftCircleContainer::IDC_WriteHandle lock = rioContainer->getWriteHandle(id);
-            if( lock.OnlineAndPresentInAnotherView() ) continue;
+            if( lock.OnlineAndPresentInAnotherView() ) {
+              continue;
+            }
 
             // Use one of the specific clustering AlgTools to make clusters
-            std::unique_ptr<TRT_DriftCircleCollection> p_rio(m_driftcircle_tool->convert(m_mode_rio_production,
-                RDO_Collection , ctx, m_trtBadChannels));
-            if (p_rio && !p_rio->empty()){
+            std::unique_ptr<TRT_DriftCircleCollection> p_rio(
+                m_driftcircle_tool->convert(m_mode_rio_production,
+                                            RDO_Collection, ctx, dataItemsPool.get(),
+                                            m_trtBadChannels));
+            if (p_rio && !p_rio->empty()) {
 #ifndef NDEBUG               
                  ATH_MSG_VERBOSE( "REGTEST: TRT : DriftCircleCollection contains "
                  << p_rio->size() << " clusters" );
 #endif
                  ATH_CHECK(lock.addOrDelete(std::move(p_rio)));
-
             }
          }
       }

InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/ITRT_DriftCircleTool.h

@@ -21,6 +21,7 @@
 #include "InDetRawData/TRT_RDORawData.h"
 #include "TrkPrepRawData/PrepRawDataCLASS_DEF.h"
 
+#include "AthAllocators/DataPool.h"
 
 namespace InDet {
    
@@ -43,7 +44,12 @@ namespace InDet {
        static const InterfaceID& interfaceID( ) { return IID_ITRT_DriftCircleTool; };
        
        /** Interface method */
-       virtual InDet::TRT_DriftCircleCollection* convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool CTBBadChannels) const = 0;               
+       virtual InDet::TRT_DriftCircleCollection* convert(
+           int,
+           const InDetRawDataCollection<TRT_RDORawData>*,
+           const EventContext& ctx,
+           DataPool<TRT_DriftCircle>* dataItemsPool,
+           const bool CTBBadChannels) const = 0;
        /** test validity gate for corrected drift times */
        virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const =0;
 

InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h

@@ -42,7 +42,7 @@ namespace InDet {
 Class for converting a RDO collection to a DriftCircle collection
 Performs trigger phase corrections in case of CTB data
 */
-class TRT_DriftCircleTool: public AthAlgTool, virtual public ITRT_DriftCircleTool
+class TRT_DriftCircleTool final: public AthAlgTool, virtual public ITRT_DriftCircleTool
  
 {
   ///////////////////////////////////////////////////////////////////
@@ -55,14 +55,18 @@ public:
   /** destructor */
   virtual ~TRT_DriftCircleTool ();
   /** initialize needed services */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
   /** finalize */
-  virtual StatusCode finalize  ();
+  virtual StatusCode finalize  () override;
   /** make the conversion from RDOs to DriftCircles */
   virtual InDet::TRT_DriftCircleCollection*  
-  convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool CTBBadChannels) const;
+  convert(int,
+          const InDetRawDataCollection<TRT_RDORawData>*,
+          const EventContext& ctx,
+          DataPool<TRT_DriftCircle>* dataItemsPool,
+          const bool CTBBadChannels) const override;
   /** test validity gate for corrected drift times */
-  virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const;
+  virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const override;
 
   ///////////////////////////////////////////////////////////////////
   // Private methods:

InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h

@@ -58,7 +58,9 @@ public:
   virtual StatusCode finalize  ();
   /** make the conversion from RDOs to DriftCircles */
   virtual InDet::TRT_DriftCircleCollection*  
-  convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool  CTBBadChannels) const;
+  convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx,
+          DataPool<TRT_DriftCircle>* dataItemsPool,
+          const bool  CTBBadChannels) const;
   virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const;
 
   ///////////////////////////////////////////////////////////////////

InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx

@@ -171,6 +171,7 @@ InDet::TRT_DriftCircleTool::convert(
   int Mode,
   const InDetRawDataCollection<TRT_RDORawData>* rdo,
   const EventContext& ctx,
+  DataPool<TRT_DriftCircle>* dataItemsPool,
   const bool getTRTBadChannel) const
 {
 
@@ -203,6 +204,10 @@ InDet::TRT_DriftCircleTool::convert(
     rio                                = new InDet::TRT_DriftCircleCollection(IHc);
     rio->setIdentifier(rdo->identify());
     rio->reserve( std::distance(rb, re) );
+    //DataPool will own them if there.
+    if (dataItemsPool) {
+     rio->clear(SG::VIEW_ELEMENTS);
+    }
 
     bool isArgonStraw = false;
     bool isGasSet = false;
@@ -303,8 +308,16 @@ InDet::TRT_DriftCircleTool::convert(
       auto errmat = Amg::MatrixX(1,1);
       errmat(0,0) = error*error;
       Amg::Vector2D loc(radius, 0.);
-      InDet::TRT_DriftCircle* tdc =
-        new InDet::TRT_DriftCircle(id, loc, std::move(errmat), pE, word);
+
+      InDet::TRT_DriftCircle* tdc = nullptr;
+      //
+      if (dataItemsPool) {
+        tdc = dataItemsPool->nextElementPtr();
+        (*tdc) = InDet::TRT_DriftCircle(id, loc, std::move(errmat), pE, word);
+      } else {
+        tdc = new InDet::TRT_DriftCircle(id, loc, std::move(errmat), pE, word);
+      }
+      //
       if (tdc) {
         tdc->setHashAndIndex(rio->identifyHash(), rio->size());
         rio->push_back(tdc);

InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx

@@ -170,7 +170,11 @@ StatusCode InDet::TRT_DriftCircleToolCosmics::finalize()
 // Trk::TRT_DriftCircles collection production
 ///////////////////////////////////////////////////////////////////
 
-InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleToolCosmics::convert(int Mode,const InDetRawDataCollection<TRT_RDORawData>* rdo, const EventContext& ctx, const bool /* _getTRTBadChannel */) const
+InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleToolCosmics::convert(int Mode,
+                                                                             const InDetRawDataCollection<TRT_RDORawData>* rdo,
+                                                                             const EventContext& ctx,
+                                                                             DataPool<TRT_DriftCircle>* /*dataItemsPool*/,
+                                                                             const bool /* _getTRTBadChannel */) const
 {
 
   //Initialise a new TRT_DriftCircleCollection

LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliWave.h

@@ -40,13 +40,6 @@
 #include <iostream>
 #include <stdint.h>
 
-// Need real class for CaliWave vector:
-class LArCaliWave;
-class LArCaliWaveVec : public std::vector<LArCaliWave> {
- public:
-  LArCaliWaveVec() {};
-  bool isEmpty() const;
-};
 
 class LArCaliWave : public LArWaveCumul {
 
@@ -94,6 +87,12 @@ public:
   int m_isPulsed;
 
 };
+// Need real class for CaliWave vector:
+class LArCaliWaveVec : public std::vector<LArCaliWave> {
+ public:
+  LArCaliWaveVec() {};
+  bool isEmpty() const;
+};
 
 
 // INLINE FUNCTIONS

MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/NswDcsDbAlg.h

@@ -59,8 +59,8 @@ private:
 	
 	writeKey_t m_writeKey{this, "WriteKey", "NswDcsDbData", "Key of output data object" };
 	
-	readKey_t m_readKey_mmg_hv {this, "ReadKey_MMG_HV", "/MMG/DCS/TSTHV", "Key of input MMG condition data for HV"};
-	readKey_t m_readKey_stg_hv {this, "ReadKey_STG_HV", "/STG/DCS/TSTHV", "Key of input STG condition data for HV"};
+	readKey_t m_readKey_mmg_hv {this, "ReadKey_MMG_HV", "/MMG/DCS/HV", "Key of input MMG condition data for HV"};
+	readKey_t m_readKey_stg_hv {this, "ReadKey_STG_HV", "/STG/DCS/HV", "Key of input STG condition data for HV"};
 
 	const MuonGM::MuonDetectorManager *m_muDetMgrFromDetStore; 
  

MuonSpectrometer/MuonConfig/python/MuonCondAlgConfig.py

@@ -306,8 +306,8 @@ def NswDcsDbAlgCfg(flags, **kwargs):
     acc = ComponentAccumulator()
     if flags.GeoModel.Run!=LHCPeriod.Run3: return acc
     if flags.Input.isMC: return acc
-    acc.merge(addFolders(flags, "/MMG/DCS/TSTHV", "DCS_OFL", className="CondAttrListCollection"))
-    acc.merge(addFolders(flags, "/STG/DCS/TSTHV", "DCS_OFL", className="CondAttrListCollection"))
+    acc.merge(addFolders(flags, "/MMG/DCS/HV", "DCS_OFL", className="CondAttrListCollection"))
+    acc.merge(addFolders(flags, "/STG/DCS/HV", "DCS_OFL", className="CondAttrListCollection"))
     alg = CompFactory.NswDcsDbAlg("NswDcsDbAlg", **kwargs)
     acc.addCondAlgo(alg)
     return acc

PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/src/TrackTruthDecoratorAlg.cxx

@@ -15,6 +15,8 @@
 #include "xAODTruth/TruthVertex.h"
 #include "xAODTruth/TruthVertexContainer.h"
 
+#include "InDetTrackSystematicsTools/InDetTrackTruthOriginDefs.h"
+
 
 namespace FlavorTagDiscriminants {
 
@@ -69,12 +71,18 @@ namespace FlavorTagDiscriminants {
     // decorate loop
     std::vector<const xAOD::TrackParticle*> tracks_vector(tracks->begin(), tracks->end());
     for ( const auto& track : tracks_vector ) {
+      
+      // for the origin label we need to start from the track object (to label fake tracks)
+      int trackTruthOrigin = m_trackTruthOriginTool->getTrackOrigin(track);
+      dec_origin_label(*track) = InDet::ExclusiveOrigin::getExclusiveOrigin(trackTruthOrigin);
+
+      // everything else is already decorated to the associated truth particle
       const auto truth = m_trackTruthOriginTool->getTruth(track);
       dec_barcode(*track) = truth ? truth->barcode() : -2;
       dec_parent_barcode(*track) = truth ? m_acc_truthParentBarcode(*truth) : -2;
-      dec_origin_label(*track) = truth ? m_acc_truthOriginLabel(*truth) : -2;
       dec_type_label(*track) = truth ? m_acc_truthTypeLabel(*truth) : -2;
       dec_vertex_index(*track) = truth ? m_acc_truthVertexIndex(*truth) : -2;
+
     }
     return StatusCode::SUCCESS;
   }

Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py

@@ -97,8 +97,8 @@ def JetEfficiencyMonitoringConfig(inputFlags):
     multijet_triggers = ['L1_J85_3J30', 'L1_3J50', 'L1_4J15', 'L1_4J20']
     LR_triggers = ['L1_SC111-CJ15']
     
-    gfex_SR_triggers = ['L1_gJ20','L1_gJ30','L1_gJ40','L1_gJ50', 'L1_gJ100']
-    gfex_LR_triggers = ['L1_gLJ80', 'L1_gLJ100', 'L1_gLJ140']
+    gfex_SR_triggers = ['L1_gJ20','L1_gJ20p0ETA25','L1_gJ20p25ETA49','L1_gJ20p0ETA25_EMPTY', 'L1_gJ30','L1_gJ40','L1_gJ50', 'L1_gJ50p0ETA25','L1_gJ100', 'L1_gJ100p0ETA25', 'L1_gJ400p0ETA25' ]
+    gfex_LR_triggers = ['L1_gLJ80', 'L1_gLJ100', 'L1_gLJ140', 'L1_gLJ140p0ETA25']
 
     jfex_SR_triggers = ['L1_jJ30','L1_jJ40','L1_jJ50', 'L1_jJ60',
                     'L1_jJ80','L1_jJ90', 'L1_jJ125','L1_jJ140','L1_jJ160', 'L1_jJ180']

Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

@@ -506,6 +506,38 @@ HLT_2g10_loose_L1eEM9_mu23_L1MU18VFCH:
     1: 13
     2: 6
     3: 2
+HLT_2g10_loose_PhysicsTLA_L12DR15-M70-2eEM9L:
+  eventCount: 1
+  stepCounts:
+    0: 2
+    1: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 11
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+HLT_2g10_loose_PhysicsTLA_L1DPHI12-M70-2eEM9L:
+  eventCount: 2
+  stepCounts:
+    0: 11
+    1: 8
+    2: 7
+    3: 2
+    4: 2
+    5: 2
+  stepFeatures:
+    0: 56
+    1: 21
+    2: 19
+    3: 8
+    4: 5
+    5: 4
 HLT_2g10_loose_mu20_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -528,6 +560,102 @@ HLT_2g10_loose_mu23_L1MU18VFCH:
     1: 13
     2: 6
     3: 2
+HLT_2g10_medium_PhysicsTLA_L12DR15-M70-2eEM9L:
+  eventCount: 1
+  stepCounts:
+    0: 2
+    1: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 11
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+HLT_2g10_medium_PhysicsTLA_L1DPHI12-M70-2eEM9L:
+  eventCount: 2
+  stepCounts:
+    0: 11
+    1: 8
+    2: 7
+    3: 2
+    4: 2
+    5: 2
+  stepFeatures:
+    0: 56
+    1: 21
+    2: 19
+    3: 8
+    4: 5
+    5: 4
+HLT_2g13_loose_PhysicsTLA_L12DR15-M70-2eEM12L:
+  eventCount: 1
+  stepCounts:
+    0: 2
+    1: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 4
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+HLT_2g13_loose_PhysicsTLA_L1DPHI12-M70-2eEM12L:
+  eventCount: 2
+  stepCounts:
+    0: 6
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+  stepFeatures:
+    0: 17
+    1: 11
+    2: 11
+    3: 6
+    4: 5
+    5: 4
+HLT_2g13_medium_PhysicsTLA_L12DR15-M70-2eEM12L:
+  eventCount: 1
+  stepCounts:
+    0: 2
+    1: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 4
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+HLT_2g13_medium_PhysicsTLA_L1DPHI12-M70-2eEM12L:
+  eventCount: 2
+  stepCounts:
+    0: 6
+    1: 4
+    2: 4
+    3: 2
+    4: 2
+    5: 2
+  stepFeatures:
+    0: 17
+    1: 11
+    2: 11
+    3: 6
+    4: 5
+    5: 4
 HLT_2g15_loose_25dphiAA_invmAA80_L12eEM9:
   eventCount: 1
   stepCounts:
@@ -12491,6 +12619,20 @@ HLT_j150_2j55_0eta290_020jvt_bgn170_pf_ftf_preselj80XX2j45b90_L1jJ140_3jJ60:
     1: 4
     2: 11
     3: 3
+HLT_j15_L1RD0_FILLED:
+  eventCount: 20
+  stepCounts:
+    0: 20
+  stepFeatures:
+    0: 158
+HLT_j15_pf_ftf_L1RD0_FILLED:
+  eventCount: 20
+  stepCounts:
+    0: 20
+    1: 20
+  stepFeatures:
+    0: 20
+    1: 145
 HLT_j15f_L1RD0_FILLED:
   eventCount: 2
   stepCounts: