AtlasTest/CITest/Athena.cmake

@@ -62,7 +62,7 @@ atlas_add_citest( RecoRun2MC
    SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco --threads 0 -e '--maxEvents 25' )
 
 atlas_add_citest( RecoRun2MC_PileUp
-   SCRIPT RunWorkflowTests_Run2.py --CI -p -w MCPileUpReco -e '--steering doOverlay --maxEvents 5 --inputRDO_BKGFile=../../PileUpPresamplingRun2/run_d1918/myRDO.pool.root' --no-output-checks  # go two levels up as the test runs in a subfolder
+   SCRIPT RunWorkflowTests_Run2.py --CI -p -w MCPileUpReco -e '--maxEvents 5 --inputRDO_BKGFile=../../PileUpPresamplingRun2/run_d1918/myRDO.pool.root' --no-output-checks  # go two levels up as the test runs in a subfolder
    DEPENDS_SUCCESS PileUpPresamplingRun2 )
 
 atlas_add_citest( RecoRun3Data

DataQuality/DataQualityConfigurations/config/LArMonitoring/collisions_run.config

@@ -846,58 +846,6 @@ dir LAr {
 
     dir LArSuperCellMon_NoTrigSel {
 
-        dir SC {
-            algorithm = LAr_GatherData
-            
-            hist h_SuperCellEt {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellEta {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCelltime {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellprovenance {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellEt_vs_BCID {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellEtRef_vs_BCID {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellEtLin {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellprovenanceLin {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_BCID {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellResolution {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellResolution_vs_ET {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellResolution_vs_BCID {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellResolutionPass {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCelltimeLin {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-            hist h_SuperCellResolution_vs_eta {
-                 output = LAr/LAR_GLOBAL/DigitalTrigger/Summary
-            }
-
-
-        }
-
         dir SC_Layer {
             algorithm = LAr_GatherData
 
@@ -8330,6 +8278,21 @@ dir CaloMonitoring {
 }
 
 
+dir LArDigitalTrigger {
+  dir passSCNom {
+    hist MeanOfflineLATOMEtime_perLB_perLATOME_passSCNom_ALL {
+        output = LAr/LAR_GLOBAL/DigitalTrigger
+        algorithm = LAr_GatherData
+    }
+  }
+  dir passSCNom1 {
+    hist MeanOfflineLATOMEtime_perLB_perLATOME_passSCNom1_ALL {
+        output = LAr/LAR_GLOBAL/DigitalTrigger
+        algorithm = LAr_GatherData
+    }
+  }
+}
+
 ##############
 # Algorithms
 ##############

MagneticField/MagFieldConfig/python/BFieldConfigFlags.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+from AthenaCommon.Logging import logging
 
+msg = logging.getLogger('BFieldConfigFlags')
+
+
+#So far no attempt to auto-config field for MC or online-running
+#
+#The old-style config did auto-config the field for online based on IS
+#(see https://gitlab.cern.ch/atlas/athena/-/blob/1802605a4ab69cab7ee3e53d75f162c7da99a944/Reconstruction/RecExample/RecExOnline/python/OnlineISConfiguration.py#L52)
+#
+#The old-sytle config tried to auto-config the field based on in-file metadata, falling back to Geometry and Conditions tags. See  
+#(see https://gitlab.cern.ch/atlas/athena/-/blob/1802605a4ab69cab7ee3e53d75f162c7da99a944/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py#L181
+
+def _fieldAutoCfg(prevFlags):
+    if prevFlags.Input.isMC or prevFlags.Common.isOnline:
+        return [True,True]
+    
+    from CoolConvUtilities.MagFieldUtils import getFieldForRun
+    lbs=prevFlags.Input.LumiBlockNumbers
+    fieldStat=getFieldForRun(run=prevFlags.Input.RunNumbers[0],lumiblock=0 if len(lbs)==0 else lbs[0],quiet=True)
+    if fieldStat is None:
+        msg.error("Unable to get field status from DCS, assume both magnets ON")
+        return [True,True]
+    return [fieldStat.solenoidCurrent()>1, fieldStat.toroidCurrent()>1]
+
+    
+                              
 def createBFieldConfigFlags(): 
     bcf=AthConfigFlags()
-    # True when magnetic filed is taken from these flags rather than cond db (when available)
-    bcf.addFlag("BField.override", True)
     # True when solenoid is on
-    bcf.addFlag("BField.solenoidOn", True)
+    bcf.addFlag("BField.solenoidOn", lambda prevFlags : _fieldAutoCfg(prevFlags)[0])
     # True when barrel toroid is on
-    bcf.addFlag("BField.barrelToroidOn", True)
+    bcf.addFlag("BField.barrelToroidOn", lambda prevFlags : _fieldAutoCfg(prevFlags)[1])
     # True when endcap toroid is on
-    bcf.addFlag("BField.endcapToroidOn", True)
+    bcf.addFlag("BField.endcapToroidOn", lambda prevFlags : _fieldAutoCfg(prevFlags)[1])
     return bcf

MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh

@@ -29,7 +29,7 @@
 # art-output: NSWPRDValAlg.reco.dcube.root
 
 #####################################################################
-Reco_tf.py --CA 'RAWtoALL:True' \
+Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --postInclude "RAWtoALL:MuonPRDTest.NSWPRDValAlgReco.NSWPRDValAlgRecoCfg" \
@@ -46,12 +46,14 @@ mv log.RDOtoRDOTrigger log.RDOtoRDOTrigger_serial
 mv log.RAWtoALL log.RAWtoALL_serial
 #####################################################################
 
+export ATHENA_CORE_NUMBER=1
+
 #####################################################################
 # now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'RAWtoALL:True' \
+Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
-           --athenaopts 'HITtoRDO:--threads=1' 'RAWtoALL:--threads=1' \
+           --multithreaded \
            --imf False \
            --outputESDFile OUT_ESD_1thread.root
 exit_code=$?
@@ -65,13 +67,15 @@ mv log.RDOtoRDOTrigger log.RDOtoRDOTrigger_1thread
 mv log.RAWtoALL log.RAWtoALL_1thread
 #####################################################################
 
+export ATHENA_CORE_NUMBER=5
+
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'RAWtoALL:True' \
+Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \
-           --athenaopts 'HITtoRDO:--threads=5' 'RAWtoALL:--threads=5' \
+           --multithreaded \
            --outputESDFile OUT_ESD_5thread.root
 exit_code=$?
 echo  "art-result: ${exit_code} Reco_tf_5thread.py"
@@ -84,13 +88,15 @@ mv log.RDOtoRDOTrigger log.RDOtoRDOTrigger_5thread
 mv log.RAWtoALL log.RAWtoALL_5thread
 #####################################################################
 
+export ATHENA_CORE_NUMBER=8
+
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'RAWtoALL:True' \
+Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \
-           --athenaopts 'HITtoRDO:--threads=8' 'RAWtoALL:--threads=8' \
+           --multithreaded \
            --outputESDFile OUT_ESD_8thread.root
 exit_code=$?
 echo  "art-result: ${exit_code} Reco_tf_8thread.py"

MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q445_RAWtoALL_MT.sh

@@ -26,7 +26,7 @@ export ATHENA_CORE_NUMBER=1
 
 #####################################################################
 # Run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q445 \
            --postInclude "RAWtoALL:MuonPRDTest.NSWPRDValAlgReco.NSWPRDValAlgRecoCfg" \
            --imf False \
@@ -46,7 +46,7 @@ export ATHENA_CORE_NUMBER=5
 
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q445 \
            --imf False \
            --outputESDFile OUT_ESD_5thread.root
@@ -65,7 +65,7 @@ export ATHENA_CORE_NUMBER=8
 
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q445 \
            --imf False \
            --outputESDFile OUT_ESD_8thread.root

Tools/PyUtils/python/MetaReader.py

@@ -452,9 +452,8 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
                          'This is a workaround to remove all duplicate values from "/TagInfo" key')
                 if '/TagInfo' in meta_dict[filename]:
                     for key, value in meta_dict[filename]['/TagInfo'].items():
-                        if isinstance(value, list):
-                            unique_list = list(set(value))
-                            meta_dict[filename]['/TagInfo'][key] = unique_list[0] if len(unique_list) == 1 else unique_list
+                        if isinstance(value, list) and value:
+                            meta_dict[filename]['/TagInfo'][key] = value[0]
 
             if promote is None:
                 promote = mode == 'lite' or mode == 'peeker'

Tools/PyUtils/python/MetaReaderPeeker.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 __all__ = ['metadata', 'convert_itemList', 'convert_metadata_items']
 
@@ -15,24 +15,17 @@ def _setup():
     global metadata
 
     # get input file name
-    # Start by checking ConfigFlags
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    inFiles = ConfigFlags.Input.Files
-    if inFiles == ['_ATHENA_GENERIC_INPUTFILE_NAME_']:
-        # Input files have not been set in ConfigFlags
-        # Fall back to the legacy configuration mechanisms
+    try:
+        from RecExConfig.RecoFunctions import InputFileNames
+        inFiles = InputFileNames()
+    except ModuleNotFoundError:
         try:
-            msg.warning("Input files not set ConfigFlags.Input.Files. Falling back to the legacy way of obtaining input file names")
-            from RecExConfig.RecoFunctions import InputFileNames
-            inFiles = InputFileNames()
+            msg.warning("In a release without RecExConfig, trying AthenaCommonFlags")
+            from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+            inFiles = athenaCommonFlags.FilesInput()
         except ModuleNotFoundError:
-            try:
-                msg.warning("In a release without RecExConfig, trying AthenaCommonFlags")
-                from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-                inFiles = athenaCommonFlags.FilesInput()
-            except ModuleNotFoundError:
-                msg.warning("Failed to load any module containing list of input files")
-                pass
+            msg.warning("Failed to load any module containing list of input files")
+            pass
 
     from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
     if athenaCommonFlags.isOnline() and (not inFiles or all([f.strip() == '' for f in inFiles])):

Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinderConfig.py

@@ -418,7 +418,7 @@ def TrigFastTrackFinderCfg(flags: AthConfigFlags, name: str, RoIs: str, inputTra
         LayerNumberTool = numberingTool,
         useGPU = flags.Trigger.InDetTracking.doGPU,
         SpacePointProviderTool=spTool,
-        MinHits = 5, #Only process RoI with more than 5 spacepoints
+        MinHits = 3 if flags.Detector.GeometryITk else 5, #Only process RoI with more than 5 (3) spacepoints for Run 3 (Run 4)
         Triplet_MinPtFrac = 0.8 if flags.Detector.GeometryITk else 1,
         Triplet_nMaxPhiSlice = 53 if "cosmics" not in flags.Tracking.ActiveConfig.name else 2,
         LRT_Mode = flags.Tracking.ActiveConfig.isLRT,

Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx

@@ -120,7 +120,7 @@ void AnalysisConfigMT_Ntuple::loop() {
 	//	m_provider->msg(MSG::INFO) << " online  beam position\tx=" << xbeam_online << "\ty=" << ybeam_online << "\tz=" << zbeam_online << endmsg; 
 
 	/// list the configured chains once
-    static const std::set<std::string> configuredHLTChains = get_configured_chains();
+	static const std::set<std::string> configuredHLTChains = get_configured_chains();
 
 	Filter_AcceptAll filter;
 	/// FIXME: should really have hardcoded limits encoded as 

Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx

@@ -88,8 +88,11 @@ void ConfAnalysis::initialiseInternal() {
 
   const int pTResBins = int(100*binConfig.ptres_NScale);
 
+
   //+++ Eta ranges
-  double tmp_maxEta    = 3.;
+  /// keep the old ranges commented, since we need the new ranges to be consistent
+  ///  double tmp_maxEta    = 3.;
+  double tmp_maxEta    = 5.;
   double tmp_absResEta = 0.04; // 0.0005;
 
   //+++ Phi ranges
@@ -99,8 +102,9 @@ void ConfAnalysis::initialiseInternal() {
 
   //  std::cout << "ConfAnalysis::initialise() " << name() << " config: " << binConfig << std::endl;
 
-
-  int etaBins          = int(30*binConfig.eta_NScale);
+  ///  keep the old eta bins commented, since we need the new binning to be consisten with the old 
+  ///  int etaBins          = int(30*binConfig.eta_NScale);
+  int etaBins          = int(50*binConfig.eta_NScale);
   const int etaResBins = int(600*binConfig.eta_NScale);
 
   const int phiBins    = int(30*binConfig.phi_NScale);
@@ -1934,6 +1938,9 @@ void ConfAnalysis::execute( const std::vector<TIDA::Track*>& reftracks,
 
       m_eff_vs_mult->FillDenom( m_Nref );
 
+      m_eff_eta_vs_pt->FillDenom( std::fabs(pTt), etat );
+      m_eff_d0_vs_pt->FillDenom( std::fabs(pTt), a0t );
+
       dump = false; 
 
       m_eff_vs_ntracks->FillDenom( Nvtxtracks );

Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat

@@ -113,16 +113,38 @@ testChains = {
     "HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT",
     "HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
 
+    // 2022 L1
     "HLT_e20_idperf_loose_lrtloose_L1EM15VH:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
     "HLT_e30_idperf_loose_lrtloose_L1EM22VHI:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
     "HLT_e20_idperf_loose_lrtloose_L1EM15VH:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
     "HLT_e30_idperf_loose_lrtloose_L1EM22VHI:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
+    "HLT_e20_idperf_loose_lrtloose_L1EM15VH:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT",
+    "HLT_e30_idperf_loose_lrtloose_L1EM22VHI:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT",
 
     "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1EM22VHI:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT:1",
     "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1EM22VHI:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT:1",
+    "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1EM22VHI:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT:1",
 
     "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1EM20VH:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT:0",
     "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1EM20VH:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT:0",
+    "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1EM20VH:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT:0",
+
+    // 2023 L1
+    "HLT_e20_idperf_loose_lrtloose_L1eEM18L:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
+    "HLT_e30_idperf_loose_lrtloose_L1eEM26M:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
+    "HLT_e20_idperf_loose_lrtloose_L1eEM18L:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
+    "HLT_e30_idperf_loose_lrtloose_L1eEM26M:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
+    "HLT_e20_idperf_loose_lrtloose_L1eEM18L:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT",
+    "HLT_e30_idperf_loose_lrtloose_L1eEM26M:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT",
+
+    "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT:1",
+    "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT:1",
+    "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT:1",
+
+    "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1eEM24L:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT:0",
+    "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1eEM24L:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT:0",
+    "HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1eEM24L:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT:0",
+
 
     "HLT_tau25_idperf_tracktwoLLP_L1TAU12IM:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore",
     "HLT_tau25_idperf_tracktwoLLP_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso",

Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorSingleAlgorithm.cxx

@@ -150,7 +150,7 @@ void TrigTauMonitorSingleAlgorithm::fillHLTEfficiencies(const EventContext& ctx,
 
         if(!L1_match || !l1_accept_flag) continue; // Skip this offline tau since not matched with L1 item   
 
-        fill(monGroup, tauPt, tauEta, tauPhi, averageMu, HLT_match, HLT_match_highPt);
+        fill(monGroup, tauPt, tauEta, tauPhi, averageMu, HLT_match);
 
         if(is_highPt) {
             HLT_match_highPt = static_cast<bool>(HLT_match);

Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/src/gFexByteStreamTool.cxx

@@ -492,7 +492,7 @@ int16_t gFexByteStreamTool::fillGlobal(const std::vector<uint32_t> &tob, const i
     container->back()->setSaturated(0);
     container->back()->setGlobalType(type);
 
-    int16_t MET2 = sum_x * sum_x + sum_y * sum_y;
+    int MET2 = sum_x * sum_x + sum_y * sum_y;
     int16_t MET = 0x0;
 
     if (MET2 > 0x000FFF) MET = 0x000FFF;

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gTower.cxx

@@ -256,22 +256,22 @@ namespace LVL1 {
         }
         else if ( iEta == 36 ){
           gFEXtowerID = gFEXtowerID + ((iPhi*24) + 22);
-          iPhiFW = iPhi*2;
+          iPhiFW = (iPhi*2)+1;
           iEtaFW = 36;
         }   
         else if ( iEta == 37 ){
           gFEXtowerID = gFEXtowerID + ((iPhi*24) + 10);
-          iPhiFW = (iPhi*2)+1;
+          iPhiFW = iPhi*2;
           iEtaFW = 36;
         } 
         else if ( iEta == 38 ){
           gFEXtowerID = gFEXtowerID + ((iPhi*24) + 23);
-          iPhiFW = iPhi*2;
+          iPhiFW = (iPhi*2)+1;
           iEtaFW = 37;
         }
         else if ( iEta == 39 ){
           gFEXtowerID = gFEXtowerID + ((iPhi*24) + 11);
-          iPhiFW = (iPhi*2)+1;
+          iPhiFW = iPhi*2;
           iEtaFW = 37;
         }  
       }

Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py

@@ -2,8 +2,13 @@
 
 
 # Run over AOD or TRIG8 to produce the TIDA track ntuple
-# Example: 
+# Note, to run using the python file in your current directory you need to drop 'TrigInDetValidation.'
+# Local example: 
 # python -m TrigInDetValidation.TrigInDetValidation_AODtoTrkNtuple_CA --filesInput AOD.root
+# Grid example:
+# prun --exec="python -m TrigInDetValidation.TrigInDetValidation_AODtoTrkNtuple_CA --LRT=True --filesInput=%IN" --inDS=DATASETNAME --outDS=OUTPUTNAME --useAthenaPackage --outputs="TrkNtuple-0000.root" 
+
+import sys
 
 from AthenaConfiguration.AllConfigFlags import initConfigFlags
 flags = initConfigFlags()
@@ -22,12 +27,9 @@ args, _ = parser.parse_known_args()
 args = flags.fillFromArgs(parser=parser)
 
 
-if hasattr(args, "filesInput") and args.filesInput:
-    FilesInput = args.filesInput
-else:
-    FilesInput = ["AOD.pool.root"]
+if not (hasattr(args, "filesInput") and args.filesInput):
+    flags.Input.Files = ["AOD.pool.root"]
 
-flags.Input.Files = FilesInput
 flags.lock()
 
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -162,7 +164,6 @@ if ( True ) :
 
     "HLT_mu.*_LRT_idperf_.*:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
     "HLT_mu.*_LRT_idperf_.*:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT",
-    "HLT_mu.*_LRT_idperf_.*:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
 
     "HLT_b.*perf.*:HLT_IDTrack_Bjet_FTF",
     "HLT_b.*perf.*:HLT_IDTrack_Bjet_IDTrig",
@@ -175,10 +176,11 @@ if ( True ) :
     "HLT_e.*:HLT_IDTrack_Electron_IDTrig",
     "HLT_e.*:HLT_IDTrack_Electron_GSF",
 
-    "HLT_e20_idperf_loose_lrtloose_L1eEM18L:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
-    "HLT_e30_idperf_loose_lrtloose_L1eEM26M:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
-    "HLT_e20_idperf_loose_lrtloose_L1eEM18L:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
-    "HLT_e30_idperf_loose_lrtloose_L1eEM26M:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
+
+    # LRT electron idperf               
+    "HLT_e.*idperf.*lrt.*:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT",
+    "HLT_e.*idperf.*lrt.*:HLT_IDTrack_ElecLRT_IDTrig:HLT_Roi_FastElectron_LRT",
+    "HLT_e.*idperf.*lrt.*:HLT_IDTrack_Electron_LRTGSF:HLT_Roi_FastElectron_LRT",
 
     # electron lrt e tag
     "HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:HLT_IDTrack_ElecLRT_FTF:roi=HLT_Roi_FastElectron_LRT:te=1",
@@ -284,5 +286,7 @@ print ("configured everything")
 # Adjust message limits
 acc.getService("MessageSvc").infoLimit = 100000000
 
-acc.run()
+# Return a status code
+sys.exit(not acc.run().isSuccess())
+
 

Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py

@@ -140,10 +140,15 @@ def addCommonP1Signatures(chains):
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_C', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_AND_C', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_AND_C_TOF_T0T1', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
+        ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_AND_C_TOF', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_UNPAIRED_NONISO', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
+        ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_TOF_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
+        ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_TOF_UNPAIRED_NONISO', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
+        ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_TOF_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
+        ChainProp(name='HLT_noalg_AFPPEB_L1AFP_A_OR_C_TOF_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
         ChainProp(name='HLT_noalg_AFPPEB_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['AFPCalib'], groups=SupportGroup),
 
         #NSW mon

Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

@@ -1700,12 +1700,17 @@ class ItemDef:
         MenuItem('L1_AFP_C').setLogic( AFP_C & physcond)
         MenuItem('L1_AFP_A_OR_C').setLogic( (AFP_A | AFP_C) & physcond)
         MenuItem('L1_AFP_A_AND_C').setLogic( AFP_A & AFP_C & physcond)
+        MenuItem('L1_AFP_A_AND_C_TOF').setLogic( AFP_TOF_A & AFP_TOF_C & physcond)
         MenuItem('L1_AFP_A_AND_C_TOF_T0T1').setLogic( (d.AFP_FSA_TOF_T0 | d.AFP_FSA_TOF_T1) & (d.AFP_FSC_TOF_T0 | d.AFP_FSC_TOF_T1) & physcond)
 
-        MenuItem('L1_AFP_A_OR_C_UNPAIRED_ISO').setLogic( (AFP_A | AFP_C)  & unpaired_isocond )
-        MenuItem('L1_AFP_A_OR_C_UNPAIRED_NONISO').setLogic( (AFP_A | AFP_C)  & unpaired_nonisocond )
+        MenuItem('L1_AFP_A_OR_C_UNPAIRED_ISO').setLogic( (AFP_A | AFP_C) & unpaired_isocond )
+        MenuItem('L1_AFP_A_OR_C_UNPAIRED_NONISO').setLogic( (AFP_A | AFP_C) & unpaired_nonisocond )
         MenuItem('L1_AFP_A_OR_C_EMPTY').setLogic( (AFP_A | AFP_C) & cosmiccond)
         MenuItem('L1_AFP_A_OR_C_FIRSTEMPTY').setLogic( (AFP_A | AFP_C) & firstempty)
+        MenuItem('L1_AFP_A_OR_C_TOF_UNPAIRED_ISO').setLogic( (AFP_TOF_A | AFP_TOF_C) & unpaired_isocond )
+        MenuItem('L1_AFP_A_OR_C_TOF_UNPAIRED_NONISO').setLogic( (AFP_TOF_A | AFP_TOF_C) & unpaired_nonisocond )
+        MenuItem('L1_AFP_A_OR_C_TOF_EMPTY').setLogic( (AFP_TOF_A | AFP_TOF_C) & cosmiccond)
+        MenuItem('L1_AFP_A_OR_C_TOF_FIRSTEMPTY').setLogic( (AFP_TOF_A | AFP_TOF_C) & firstempty)
 
         MenuItem('L1_AFP_A_AND_C_J5').setLogic( AFP_A & AFP_C & d.J5 & physcond )
         MenuItem('L1_AFP_A_OR_C_J5').setLogic( (AFP_A | AFP_C) & d.J5 & physcond )

Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_HI_run3_v1.py

@@ -303,12 +303,14 @@ def defineMenu():
         'L1_AFP_A_AND_C_TOF_jJ90', 'L1_AFP_A_AND_C_TOF_T0T1_jJ90', 
         'L1_AFP_A_AND_C_TOF_jJ125', 'L1_AFP_A_AND_C_TOF_T0T1_jJ125',
 
-        'L1_AFP_A_OR_C', 'L1_AFP_A_AND_C', 'L1_AFP_A', 'L1_AFP_C', 'L1_AFP_A_AND_C_TOF_T0T1',
+        'L1_AFP_A_OR_C', 'L1_AFP_A_AND_C', 'L1_AFP_A', 'L1_AFP_C', 'L1_AFP_A_AND_C_TOF_T0T1', 'L1_AFP_A_AND_C_TOF', 
         'L1_AFP_FSA_BGRP12', 'L1_AFP_FSC_BGRP12', 'L1_AFP_NSA_BGRP12', 'L1_AFP_NSC_BGRP12',
         'L1_AFP_FSA_TOF_T0_BGRP12', 'L1_AFP_FSA_TOF_T1_BGRP12', 'L1_AFP_FSA_TOF_T2_BGRP12', 'L1_AFP_FSA_TOF_T3_BGRP12',
         'L1_AFP_FSC_TOF_T0_BGRP12', 'L1_AFP_FSC_TOF_T1_BGRP12', 'L1_AFP_FSC_TOF_T2_BGRP12', 'L1_AFP_FSC_TOF_T3_BGRP12',
         'L1_AFP_A_OR_C_UNPAIRED_ISO', 'L1_AFP_A_OR_C_UNPAIRED_NONISO',
         'L1_AFP_A_OR_C_EMPTY', 'L1_AFP_A_OR_C_FIRSTEMPTY',
+        'L1_AFP_A_OR_C_TOF_UNPAIRED_ISO', 'L1_AFP_A_OR_C_TOF_UNPAIRED_NONISO',
+        'L1_AFP_A_OR_C_TOF_EMPTY', 'L1_AFP_A_OR_C_TOF_FIRSTEMPTY',
         'L1_AFP_A_OR_C_MBTS_2', 'L1_AFP_A_AND_C_MBTS_2',
        
 

Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py

@@ -223,12 +223,13 @@ def defineMenu():
         # low-priority (all mu)
         'L1_AFP_FSA_TOF_T2_BGRP12', 'L1_AFP_FSA_TOF_T3_BGRP12','L1_AFP_FSC_TOF_T2_BGRP12', 'L1_AFP_FSC_TOF_T3_BGRP12',
         'L1_AFP_A_OR_C_UNPAIRED_ISO', 'L1_AFP_A_OR_C_UNPAIRED_NONISO', 'L1_AFP_A_OR_C_EMPTY', 'L1_AFP_A_OR_C_FIRSTEMPTY',
-
+        
+        'L1_AFP_A_OR_C_TOF_UNPAIRED_ISO', 'L1_AFP_A_OR_C_TOF_UNPAIRED_NONISO', 'L1_AFP_A_OR_C_TOF_EMPTY', 'L1_AFP_A_OR_C_TOF_FIRSTEMPTY',
         'L1_AFP_A_AND_C_TOF_jJ50', 'L1_AFP_A_AND_C_TOF_T0T1_jJ50', 'L1_AFP_A_AND_C_TOF_jJ60', 'L1_AFP_A_AND_C_TOF_T0T1_jJ60', 'L1_AFP_A_AND_C_TOF_jJ90', 'L1_AFP_A_AND_C_TOF_T0T1_jJ90', 'L1_AFP_A_AND_C_TOF_jJ125', 'L1_AFP_A_AND_C_TOF_T0T1_jJ125',
 
         # high-priority (low mu)
         'L1_AFP_NSA_BGRP12', 'L1_AFP_NSC_BGRP12', 
-        'L1_AFP_A','L1_AFP_C', 'L1_AFP_A_AND_C',
+        'L1_AFP_A','L1_AFP_C', 'L1_AFP_A_AND_C', 'L1_AFP_A_AND_C_TOF',
         #'L1_AFP_A_OR_C_J5','L1_AFP_A_AND_C_J5', # J5 not available in legacy menu. Need to update to jJ threshold for low-mu
         'L1_AFP_A_OR_C_jJ30', 'L1_AFP_A_AND_C_jJ30',
         'L1_MU5VF_AFP_A_OR_C', 'L1_MU5VF_AFP_A_AND_C',
@@ -236,7 +237,7 @@ def defineMenu():
         'L1_eEM9_AFP_A_OR_C', 'L1_eEM9_AFP_A_AND_C',
         # med-priority (low mu)
         'L1_AFP_A_OR_C', 'L1_AFP_A_OR_C_MBTS_2', 'L1_AFP_A_AND_C_MBTS_2',
-          
+        
 
         # MBTS
         'L1_MBTS_A', 'L1_MBTS_C',

graphics/VP1/VP1Algs/share/vp1

@@ -6,6 +6,15 @@
 intro_text = """
 ******************************************
 
+ ___      ___ ________    _____     
+|\  \    /  /|\   __  \  / __  \    
+\ \  \  /  / | \  \|\  \|\/_|\  \   
+ \ \  \/  / / \ \   ____\|/ \ \  \  
+  \ \    / /   \ \  \___|    \ \  \ 
+   \ \__/ /     \ \__\        \ \__\ 
+    \|__|/       \|__|         \|__|
+                                    
+                                    
 Launching VP1 - the ATLAS 3D event display
 
 ******************************************