diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..073afc9a5eb4919fdf81c189bfa3def00b0ba814
--- /dev/null
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile
@@ -0,0 +1,33 @@
+CXX = g++
+ROOTCFLAGS = $(shell root-config --cflags)
+ROOTLIBS = $(shell root-config --libs)
+ROOTGLIBS = $(shell root-config --glibs)
+#CXXFLAGS = $(shell root-config --cflags) -Wall -O3
+CXXFLAGS += $(ROOTCFLAGS)
+LIBS = $(ROOTGLIBS) -lm -L/usr/X11R6 -L/usr/lib -L./ -lMinuit
+#LIBS = -lm -L/usr/X11R6 -L/usr/lib -L./
+
+TARGET = makeInactiveModuleList
+OBJS = makeInactiveModuleList.o
+
+all: ${TARGET}
+
+${TARGET}: ${OBJS}
+ @echo "Now make : $@"
+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+ @echo "... Compile done! "
+
+.SUFFIXES: .cc .o
+.cc.o:
+ @echo "Start Compiling : $<"
+ ${CXX} ${CXXFLAGS} -c $<
+ @echo "... Compiling Object Files $< -->done"
+ @echo ""
+
+.PHONY: clean
+clean:
+ @echo "-- Now Clean Up --"
+ rm -f *.o *~ $(TARGET)
+
+ana.o:
+
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index f553ad6e4690c7547ddabf6592c7e51e76966607..c2df091dd072de0663fc6d4a2e955e9ca61ddd8d 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -9,8 +9,6 @@ from IOVDbSvc.IOVDbSvcConfig import addFolders,addFoldersSplitOnline
def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
"""Return a ComponentAccumulator with configured PixelConfigCondAlg"""
acc = ComponentAccumulator()
- acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixMapOverlay",
- "/PIXEL/PixMapOverlay", "CondAttrListCollection"))
runNum = flags.Input.RunNumber[0]
# FIXME commented properties are not currently accepted by PixelConfigCondAlg
@@ -421,15 +419,22 @@ def PixelDCSCondTempAlgCfg(flags, name="PixelDCSCondTempAlg", **kwargs):
acc.addCondAlgo(CompFactory.PixelDCSCondTempAlg(name, **kwargs))
return acc
-# NEW FOR RUN3 def PixelDeadMapCondAlgCfg(flags, name="PixelDeadMapCondAlg", **kwargs):
-# NEW FOR RUN3 """Return a ComponentAccumulator with configured PixelDeadMapCondAlg"""
-# NEW FOR RUN3 acc = ComponentAccumulator()
-# NEW FOR RUN3 acc.merge(addFolders(flags, "/PIXEL/PixelModuleFeMask", "PIXEL_OFL", className="CondAttrListCollection"))
-# NEW FOR RUN3 kwargs.setdefault("PixelModuleData", "PixelModuleData")
-# NEW FOR RUN3 kwargs.setdefault("ReadKey", "/PIXEL/PixelModuleFeMask")
-# NEW FOR RUN3 kwargs.setdefault("WriteKey", "PixelDeadMapCondData")
-# NEW FOR RUN3 acc.addCondAlgo(PixelDeadMapCondAlg(name, **kwargs))
-# NEW FOR RUN3 return acc
+def PixelDeadMapCondAlgCfg(flags, name="PixelDeadMapCondAlg", **kwargs):
+ """Return a ComponentAccumulator with configured PixelDeadMapCondAlg"""
+ acc = ComponentAccumulator()
+ acc.merge(PixelConfigCondAlgCfg(flags))
+
+ # TODO: once global tag is updated, this line should be removed. (Current q221 uses too old MC global-tag!!!! (before RUN-2!!))
+ # acc.merge(addFolders(flags, "/PIXEL/PixelModuleFeMask", "PIXEL_OFL", className="CondAttrListCollection"))
+ if not flags.Input.isMC and not flags.Overlay.DataOverlay:
+ acc.merge(addFolders(flags, "/PIXEL/PixelModuleFeMask", "PIXEL_OFL", tag="PixelModuleFeMask-RUN2-DATA-UPD4-05", db="CONDBR2", className="CondAttrListCollection"))
+ else:
+ acc.merge(addFolders(flags, "/PIXEL/PixelModuleFeMask", "PIXEL_OFL", tag="PixelModuleFeMask-SIM-MC16-000-03", db="OFLP200", className="CondAttrListCollection"))
+
+ kwargs.setdefault("ReadKey", "/PIXEL/PixelModuleFeMask")
+ kwargs.setdefault("WriteKey", "PixelDeadMapCondData")
+ acc.addCondAlgo(CompFactory.PixelDeadMapCondAlg(name, **kwargs))
+ return acc
def PixelDetectorElementCondAlgCfg(flags, name="PixelDetectorElementCondAlg", **kwargs):
"""Return a ComponentAccumulator with configured PixelDetectorElementCondAlg"""
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 9dca7e04393b4fea74b45628437d2c5aec8216b0..7055ce879f0c89daad658b68bcc47f73e6e5c393 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -78,7 +78,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
// Dead map key. This will be replaced once new deadmap format is validated.
SG::ReadCondHandleKey<CondAttrListCollection> m_readDeadMapKey
- {this, "ReadDeadMapKey", "/PIXEL/PixMapOverlay", "Input key of deadmap conditions folder"};
+ {this, "ReadDeadMapKey", "", "Input key of deadmap conditions folder"};
//====================================================================================
// Run-dependent SIMULATION(digitization) parameters:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
index 54b4ac5330969471be3120b62693935dd3479541..a4260364e3617aea3c368f6073b482384cc0376e 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
@@ -88,8 +88,8 @@ StatusCode PixelDeadMapCondAlg::execute(const EventContext& ctx) const {
int moduleHash = std::atoi(moduleStringHash[1].c_str());
int moduleStatus = std::atoi(moduleString[1].c_str());
- if (moduleStatus<0) { writeCdo->setModuleStatus(moduleHash, 1); }
- else { writeCdo->setChipStatus(moduleHash, moduleStatus); }
+ if (moduleStatus==0) { writeCdo->setModuleStatus(moduleHash, 1); }
+ else { writeCdo->setChipStatus(moduleHash, moduleStatus); }
}
}
}
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
index d56148f1ac17ce1fef9858947ce01f3979ef5b24..1af6d831107f9d26addf62145143952e5561507d 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
@@ -1,13 +1,12 @@
"""Define a function to configure PixelConditionsSummaryCfg
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from PixelConditionsAlgorithms.PixelConditionsConfig import (
- PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg
-# NEW FOR RUN3 , PixelDeadMapCondAlgCfg
+ PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg, PixelDeadMapCondAlgCfg
)
def PixelConditionsSummaryCfg(flags, name="PixelConditionsSummary", **kwargs):
@@ -16,7 +15,7 @@ def PixelConditionsSummaryCfg(flags, name="PixelConditionsSummary", **kwargs):
kwargs.setdefault("UseByteStream", not flags.Input.isMC)
acc.merge(PixelDCSCondStateAlgCfg(flags))
acc.merge(PixelDCSCondStatusAlgCfg(flags))
-# NEW FOR RUN3 acc.merge(PixelDeadMapCondAlgCfg(flags))
+ acc.merge(PixelDeadMapCondAlgCfg(flags))
acc.setPrivateTools(CompFactory.PixelConditionsSummaryTool(name=name + "Tool", **kwargs))
return acc
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index d11364eb6e9ec706783346f11033a35ab65d2f01..e443377ecc65f1030dbaf2f1207b3ec591f9c2cf 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -181,7 +181,7 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons
if (!m_condTDAQKey.empty() && SG::ReadCondHandle<PixelTDAQData>(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; }
- if (SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; }
+ if (SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; }
return true;
}
@@ -201,7 +201,7 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons
if (!m_condTDAQKey.empty() && SG::ReadCondHandle<PixelTDAQData>(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; }
- if (SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; }
+ if (SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; }
return checkChipStatus(moduleHash, elementId);
}
@@ -251,7 +251,7 @@ bool PixelConditionsSummaryTool::isGood(const Identifier& elementId, const InDet
if (!m_condTDAQKey.empty() && SG::ReadCondHandle<PixelTDAQData>(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; }
- if (SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
+ if (SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
if (h==InDetConditions::PIXEL_CHIP) {
if (!checkChipStatus(moduleHash, elementId)) { return false; }
@@ -281,7 +281,7 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash& moduleHash, const
if (!m_condTDAQKey.empty() && SG::ReadCondHandle<PixelTDAQData>(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; }
- if (SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
+ if (SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
return true;
}
@@ -306,7 +306,7 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash & moduleHash, const
if (!m_condTDAQKey.empty() && SG::ReadCondHandle<PixelTDAQData>(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; }
- if (SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
+ if (SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; }
if (!checkChipStatus(moduleHash, elementId)) { return false; }
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
index d69ca0c34aa44143776bd52f7557c6f115225dd9..ee460a28b423d10d98a8069b324b2591febcef7f 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "PixelConditionsData/PixelModuleData.h"
-//#include "PixelConditionsData/PixelDeadMapCondData.h"
+#include "PixelConditionsData/PixelDeadMapCondData.h"
#include "PixelConditionsData/PixelDCSStateData.h"
#include "PixelConditionsData/PixelDCSStatusData.h"
#include "PixelConditionsData/PixelTDAQData.h"
@@ -88,11 +88,8 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool
SG::ReadCondHandleKey<PixelTDAQData> m_condTDAQKey
{this, "PixelTDAQCondData", "", "Pixel TDAQ conditions key"}; //Default empty - legacy option
- SG::ReadCondHandleKey<PixelModuleData> m_condDeadMapKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel deadmap conditions key"};
-
-// NEW FOR RUN3 SG::ReadCondHandleKey<PixelDeadMapCondData> m_condDeadMapKey
-// NEW FOR RUN3 {this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"};
+ SG::ReadCondHandleKey<PixelDeadMapCondData> m_condDeadMapKey
+ {this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"};
ServiceHandle<IPixelCablingSvc> m_pixelCabling
{this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
@@ -140,7 +137,7 @@ inline InterfaceID& PixelConditionsSummaryTool::interfaceID(){
}
inline bool PixelConditionsSummaryTool::checkChipStatus(IdentifierHash moduleHash, Identifier pixid, const EventContext& ctx) const {
- std::bitset<16> chipStatus(SG::ReadCondHandle<PixelModuleData>(m_condDeadMapKey, ctx)->getChipStatus(moduleHash));
+ std::bitset<16> chipStatus(SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey, ctx)->getChipStatus(moduleHash));
if (chipStatus.any()) {
Identifier moduleID = m_pixelID->wafer_id(pixid);
std::bitset<16> circ; circ.set(m_pixelCabling->getFE(&pixid,moduleID));
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index bd552697ff0b1389e3513f638f00f5cb32b5b616..133d578a4adbd33fb939f0af3615db579291bedc 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -162,7 +162,7 @@ def InDetExtrapolatorCfg(flags, name='InDetExtrapolator', **kwargs) :
def PixelConditionsSummaryToolCfg(flags, name = "InDetPixelConditionsSummaryTool", **kwargs):
#FIXME - fix the duplication in TrigInDetConfig.py and PixelConditionsSummaryConfig.py
- from PixelConditionsAlgorithms.PixelConditionsConfig import PixelConfigCondAlgCfg, PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg
+ from PixelConditionsAlgorithms.PixelConditionsConfig import PixelConfigCondAlgCfg, PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg, PixelDeadMapCondAlgCfg
kwargs.setdefault( "UseByteStream", not flags.Input.isMC)
@@ -174,6 +174,7 @@ def PixelConditionsSummaryToolCfg(flags, name = "InDetPixelConditionsSummaryTool
result.merge(PixelConfigCondAlgCfg(flags))
result.merge(PixelDCSCondStateAlgCfg(flags))
result.merge(PixelDCSCondStatusAlgCfg(flags))
+ result.merge(PixelDeadMapCondAlgCfg(flags))
result.setPrivateTools(CompFactory.PixelConditionsSummaryTool(name, **kwargs))
return result
diff --git a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
index 4d32a3ac0afa593d73705989c8823eba56b34667..bbae9ee023c224a15451c6d9edc9a8403a2cff71 100644
--- a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
@@ -607,6 +607,15 @@ if __name__ == "__main__":
from SiLorentzAngleTool.SCT_LorentzAngleConfig import SCT_LorentzAngleCfg
top_acc.addPublicTool(top_acc.popToolsAndMerge(SCT_LorentzAngleCfg(ConfigFlags)))
+ from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg, PixelOfflineCalibCondAlgCfg, PixelDistortionAlgCfg)
+ top_acc.merge(PixelConfigCondAlgCfg(ConfigFlags))
+ top_acc.merge(PixelDeadMapCondAlgCfg(ConfigFlags))
+ top_acc.merge(PixelChargeCalibCondAlgCfg(ConfigFlags))
+ top_acc.merge(PixelCablingCondAlgCfg(ConfigFlags))
+ top_acc.merge(PixelReadoutSpeedAlgCfg(ConfigFlags))
+ top_acc.merge(PixelOfflineCalibCondAlgCfg(ConfigFlags))
+ top_acc.merge(PixelDistortionAlgCfg(ConfigFlags))
+
top_acc.merge(TC.PixelClusterNnCondAlgCfg(ConfigFlags))
top_acc.merge(TC.PixelClusterNnWithTrackCondAlgCfg(ConfigFlags))
@@ -665,4 +674,4 @@ if __name__ == "__main__":
#
top_acc.printConfig()
top_acc.run(25)
- top_acc.store(open("test_TRTExtensionConfig.pkl", "wb"))
\ No newline at end of file
+ top_acc.store(open("test_TRTExtensionConfig.pkl", "wb"))
diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
index 8fca43adf0259cf026c5204008dbb5aeab77c30d..915ebd2a0fa930ba596eb9d93cb09b6f4ba5e0fb 100644
--- a/InnerDetector/InDetConfig/python/TRTPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
@@ -251,10 +251,11 @@ def InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU,
def TRTPreProcessingCfg(flags, useTimeInfo = True, usePhase = False, **kwargs):
acc = ComponentAccumulator()
- from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg)
+ from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg)
- acc.merge(PixelChargeCalibCondAlgCfg(flags))
acc.merge(PixelConfigCondAlgCfg(flags))
+ acc.merge(PixelDeadMapCondAlgCfg(flags))
+ acc.merge(PixelChargeCalibCondAlgCfg(flags))
acc.merge(PixelCablingCondAlgCfg(flags))
acc.merge(PixelReadoutSpeedAlgCfg(flags))
@@ -330,4 +331,4 @@ if __name__ == "__main__":
iovsvc = top_acc.getService('IOVDbSvc')
iovsvc.OutputLevel=5
top_acc.run(25)
- top_acc.store(open("test_TRTPrepocessing.pkl", "wb"))
\ No newline at end of file
+ top_acc.store(open("test_TRTPrepocessing.pkl", "wb"))
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 0291fe7b237205681bd8934e924e86384e9424a6..f70962afb055a86faa1b033da0ab3578f62d0e37 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -115,15 +115,15 @@ def MergedPixelsToolCfg(flags, **kwargs) :
##------------------------------------------------------------------------------
def ClusterMakerToolCfg(flags, name="InDetClusterMakerTool", **kwargs) :
- from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg,
+ from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg,
PixelOfflineCalibCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg)
acc = ComponentAccumulator()
# This directly needs the following Conditions data:
# PixelModuleData & PixelChargeCalibCondData
- acc.merge( PixelChargeCalibCondAlgCfg(flags))
acc.merge( PixelConfigCondAlgCfg(flags))
-
+ acc.merge(PixelDeadMapCondAlgCfg(flags))
+ acc.merge( PixelChargeCalibCondAlgCfg(flags))
acc.merge(PixelOfflineCalibCondAlgCfg(flags))
acc.merge(PixelCablingCondAlgCfg(flags))
acc.merge(PixelReadoutSpeedAlgCfg(flags))
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
index dc25b599d4061762e708fab4ca19f277d572868e..51cf4cd29da8661573bdab9d76b4f86d9fe4977b 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
@@ -42,7 +42,6 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
# Module status #
#################
useNewChargeFormat = False
- useNewDeadmapFormat = False
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -77,10 +76,9 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
ReadDeadMapKey = "",
CablingMapFileName=IdMappingDat)
- if useNewDeadmapFormat:
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
#FIXME: at some point we should move away from being dependent on the experimentalDigi flags.
if 'doFastSCT_Digi' in digitizationFlags.experimentalDigi() and 'doFastPixelDigi' not in digitizationFlags.experimentalDigi():
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py b/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
index 5273dfdd56ed5d0fb533462672cb62865a5ae34e..0d32b356a946383de77ffae29254a4427ac36bf9 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
@@ -31,12 +31,10 @@ if not hasattr(condSeq, 'PixelConfigCondAlg'):
useNewChargeFormat = False
-useNewDeadmapFormat = False
-if useNewDeadmapFormat:
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
+if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
#####################
# Calibration setup #
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 926160070e0a5aa2dab751140f00f26c3e211e34..d36dd6eed6297aa5a9427bbf08a66694ce0de372 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -149,16 +149,10 @@ def PixelConfigCondAlg_MC():
############################################################################################
# Set up Pixel Module data (2018 condition)
############################################################################################
- from IOVDbSvc.CondDB import conddb
#################
# Module status #
#################
- useNewDeadmapFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
alg = PixelConfigCondAlg(name="PixelConfigCondAlg")
@@ -384,9 +378,6 @@ def PixelConfigCondAlg_MC():
alg.CablingMapFileName=IdMapping()
- if useNewDeadmapFormat:
- alg.ReadDeadMapKey = ''
-
return alg
def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
@@ -401,18 +392,22 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
if not hasattr(condSeq, 'PixelConfigCondAlg'):
condSeq += PixelConfigCondAlg_MC()
- useNewDeadmapFormat = False
useNewChargeFormat = False
############################################################################################
# Set up Conditions DB
############################################################################################
- if useNewDeadmapFormat:
- if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
- conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
+ # TODO: Once new global tag is updated, this line should be removed. (Current MC global tag is too old!!! (before RUN-2!!!))
+ if (globalflags.DataSource=='data' and conddb.dbdata == 'CONDBR2'): # for data overlay
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-RUN2-DATA-UPD4-05")
+ else:
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03")
+
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
if not hasattr(condSeq, "PixelDCSCondStateAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStateAlg
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index efc78d58aa4ff065d20539b90b0d667f19f2c5a7..3d4ce6823dd9f6723bf95b715b3961c2c08f8f7f 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -9,8 +9,9 @@ from PixelConditionsAlgorithms.PixelConditionsConfig import (
PixelCablingCondAlgCfg, PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg,
PixelDCSCondHVAlgCfg, PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg,
PixelDCSCondTempAlgCfg, PixelDistortionAlgCfg,
- PixelHitDiscCnfgAlgCfg, PixelOfflineCalibCondAlgCfg, PixelReadoutSpeedAlgCfg
-# NEW FOR RUN3 PixelDeadMapCondAlgCfg, PixelChargeLUTCalibCondAlgCfg
+ PixelHitDiscCnfgAlgCfg, PixelOfflineCalibCondAlgCfg, PixelReadoutSpeedAlgCfg,
+ PixelDeadMapCondAlgCfg
+# NEW FOR RUN3 PixelChargeLUTCalibCondAlgCfg
)
from Digitization.PileUpToolsConfig import PileUpToolsCfg
@@ -166,7 +167,7 @@ def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationBasicTool", **kw
# deadmap
acc.merge(PixelDCSCondStateAlgCfg(flags))
acc.merge(PixelDCSCondStatusAlgCfg(flags))
-# NEW FOR RUN3 acc.merge(PixelDeadMapCondAlgCfg(flags))
+ acc.merge(PixelDeadMapCondAlgCfg(flags))
# offline calibration
acc.merge(PixelDistortionAlgCfg(flags))
acc.merge(PixelOfflineCalibCondAlgCfg(flags))
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
index f795da2578d471874f7c2f66aaa46bb0abb19380..be661423a42a62fa45a267ab772d237687e6440b 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
@@ -17,11 +17,6 @@ if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
- useNewDeadmapFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -70,10 +65,6 @@ if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
alg.EndcapTimeOffset=[100.0,100.0,100.0]
alg.DBMTimeOffset=[100.0,100.0,100.0]
- if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ''
- if useNewDeadmapFormat:
- alg.ReadDeadMapKey = ''
condSeq += alg
#####################
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index c0fb48196fda508aacd3ee30d2df594133be12f7..2bb56b572cd5c29beb5bf9c1915c9453e54d4f0a 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -45,13 +45,8 @@ if DetFlags.pixel_on():
#################
# Module status #
#################
- useNewDeadmapFormat = False
useNewChargeFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -91,21 +86,23 @@ if DetFlags.pixel_on():
alg.EndcapTimeOffset=[100.0,100.0,100.0]
alg.DBMTimeOffset=[100.0,100.0,100.0]
- if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ''
- if useNewDeadmapFormat:
- alg.ReadDeadMapKey = ''
condSeq += alg
- if useNewDeadmapFormat:
+ if not athenaCommonFlags.isOnline():
if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
- if athenaCommonFlags.isOnline():
- alg.ReadKey = ""
- condSeq += alg
+ # TODO: once global tag is updated, this line should be removed. (Current q221 uses too old MC global-tag!!!! (before RUN-2!!))
+ if globalflags.DataSource=='data':
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-RUN2-DATA-UPD4-05")
+ else:
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03")
+
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ''
+ condSeq += alg
if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index 0f535a833430282ba4bd9ff92a7bacd4ae3aa983..3594105de89770452070fe843d1dd154bd423167 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -65,14 +65,10 @@ class PixelConditionsServicesSetup:
from AthenaCommon.GlobalFlags import globalflags
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
+ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
- useNewDeadmapFormat = False
useNewChargeFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
if not hasattr(condSeq, 'PixelConfigCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -122,22 +118,27 @@ class PixelConditionsServicesSetup:
alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
CablingMapFileName=IdMappingDat)
- if not self.usePixMap:
- alg.ReadDeadMapKey = ""
condSeq += alg
#########################
# Deadmap Setup (RUN-3) #
#########################
- if useNewDeadmapFormat:
- if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
+ if not (conddb.folderRequested("/PIXEL/PixelModuleFeMask") or conddb.folderRequested("/PIXEL/Onl/PixelModuleFeMask")):
+ # TODO: Once global tag is updated, this line should be removed.
+ if not athenaCommonFlags.isOnline():
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
- if not self.usePixMap:
- alg.ReadKey = ""
- condSeq += alg
+ if (globalflags.DataSource=='data'):
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-RUN2-DATA-UPD4-05")
+ else:
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03")
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if not self.usePixMap:
+ alg.ReadKey = ''
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ''
+ condSeq += alg
########################
# DCS Conditions Setup #
@@ -146,7 +147,6 @@ class PixelConditionsServicesSetup:
PixelTempFolder = "/PIXEL/DCS/TEMPERATURE"
PixelDBInstance = "DCS_OFL"
- from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
if athenaCommonFlags.isOnline():
PixelHVFolder = "/PIXEL/HLT/DCS/HV"
PixelTempFolder = "/PIXEL/HLT/DCS/TEMPERATURE"
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index c01360735dccb7bb87b95537df23fc41930b6d8b..62ee48838834f6fcbe8292179dc06972fc7ae0c6 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -187,13 +187,8 @@ if doPixel:
#################
# Module status #
#################
- useNewDeadmapFormat = False
useNewChargeFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -242,21 +237,17 @@ if doPixel:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
alg = PixelConfigCondAlg(name="PixelConfigCondAlg", CablingMapFileName=IdMappingDat)
- if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ''
- if useNewDeadmapFormat:
- alg.ReadDeadMapKey = ''
+ alg.ReadDeadMapKey = ''
condSeq += alg
- if useNewDeadmapFormat:
- if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
- conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="/PIXEL/PixelModuleFeMask")
- if athenaCommonFlags.isOnline():
- alg.ReadKey = ''
- condSeq += alg
+ if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="/PIXEL/PixelModuleFeMask")
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ''
+ condSeq += alg
if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index 6c27312341ca5e8544b59717508732f685bdcb03..158086d73951c411b8dfb0da7b070498bf1b9593 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -174,13 +174,8 @@ if doPixel:
#################
# Module status #
#################
- useNewDeadmapFormat = False
useNewChargeFormat = False
- if not useNewDeadmapFormat:
- if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
- conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay","/PIXEL/PixMapOverlay", className='CondAttrListCollection')
-
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -229,21 +224,21 @@ if doPixel:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
alg = PixelConfigCondAlg(name="PixelConfigCondAlg", CablingMapFileName=IdMappingDat)
- if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ''
- if useNewDeadmapFormat:
- alg.ReadDeadMapKey = ''
+ alg.ReadDeadMapKey = ''
condSeq += alg
- if useNewDeadmapFormat:
- if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
- conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
- if not hasattr(condSeq, "PixelDeadMapCondAlg"):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
- if athenaCommonFlags.isOnline():
- alg.ReadKey = ""
- condSeq += alg
+ if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
+ # TODO: once global tag is updated, this line should be removed. (Current q221 uses too old MC global-tag!!!! (before RUN-2!!))
+ if globalflags.DataSource=='data':
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-RUN2-DATA-UPD4-05")
+ else:
+ conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03")
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ alg.ReadKey = ''
+ condSeq += alg
if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 1ac3f486062824e10421d4777f5f96b24963af47..7ba90f892d8f6772dda58a5558654caf7e1c26c2 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -31,10 +31,10 @@ ciRefFileMap = {
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
'overlay-d1498-22.0' : 'v38',
- 'overlay-d1592-22.0' : 'v4',
+ 'overlay-d1592-22.0' : 'v5',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
- 'dataoverlay-d1590-22.0' : 'v7',
+ 'dataoverlay-d1590-22.0' : 'v8',
'dataoverlay-hits-22.0' : 'v1',
}
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 4a6a2afa5c24b8c4e7f8e7c69e96b7e028ef065d..bf69fbd094fa0c00909cd814f984a421a3caf02b 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -313,8 +313,9 @@ def pixelCondCfg(flags):
PixelDCSCondTempAlgCfg, PixelAlignCondAlgCfg, PixelDetectorElementCondAlgCfg,
PixelHitDiscCnfgAlgCfg, PixelReadoutSpeedAlgCfg, PixelCablingCondAlgCfg,
PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg,
- PixelDistortionAlgCfg, PixelOfflineCalibCondAlgCfg
-# NEW FOR RUN3 PixelDeadMapCondAlgCfg, PixelChargeLUTCalibCondAlgCfg/
+ PixelDistortionAlgCfg, PixelOfflineCalibCondAlgCfg,
+ PixelDeadMapCondAlgCfg
+# NEW FOR RUN3 PixelChargeLUTCalibCondAlgCfg/
)
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
@@ -340,7 +341,7 @@ def pixelCondCfg(flags):
# deadmap
acc.merge(PixelDCSCondStateAlgCfg(flags))
acc.merge(PixelDCSCondStatusAlgCfg(flags))
-# NEW FOR RUN3 acc.merge(PixelDeadMapCondAlgCfg(flags))
+ acc.merge(PixelDeadMapCondAlgCfg(flags))
# offline calibration
acc.merge(PixelDistortionAlgCfg(flags))
acc.merge(PixelOfflineCalibCondAlgCfg(flags))
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 2187e235fee70727487b947c3c8cae79f0470f58..5c683a3be9636425129a5aa728d8cf7e93dd39ac 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -23,7 +23,7 @@ HLT_2e17_etcut_L12EM15VH:
3: 2
stepFeatures:
0: 12
- 1: 80
+ 1: 78
2: 16
3: 12
HLT_2e17_lhvloose_L12EM15VH:
@@ -59,9 +59,9 @@ HLT_2e3_etcut_L12EM3:
3: 19
stepFeatures:
0: 342
- 1: 976
- 2: 708
- 3: 268
+ 1: 960
+ 2: 710
+ 3: 270
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
stepCounts:
@@ -664,8 +664,8 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35:
4: 9
5: 9
6: 8
- 7: 7
- 8: 7
+ 7: 8
+ 8: 8
9: 6
10: 3
HLT_e17_lhvloose_L1EM15VH:
@@ -748,7 +748,7 @@ HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
4: 19
stepFeatures:
0: 176
- 1: 715
+ 1: 705
2: 330
3: 158
4: 114
@@ -831,7 +831,7 @@ HLT_e26_etcut_L1EM22VHI:
3: 5
stepFeatures:
0: 7
- 1: 30
+ 1: 29
2: 6
3: 6
HLT_e26_idperf_L1EM24VHI:
@@ -1079,9 +1079,9 @@ HLT_e3_etcut_L1EM3:
3: 20
stepFeatures:
0: 171
- 1: 491
- 2: 358
- 3: 135
+ 1: 482
+ 2: 359
+ 3: 136
HLT_e5_etcut_L1EM3:
eventCount: 20
stepCounts:
@@ -1091,7 +1091,7 @@ HLT_e5_etcut_L1EM3:
3: 20
stepFeatures:
0: 137
- 1: 459
+ 1: 449
2: 173
3: 102
HLT_e5_idperf_L1EM3:
@@ -1116,7 +1116,7 @@ HLT_e5_lhloose_L1EM3:
4: 6
stepFeatures:
0: 60
- 1: 146
+ 1: 138
2: 81
3: 46
4: 7
@@ -1144,7 +1144,7 @@ HLT_e5_lhmedium_L1EM3:
4: 4
stepFeatures:
0: 58
- 1: 132
+ 1: 125
2: 76
3: 44
4: 5
@@ -1158,7 +1158,7 @@ HLT_e5_lhmedium_noringer_L1EM3:
4: 4
stepFeatures:
0: 48
- 1: 99
+ 1: 98
2: 66
3: 38
4: 5
@@ -1172,7 +1172,7 @@ HLT_e5_lhtight_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 129
+ 1: 123
2: 74
3: 43
4: 5
@@ -1186,7 +1186,7 @@ HLT_e5_lhtight_gsf_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 129
+ 1: 123
2: 74
3: 43
4: 5
@@ -1200,7 +1200,7 @@ HLT_e5_lhtight_nod0_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 129
+ 1: 123
2: 74
3: 43
4: 5
@@ -1214,7 +1214,7 @@ HLT_e5_lhtight_noringer_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 94
+ 1: 93
2: 61
3: 36
4: 5
@@ -1228,7 +1228,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 94
+ 1: 93
2: 61
3: 36
4: 5
@@ -1269,7 +1269,7 @@ HLT_e7_etcut_L1EM3:
3: 20
stepFeatures:
0: 89
- 1: 362
+ 1: 354
2: 117
3: 73
HLT_e7_lhmedium_mu24_L1MU20:
@@ -1961,15 +1961,15 @@ HLT_j45_pf_subjesgscIS_ftf_L1J15:
0: 20
1: 52
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 14
+ eventCount: 11
stepCounts:
0: 19
1: 18
- 2: 14
+ 2: 11
stepFeatures:
0: 19
1: 49
- 2: 25
+ 2: 20
HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 18
stepCounts:
@@ -2003,13 +2003,13 @@ HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
0: 20
1: 44
HLT_j45_subjesgscIS_ftf_015jvt_L1J15:
- eventCount: 17
+ eventCount: 18
stepCounts:
0: 20
- 1: 17
+ 1: 18
stepFeatures:
0: 20
- 1: 42
+ 1: 44
HLT_j45_subjesgscIS_ftf_059jvt_L1J15:
eventCount: 17
stepCounts:
@@ -2025,27 +2025,27 @@ HLT_j45_subjesgscIS_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 48
+ 1: 47
HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 12
+ eventCount: 10
stepCounts:
0: 19
1: 19
- 2: 12
+ 2: 10
stepFeatures:
0: 19
- 1: 47
- 2: 23
+ 1: 46
+ 2: 19
HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
- eventCount: 15
+ eventCount: 14
stepCounts:
0: 19
1: 19
- 2: 15
+ 2: 14
stepFeatures:
0: 19
- 1: 47
- 2: 28
+ 1: 46
+ 2: 24
HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 19
stepCounts:
@@ -2054,8 +2054,8 @@ HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
2: 19
stepFeatures:
0: 19
- 1: 47
- 2: 47
+ 1: 46
+ 2: 46
HLT_j45_subresjesgscIS_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -2259,7 +2259,7 @@ HLT_mu14_L1MU10:
2: 8
3: 8
HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU12IM_3J12:
- eventCount: 3
+ eventCount: 2
stepCounts:
0: 6
1: 5
@@ -2269,7 +2269,7 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU12IM_3J12:
5: 4
6: 4
7: 4
- 8: 3
+ 8: 2
stepFeatures:
0: 16
1: 14
@@ -2277,11 +2277,11 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU12IM_3J12:
3: 14
4: 14
5: 9
- 6: 8
- 7: 8
- 8: 6
+ 6: 9
+ 7: 9
+ 8: 4
HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU20IM:
- eventCount: 3
+ eventCount: 2
stepCounts:
0: 5
1: 5
@@ -2291,7 +2291,7 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU20IM:
5: 4
6: 4
7: 4
- 8: 3
+ 8: 2
stepFeatures:
0: 14
1: 14
@@ -2299,11 +2299,11 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU20IM:
3: 14
4: 14
5: 9
- 6: 8
- 7: 8
- 8: 6
+ 6: 9
+ 7: 9
+ 8: 4
HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 4
1: 3
@@ -2313,8 +2313,7 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35:
5: 3
6: 3
7: 3
- 8: 2
- 9: 1
+ 8: 1
stepFeatures:
0: 15
1: 12
@@ -2322,10 +2321,9 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35:
3: 12
4: 12
5: 10
- 6: 9
- 7: 9
- 8: 6
- 9: 3
+ 6: 10
+ 7: 10
+ 8: 3
HLT_mu20_2mu4noL1_L1MU20:
eventCount: 1
stepCounts:
@@ -2361,8 +2359,8 @@ HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRtt_L1MU20:
3: 20
4: 20
5: 11
- 6: 10
- 7: 10
+ 6: 11
+ 7: 11
8: 6
HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU20:
eventCount: 2
@@ -2567,7 +2565,7 @@ HLT_mu4_l2io_L1MU4:
3: 11
stepFeatures:
0: 14
- 1: 28
+ 1: 29
2: 15
3: 15
HLT_mu50_L1MU20:
@@ -3001,9 +2999,9 @@ HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 15
- 3: 15
- 4: 15
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau25_idperf_tracktwoMVA_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3015,9 +3013,9 @@ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau25_idperf_tracktwo_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3030,10 +3028,10 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
- 5: 14
+ 2: 16
+ 3: 16
+ 4: 16
+ 5: 16
HLT_tau25_looseRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3053,8 +3051,8 @@ HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 13
- 3: 13
+ 2: 14
+ 3: 14
4: 12
HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
eventCount: 9
@@ -3067,9 +3065,9 @@ HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
- 3: 12
- 4: 11
+ 2: 14
+ 3: 14
+ 4: 12
HLT_tau25_looseRNN_tracktwo_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3079,7 +3077,7 @@ HLT_tau25_looseRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
+ 2: 14
HLT_tau25_medium1_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3098,8 +3096,8 @@ HLT_tau25_medium1_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 13
- 3: 13
+ 2: 14
+ 3: 14
HLT_tau25_medium1_tracktwoMVA_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3110,8 +3108,8 @@ HLT_tau25_medium1_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
- 3: 12
+ 2: 14
+ 3: 14
HLT_tau25_medium1_tracktwo_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3121,7 +3119,7 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
+ 2: 14
HLT_tau25_mediumRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3131,32 +3129,32 @@ HLT_tau25_mediumRNN_track_L1TAU12IM:
0: 22
1: 13
HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 8
+ eventCount: 7
stepCounts:
0: 12
1: 10
2: 10
3: 10
- 4: 8
+ 4: 7
stepFeatures:
0: 22
1: 14
- 2: 13
- 3: 13
+ 2: 14
+ 3: 14
4: 9
HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 8
+ eventCount: 7
stepCounts:
0: 12
1: 10
2: 10
3: 10
- 4: 8
+ 4: 7
stepFeatures:
0: 22
1: 14
- 2: 12
- 3: 12
+ 2: 14
+ 3: 14
4: 9
HLT_tau25_mediumRNN_tracktwo_L1TAU12IM:
eventCount: 0
@@ -3167,7 +3165,7 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
+ 2: 14
HLT_tau25_perf_track_L1TAU12IM:
eventCount: 11
stepCounts:
@@ -3193,9 +3191,9 @@ HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 15
- 3: 15
- 4: 15
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3207,9 +3205,9 @@ HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau25_perf_tracktwo_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3222,10 +3220,10 @@ HLT_tau25_perf_tracktwo_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
- 5: 14
+ 2: 16
+ 3: 16
+ 4: 16
+ 5: 16
HLT_tau25_tightRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3245,8 +3243,8 @@ HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 13
- 3: 13
+ 2: 14
+ 3: 14
4: 7
HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
eventCount: 7
@@ -3259,8 +3257,8 @@ HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
- 3: 12
+ 2: 14
+ 3: 14
4: 7
HLT_tau25_tightRNN_tracktwo_L1TAU12IM:
eventCount: 0
@@ -3271,7 +3269,7 @@ HLT_tau25_tightRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 22
1: 14
- 2: 12
+ 2: 14
HLT_tau35_idperf_ptonly_L1TAU12IM:
eventCount: 11
stepCounts:
@@ -3309,9 +3307,9 @@ HLT_tau35_idperf_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 15
- 3: 15
- 4: 15
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau35_idperf_tracktwoMVA_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3323,9 +3321,9 @@ HLT_tau35_idperf_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau35_idperf_tracktwo_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3338,10 +3336,10 @@ HLT_tau35_idperf_tracktwo_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
- 5: 14
+ 2: 16
+ 3: 16
+ 4: 16
+ 5: 16
HLT_tau35_looseRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3361,8 +3359,8 @@ HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 20
1: 13
- 2: 12
- 3: 12
+ 2: 13
+ 3: 13
4: 11
HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM:
eventCount: 8
@@ -3375,9 +3373,9 @@ HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 20
1: 13
- 2: 11
- 3: 11
- 4: 10
+ 2: 13
+ 3: 13
+ 4: 11
HLT_tau35_looseRNN_tracktwo_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3387,7 +3385,7 @@ HLT_tau35_looseRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 19
1: 12
- 2: 10
+ 2: 12
HLT_tau35_mediumRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3397,46 +3395,46 @@ HLT_tau35_mediumRNN_track_L1TAU12IM:
0: 19
1: 11
HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 7
+ eventCount: 6
stepCounts:
0: 11
1: 9
2: 9
3: 9
- 4: 7
+ 4: 6
stepFeatures:
0: 20
1: 13
- 2: 12
- 3: 12
+ 2: 13
+ 3: 13
4: 8
HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 7
+ eventCount: 6
stepCounts:
0: 11
1: 9
2: 9
3: 9
- 4: 7
+ 4: 6
stepFeatures:
0: 20
1: 13
- 2: 11
- 3: 11
+ 2: 13
+ 3: 13
4: 8
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25:
eventCount: 1
stepCounts:
0: 6
1: 3
- 2: 2
- 3: 2
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
0: 15
1: 6
- 2: 4
- 3: 4
+ 2: 6
+ 3: 6
4: 2
HLT_tau35_mediumRNN_tracktwo_L1TAU12IM:
eventCount: 0
@@ -3447,7 +3445,7 @@ HLT_tau35_mediumRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 19
1: 12
- 2: 10
+ 2: 12
HLT_tau35_perf_track_L1TAU12IM:
eventCount: 11
stepCounts:
@@ -3473,9 +3471,9 @@ HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 15
- 3: 15
- 4: 15
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau35_perf_tracktwoMVA_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3487,9 +3485,9 @@ HLT_tau35_perf_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
+ 2: 16
+ 3: 16
+ 4: 16
HLT_tau35_perf_tracktwo_L1TAU12IM:
eventCount: 12
stepCounts:
@@ -3502,10 +3500,10 @@ HLT_tau35_perf_tracktwo_L1TAU12IM:
stepFeatures:
0: 24
1: 16
- 2: 14
- 3: 14
- 4: 14
- 5: 14
+ 2: 16
+ 3: 16
+ 4: 16
+ 5: 16
HLT_tau35_tightRNN_track_L1TAU12IM:
eventCount: 0
stepCounts:
@@ -3525,8 +3523,8 @@ HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM:
stepFeatures:
0: 20
1: 13
- 2: 12
- 3: 12
+ 2: 13
+ 3: 13
4: 6
HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM:
eventCount: 6
@@ -3539,8 +3537,8 @@ HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM:
stepFeatures:
0: 20
1: 13
- 2: 11
- 3: 11
+ 2: 13
+ 3: 13
4: 6
HLT_tau35_tightRNN_tracktwo_L1TAU12IM:
eventCount: 0
@@ -3551,7 +3549,7 @@ HLT_tau35_tightRNN_tracktwo_L1TAU12IM:
stepFeatures:
0: 19
1: 12
- 2: 10
+ 2: 12
HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
@@ -3575,15 +3573,15 @@ HLT_tilecalib_laser_TilePEB_L1CALREQ2:
HLT_timeburner_L1All:
eventCount: 0
HLT_unconvtrk120_isohpttrack_iaggrmedium_L1XE50:
- eventCount: 3
+ eventCount: 2
stepCounts:
- 0: 3
+ 0: 2
stepFeatures:
- 0: 3
+ 0: 2
HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 6
+ 0: 7
stepFeatures:
0: 10
HLT_xe100_cvfpufit_L1XE50:
@@ -3617,13 +3615,13 @@ HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
0: 10
1: 5
HLT_xe100_pfopufit_L1XE50:
- eventCount: 4
+ eventCount: 5
stepCounts:
0: 10
- 1: 4
+ 1: 5
stepFeatures:
0: 10
- 1: 4
+ 1: 5
HLT_xe100_pfsum_L1XE50:
eventCount: 6
stepCounts:
@@ -3803,23 +3801,23 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrloose_L1XE50:
stepFeatures:
0: 6
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrmedium_L1XE50:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 1
stepFeatures:
- 0: 4
+ 0: 2
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 5
+ 0: 6
stepFeatures:
- 0: 14
+ 0: 15
HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 6
+ 0: 7
stepFeatures:
- 0: 19
+ 0: 20
HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50:
eventCount: 4
stepCounts: