Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexInputMonitorAlgorithm.py

@@ -9,6 +9,11 @@ def GfexInputMonitoringConfig(flags):
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     result = ComponentAccumulator()
 
+    #this import is part of the efexinputmonitoring code - pasted in case needed
+    #from LArBadChannelTool.LArBadChannelConfig import LArMaskedSCCfg
+    #result.merge(LArMaskedSCCfg(flags))
+
+
     # use L1Calo's special MonitoringCfgHelper
     from AthenaConfiguration.ComponentFactory import CompFactory
     from TrigT1CaloMonitoring.LVL1CaloMonitoringConfig import L1CaloMonitorCfgHelper
@@ -18,8 +23,9 @@ def GfexInputMonitoringConfig(flags):
     groupName = 'GfexInputMonitor' # the monitoring group name is also used for the package name
     helper.alg.PackageName = groupName
 
-    # mainDir = 'L1Calo'
-    trigPath = 'Developer/GfexInput/'
+    # mainDir = 'L1Calo' This was used when the plots were being saved in the developer area
+    trigPath = 'Expert/Inputs/gFEX'
+    
 
     # See if the file contains xTOBs else use TOBs
     #hasXtobs = True if "L1_eFexTower" in inputFlags.Input.Collections else False
@@ -31,27 +37,57 @@ def GfexInputMonitoringConfig(flags):
 
     # histograms of gFex tower variables
     helper.defineHistogram('NGfexTowers;h_nGfexTowers', title='Number of gFex towers in each event with Et > 10 GeV; gTowers per event',
-                                   fillGroup = "highEtgTowers", type='TH1I', path=trigPath, xbins=100,xmin=0,xmax=100)
+                           fillGroup = "highEtgTowers",
+                           type='TH1I',
+                           path=trigPath,
+                           hanConfig={"description":"The histogram describes the number of gTowers with Et > 10 GeV per event. We do not expect this number to be high. The x-axis gives the number of gTowers and the y-axis is the number of events with that many gTowers"},
+                           xbins=100,xmin=0,xmax=100)
 
     helper.defineHistogram('TowerEta,TowerPhi,TowerEt;h_TowerHeatMap', title='gFex Tower Average Et Distribution (gTowerEt > 10 GeV) ;#eta;#phi;averageEt (count x 50 MeV)',
-                            fillGroup = "highEtgTowers",type='TProfile2D',path=trigPath, xbins=100,xmin=-5.0,xmax=5.0,ybins=66,ymin=-math.pi,ymax=math.pi)
-
-
-    helper.defineHistogram('TowerEta,TowerPhi;h_TowerEtaPhiMap', title='gFex Tower Eta vs Phi with gTower Et < 10 GeV ;#eta;#phi',
-                            fillGroup = "lowEtgTowers", type='TH2F',path=trigPath, xbins=100,xmin=-5.0,xmax=5.0,ybins=66,ymin=-math.pi,ymax=math.pi)
+                           fillGroup = "highEtgTowers",
+                           type='TProfile2D',
+                           path=trigPath, 
+                           hanConfig={"description":"The histogram is an average Et distrribution og the gTowers in the eta-phi space. The z-axis gives the average Et."},
+                           xbins=100,xmin=-5.0,xmax=5.0,
+                           ybins=66,ymin=-math.pi,ymax=math.pi)
+
+
+    helper.defineHistogram('TowerEta,TowerPhi,TowerEt;h_TowerEtaPhiMap', title='gFex Tower Average Et Distribution (gTower Et < 10 GeV) ;#eta;#phi;averageEt (count x 50 MeV)',
+                           fillGroup = "lowEtgTowers",
+                           type='TProfile2D',
+                           path=trigPath,
+                           hanConfig={"description":"The histogram is an average Et distrribution og the gTowers in the eta-phi space. This includes only those gTowers with Et < 10 GeV. The z-axis gives the average Et."},
+                           xbins=100,xmin=-5.0,xmax=5.0,
+                           ybins=66,ymin=-math.pi,ymax=math.pi)
 
     
-    helper.defineHistogram('TowerFpga;h_TowerFpga', title='gFex Tower (gTowerEt > 10 GeV ) FPGA Number;Number of FPGA',
-                            fillGroup = "highEtgTowes", type='TH1F', path=trigPath, xbins=4,xmin=0,xmax=4.0)
+    helper.defineHistogram('TowerFpga;h_TowerFpga',title='gFex Tower (gTowerEt > 10 GeV ) FPGA Number;Number of FPGA',
+                           fillGroup = "highEtgTowes", 
+                           type='TH1F', 
+                           path=f'{trigPath}/detail',
+                           hanConfig={"description":"Gives the FPGA distribution of the gTowers with Et > 10GeV."}, 
+                           xbins=4,xmin=0,xmax=4.0)
 
     helper.defineHistogram('TowerEt;h_TowerEt', title='gFex Tower Et ; Et (count x 50 MeV)',
-                            fillGroup = "gTowers", type='TH1I', path=trigPath, xbins= 1000, xmin=-500.0, xmax=500.0)
+                            fillGroup = "gTowers", 
+                            type='TH1I', 
+                            path=trigPath, 
+                            hanConfig={"description":""},
+                            xbins= 1000, xmin=-500.0, xmax=500.0)
 
     helper.defineHistogram('MaxEt;h_MaxTowerEt', title='gFex Max Tower Et for saturation=true; Et (count x 50 MeV)',
-                            fillGroup = "gTowers", type='TH1F', path=trigPath, xbins=350,xmin=-50.0,xmax=300.0)
+                            fillGroup = "gTowers", 
+                            type='TH1F', 
+                            path=f'{trigPath}/detail',
+                            hanConfig={"description":""},  
+                            xbins=350,xmin=-50.0,xmax=300.0)
     
     helper.defineHistogram('TowerSaturationflag;h_TowerSaturationflag', title='gFex Tower Saturation FLag',
-                            fillGroup = "gTowers", type='TH1F', path=trigPath, xbins=3,xmin=0,xmax=3.0)
+                            fillGroup = "gTowers", 
+                            type='TH1F', 
+                            path=trigPath, 
+                            hanConfig={"description":""}, 
+                            xbins=3,xmin=-1,xmax=2.0)
 
     acc = helper.result()
     result.merge(acc)

Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py

@@ -25,6 +25,7 @@ def GfexMonitoringConfig(flags):
 
     # Define various quantities
     trigPath = 'Developer/Gfex/'
+    expertPath = 'Expert/Outputs/'
     globTobVarDict = {"gScalarEJwoj":["gFexMet", "gFexSumEt"], "gMETComponentsJwoj":["METx", "METy"], "gMHTComponentsJwoj":["MHTx", "MHTy"], "gMSTComponentsJwoj":["MSTx", "MSTy"]}  
 
     # "gMETComponentsNoiseCut":["METx_NoiseCut", "METy_NoiseCut"], "gMETComponentsRms":["METx_Rms", "METy_Rms"], "gScalarENoiseCut":["gFexMet_NoiseCut", "gFexSumEt_NoiseCut"], "gScalarERms":["gFexMet_Rms", "gFexSumEt_Rms"]}- these are to be used in the future when rho and NC are fixed
@@ -61,14 +62,14 @@ def GfexMonitoringConfig(flags):
                     
                 ptStrTitle = f" - tobEt [200 MeV Scale]>{ptCut}" if ptCut != -1 else ""
                 jPath = "gFexSRJets" if "SRJet" in containerKey else "gFexLRJets"
-                jPath += ptCutString
+                #jPath += ptCutString
  
-                helper.defineHistogram(f"{containerKey}Eta{ptCutString};h_{containerKey}Eta{ptCutString}", title="{} #eta{}; #eta; counts".format(tobTypeStr,  ptStrTitle), type='TH1F', fillGroup=groupName, path=f"{trigPath}{jPath}/", xbins=32,xmin=-5.0,xmax=5.0)
-                helper.defineHistogram(f"{containerKey}Phi{ptCutString};h_{containerKey}Phi{ptCutString}", title="{} #phi{}; #phi; counts".format(tobTypeStr, ptStrTitle), type='TH1F', fillGroup=groupName, path=f"{trigPath}{jPath}/", xbins=32,xmin=-math.pi,xmax=math.pi)
-                helper.defineHistogram(f"{containerKey}Pt{ptCutString};h_{containerKey}Pt{ptCutString}" , title="{} Pt{} ; Pt [MeV]  ; counts".format(tobTypeStr,  ptStrTitle), type='TH1F', fillGroup=groupName,path=f"{trigPath}{jPath}/", xbins=100,xmin=-1,xmax=4096)
+                helper.defineHistogram(f"{containerKey}Eta{ptCutString};h_{containerKey}Eta{ptCutString}", title="{} #eta{}; #eta; counts".format(tobTypeStr,  ptStrTitle), type='TH1F', fillGroup=groupName, path=f"{expertPath}{jPath}/detail",  hanConfig={"description":""} ,xbins=32,xmin=-5.0,xmax=5.0)
+                helper.defineHistogram(f"{containerKey}Phi{ptCutString};h_{containerKey}Phi{ptCutString}", title="{} #phi{}; #phi; counts".format(tobTypeStr, ptStrTitle), type='TH1F', fillGroup=groupName, path=f"{expertPath}{jPath}/detail",  hanConfig={"description":""} ,xbins=32,xmin=-math.pi,xmax=math.pi)
+                helper.defineHistogram(f"{containerKey}Pt{ptCutString};h_{containerKey}Pt{ptCutString}" , title="{} Pt{} ; Pt [MeV]  ; counts".format(tobTypeStr,  ptStrTitle), type='TH1F', fillGroup=groupName,path=f"{expertPath}{jPath}/detail",  hanConfig={"description":""} ,xbins=100,xmin=-1,xmax=4096)
 
                 # 2D histograms
-                helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap", title="{} {} #eta vs #phi ; #eta; #phi".format(tobTypeStr, ptStrTitle), type='TH2F',fillGroup=groupName, path=f"{trigPath}{jPath}/", xbins=32,xmin=-5.0,xmax=5.0,ybins=32,ymin=-math.pi,ymax=math.pi)
+                helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap_{containerKey}_{ptCutString}", title="{} {} #eta vs #phi ; #eta; #phi".format(tobTypeStr, ptStrTitle), type='TH2F',fillGroup=groupName, path=f"{expertPath}{jPath}/",  hanConfig={"description":""}, xbins=32,xmin=-5.0,xmax=5.0,ybins=32,ymin=-math.pi,ymax=math.pi)
 
     # Rho TOB list
     for containerKey in gFexRhoTobKeyList:

Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexSimMonitorAlgorithm.py

@@ -27,7 +27,7 @@ def GfexSimMonitoringConfig(flags, UseOfflineCopy = True):
                            xlabels=["DataTowers","EmulatedTowers"],
                            ymin=0,ymax=len(L1CaloMonitorCfgHelper.SIGNATURES),ylabels=L1CaloMonitorCfgHelper.SIGNATURES,
                            opt=['kCanRebin','kAlwaysCreate'],merge="merge")
-    trigPath='Developer/GfexSim/'
+    #trigPath='Developer/GfexSim/'
     iLoc = []
     for iPhi in range(0,32):
         for iEta in range (0,36):
@@ -36,7 +36,8 @@ def GfexSimMonitoringConfig(flags, UseOfflineCopy = True):
         helper.defineHistogram("LBN,locIdx;h_"+sig+"_mismatches_posLbnMap", title = "Mismatched " + sig + " [DataTower evts];LB;Position (iPhi:iEta);TOBs",
                                fillGroup = "mismatches"+ sig,
                                type="TH2I",
-                               path=trigPath,
+                               path='Expert/Sim/detail',
+                               hanConfig={"description":"Location of mismatched " + sig + " TOBs in simulation-ready events. Use this plot to identify any localized gFEX issues."},
                                xbins=1,xmin=0,xmax=1, ylabels=iLoc, 
                                opt=['kAddBinsDynamically','kAlwaysCreate'])
 

Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexInputMonitorAlgorithm.cxx

@@ -68,7 +68,7 @@ StatusCode GfexInputMonitorAlgorithm::fillHistograms( const EventContext& ctx )
 		}
 
 		else {
-			fill("lowEtgTowers",Towereta,Towerphi);
+			fill("lowEtgTowers",Towereta,Towerphi,Toweret);
 		}
 	}
 

Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMonitorAlgorithm.cxx

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 
 #include "MistimedStreamMonitorAlgorithm.h"
-#include "AthContainers/ConstAccessor.h"
 #include <iostream>
 #include <vector>
 #include <TMath.h>
@@ -278,9 +277,7 @@ StatusCode MistimedStreamMonitorAlgorithm::fillHistograms( const EventContext& c
   std::unique_ptr<xAOD::TriggerTowerAuxContainer> ttContainerAux = std::make_unique<xAOD::TriggerTowerAuxContainer>();
   ttContainer->setStore(ttContainerAux.get());
   
-  static const SG::Accessor<float> pulseClassificationAcc("pulseClassification");
-
-  // Creating a new container for TT with pulseClassification 
+  // Creating a new contianer for TT with pulseClasification 
   for (const xAOD::TriggerTower* tt : *triggerTowerTES) {
   
     float ttPulseCategory = 0;
@@ -430,7 +427,7 @@ StatusCode MistimedStreamMonitorAlgorithm::fillHistograms( const EventContext& c
     xAOD::TriggerTower* newTT = new xAOD::TriggerTower; //create a new TT object
     ttContainer->push_back(newTT); // add the newTT to new output TT container (at the end of it)
     *newTT = *(tt);// copy over all information from TT to newTT
-    pulseClassificationAcc(*newTT) = ttPulseCategory; //decorate
+    newTT->auxdata<float>("pulseClassification") = ttPulseCategory; //decorate
   }
 
   // count all eFex in-time and out-of-time TOBs with at least 5GeV 
@@ -593,7 +590,7 @@ StatusCode MistimedStreamMonitorAlgorithm::fillHistograms( const EventContext& c
     //Create the trigger tower objects and calculate scaled phi
     for (const xAOD::TriggerTower* tt : *ttContainer) {
       ATH_CHECK( makeTowerPPM(tt, vecMonTTDecor) );     
-      ATH_MSG_DEBUG( "tt->pulseClassification :: " <<  pulseClassificationAcc(*tt));
+      ATH_MSG_DEBUG( "tt->pulseClassification :: " <<  tt->auxdata<float>("pulseClassification"));
     }
     
     groupName = "EventofInterest_" +  std::to_string(eventCounter) + "_";
@@ -603,7 +600,7 @@ StatusCode MistimedStreamMonitorAlgorithm::fillHistograms( const EventContext& c
     for (auto& myTower : vecMonTTDecor) {
       ATH_MSG_DEBUG(" looping over TTs"); 
       const int layer =   (myTower.tower)->layer();
-      pulseCat = pulseClassificationAcc(*myTower.tower);
+      pulseCat = (myTower.tower)->auxdata<float>("pulseClassification");
       bcidWord = (myTower.tower)->bcidVec()[0]; // look at the status bit in the central time slice
       ATH_MSG_DEBUG("groupName :: " <<  groupName);