diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index c373d9cb417b7b5e1830dc3e3353b84739366971..aa6bd085a93acfe10e264ff56cd7009f0dddeb08 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -186,7 +186,6 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
DefaultTemperature=-7.0
)
# Cabling parameters
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
if flags.Input.isMC or flags.Overlay.DataOverlay:
# ITk:
@@ -215,10 +214,8 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
elif not flags.Input.isMC:
if runNum < 222222:
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
else:
- useCablingConditions = True
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
@@ -232,7 +229,6 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
CondArgs.update(
- UseCablingConditions=useCablingConditions,
CablingMapToFile=False,
CablingMapFileName=IdMappingDat
)
@@ -279,62 +275,13 @@ def PixelCablingCondAlgCfg(flags, name="PixelCablingCondAlg", **kwargs):
if not flags.Input.isMC and not flags.Overlay.DataOverlay:
acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList"))
kwargs.setdefault("ReadKey", "/PIXEL/CablingMap")
+ if flags.Input.RunNumber[0]<222222:
+ kwargs.setdefault("ReadKey", "")
else:
kwargs.setdefault("ReadKey", "")
-
- # Cabling parameters
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
- if flags.Input.isMC or flags.Overlay.DataOverlay:
- # ITk:
- if flags.GeoModel.Run == "RUN4":
- IdMappingDat = "ITk_Atlas_IdMapping.dat"
- if flags.GeoModel.Type == "BrlIncl4.0_ref":
- IdMappingDat = "ITk_Atlas_IdMapping_InclBrl4.dat"
- elif flags.GeoModel.Type == "IBrlExt4.0ref":
- IdMappingDat = "ITk_Atlas_IdMapping_IExtBrl4.dat"
- elif flags.GeoModel.Type == "BrlExt4.0_ref":
- IdMappingDat = "ITk_Atlas_IdMapping_ExtBrl4.dat"
- elif flags.GeoModel.Type == "BrlExt3.2_ref":
- IdMappingDat = "ITk_Atlas_IdMapping_ExtBrl32.dat"
- elif flags.GeoModel.Run == "RUN2" or flags.GeoModel.Run == "RUN3":
- # Planar IBL
- if flags.GeoModel.IBLLayout == "planar":
- if flags.GeoModel.Run == "RUN2":
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_inclIBL_DBM.dat"
- else:
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_inclIBL.dat"
- # Hybrid IBL plus DBM
- elif flags.GeoModel.IBLLayout == "3D":
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
- else:
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping.dat"
-
- elif not flags.Input.isMC:
- runNum = flags.Input.RunNumber[0]
- if runNum < 222222:
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- rodIDForSingleLink40=1300000
- else:
- rodIDForSingleLink40=1300000
- # Even though we are reading from COOL, set the correct fallback map.
- if (runNum >= 344494):
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- elif (runNum >= 314940 and runNum < 344494):
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_314940.dat"
- elif (runNum >= 289350 and runNum < 314940): # 2016
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- elif (runNum >= 222222 and runNum < 289350): # 2015
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
- else:
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
-
- kwargs.setdefault("RodIDForSingleLink40", rodIDForSingleLink40)
- kwargs.setdefault("MappingFile", IdMappingDat)
kwargs.setdefault("PixelModuleData", "PixelModuleData")
kwargs.setdefault("PixelReadoutSpeedData", "PixelReadoutSpeedData")
kwargs.setdefault("WriteKey", "PixelCablingCondData")
- kwargs.setdefault("RecordInInitialize", not flags.Detector.OverlayPixel)
acc.addCondAlgo(CompFactory.PixelCablingCondAlg(name, **kwargs))
return acc
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
index 26aa988b7a064274e96dccc40d769b2078603e7e..4f84e8f5d2e6112e9d073d467c5d39b26c5ce2d2 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
@@ -29,101 +29,13 @@ StatusCode PixelCablingCondAlg::initialize() {
ATH_CHECK(m_condSvc.retrieve());
ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_readoutspeedKey.initialize());
- ATH_CHECK(m_readKey.initialize(!m_readKey.empty()));
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
return StatusCode::FAILURE;
}
-
- if (!m_recordInInitialize.value()) {
- ATH_MSG_WARNING("Special treatment disabled.");
- return StatusCode::SUCCESS;
- }
-
- ATH_MSG_WARNING("Special treatment: Once RegionSelectorTable is fixed, these lines should be removed.");
-
- SG::WriteCondHandle<PixelCablingCondData> writeHandle(m_writeKey);
- if (writeHandle.isValid()) {
- ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid.. In theory this should not be called, but may happen if multiple concurrent events are being processed out of order.");
- return StatusCode::SUCCESS;
- }
- std::unique_ptr<PixelCablingCondData> writeCdo(std::make_unique<PixelCablingCondData>());
- const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM;
- const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT;
-
- /// FIXME: this is a hack to get the code to work - the comfiguration should be
- /// such that the cabling is now only configured with a proper IoV and not
- /// in the initialise method
- EventIDRange rangeW (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0),
- EventIDBase (9999999, UNDEFEVT, UNDEFNUM, 0, 0));
-
- // Signed values
- int barrel_ec, eta_module;
-
- // Unsigned 32 bit values
- uint32_t layer_disk, phi_module;
- uint32_t robid, rodid;
- uint32_t sl_40_fmt, sl_40_link, sl_80_fmt, sl_80_link;
-
- // Unsigned 64-bit values
- uint64_t onlineId = 0;
- uint64_t linknumber = 0;
-
- // Strings
- std::string DCSname;
- std::string line;
-
- std::string filename = PathResolverFindCalibFile(m_final_mapping_file);
- if (filename.size()==0) {
- ATH_MSG_FATAL("Mapping File: " << m_final_mapping_file << " not found!");
- return StatusCode::FAILURE;
- }
- std::ifstream fin(filename.c_str());
- if (!fin) { return StatusCode::FAILURE; }
- std::stringstream instr;
- instr << fin.rdbuf();
-
- while (instr.good() && getline(instr, line)) {
- if (line.size()==0) { continue; }
- if (line.substr(0,1)==" " || line.substr(0,1)=="#") { continue; }
- if (line.length()<21) { continue; }
- if (line.substr(line.length()-3,line.length())=="GMT") { continue; }
- std::istringstream parse(line);
- parse >> barrel_ec >> layer_disk >> phi_module >> eta_module >> std::hex >> robid >> rodid >> sl_40_fmt >> sl_40_link >> sl_80_fmt >> sl_80_link >> DCSname;
- Identifier offlineId = m_pixelID->wafer_id(barrel_ec,layer_disk,phi_module,eta_module);
- if ((robid & 0xFFFFFF)>=0x140000) {
- linknumber = sl_40_link | (sl_40_fmt<<4) | (sl_80_link<<8) | (sl_80_fmt<<12);
- }
- else {
- // Valid for data
- bool readoutSpeed = true;
- if (rodid>m_rodidForSingleLink40) { readoutSpeed=false; }
- if (readoutSpeed==false) { linknumber=(sl_40_link & 0xF) | ((sl_40_fmt & 0xF)<<4); }
- else { linknumber=(sl_80_link & 0xF) | ((sl_80_fmt & 0xF)<<4); }
- }
- onlineId = (robid & 0xFFFFFF) | (linknumber<<24);
- IdentifierHash hashId;
- IdContext cntxpixel = m_pixelID->wafer_context();
- if (m_pixelID->get_hash(offlineId, hashId, &cntxpixel)) {
- ATH_MSG_WARNING("Could not get hash from offlineId");
- }
- writeCdo->add_entry_onoff(onlineId, offlineId);
- writeCdo->add_entry_offon(offlineId, onlineId);
- writeCdo->add_entry_offlineList(robid,offlineId);
- writeCdo->add_entry_offrob(offlineId, robid);
- writeCdo->add_entry_rodrob(rodid, robid);
- writeCdo->add_entry_robrod(robid, rodid);
- writeCdo->add_entry_DCSoffline(DCSname, offlineId);
- }
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
- ATH_MSG_FATAL("Could not record PixelCablingCondData " << writeHandle.key() << " with EventRange " << rangeW << " into Conditions Store");
- return StatusCode::FAILURE;
- }
- ATH_MSG_WARNING("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
- ATH_MSG_WARNING("Tempolary fix!!: Refilled pixel cabling from file \"" << m_final_mapping_file << "\"");
-
return StatusCode::SUCCESS;
}
@@ -132,10 +44,10 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
SG::WriteCondHandle<PixelCablingCondData> writeHandle(m_writeKey, ctx);
ATH_MSG_DEBUG("Conditions updates every event!!! This should be avoided once RegionSelectorTable is fixed!!");
-// if (writeHandle.isValid()) {
-// ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid.. In theory this should not be called, but may happen if multiple concurrent events are being processed out of order.");
-// return StatusCode::SUCCESS;
-// }
+ if (writeHandle.isValid()) {
+ ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid.. In theory this should not be called, but may happen if multiple concurrent events are being processed out of order.");
+ return StatusCode::SUCCESS;
+ }
// Construct the output Cond Object and fill it in
std::unique_ptr<PixelCablingCondData> writeCdo(std::make_unique<PixelCablingCondData>());
@@ -165,7 +77,7 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
if (moduleData->getCablingMapToFile()) { output_mapping_file_interpreted.open("pixel_cabling_map_interpreted.txt"); }
std::stringstream instr;
- if (moduleData->getUseCablingConditions()) {
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<AthenaAttributeList> readHandle(m_readKey, ctx);
const AthenaAttributeList* readCdo = *readHandle;
if (readCdo==nullptr) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
index 577137b2e779ec98cf24ac6f4bc4d7e2559464ae..564f2f05d638efe0d369f008082d810a0945af3c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsAlgorithms/PixelCablingCondAlg.h
@@ -43,16 +43,6 @@ class PixelCablingCondAlg : public AthReentrantAlgorithm {
const PixelID* m_pixelID{nullptr};
ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
- Gaudi::Property<bool> m_recordInInitialize
- {this, "RecordInInitialize", true, "(Temporary) write the cond object in initialize"};
-
- // Keep this untile SegionSelectorTable is fixed.
- Gaudi::Property<uint32_t> m_rodidForSingleLink40
- {this, "RodIDForSingleLink40", 0, "(Temporary) const link speed"};
-
- Gaudi::Property<std::string> m_final_mapping_file
- {this, "MappingFile", "PixelCabling/Pixels_Atlas_IdMapping_2016.dat", "Read cabling map from file"};
-
SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
{this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
index 8a098f76b9964b05c0258f2ab7b91a61d630967a..2c001d00ad9a7376649cedc972df37c72a07b2f7 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
@@ -108,9 +108,6 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
}
}
- // Switch parameters
- writeCdo -> setUseCablingConditions(m_useCablingConditions);
-
// Digitization parameters
writeCdo -> setBunchSpace(m_bunchSpace);
writeCdo -> setUseComTime(m_UseComTime);
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 5852fd614ed7d53074e83f970a90e938309337f9..70561869d2a2bc4d0534a31218ca0ec04ade47f5 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -36,10 +36,6 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
SG::WriteCondHandleKey<PixelModuleData> m_writeKey
{this, "WriteKey", "PixelModuleData", "Output key of pixel module data"};
- // Switch parameters
- Gaudi::Property<bool> m_useCablingConditions
- {this, "UseCablingConditions", true, "Use cabling map conditions DB"};
-
// Digitization parameters
Gaudi::Property<double> m_bunchSpace
{this, "BunchSpace", 25.0, "Bunch space [ns]"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
index 677b4c1d46a1ba607837eeef868b6e670f1e3c45..1e5f99896750fa5894f8f3aadea95e03eb676348 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
@@ -27,10 +27,6 @@ class PixelModuleData {
void setChipStatus(const int chanNum, const int value);
int getChipStatus(const int chanNum) const;
- // Switch parameters
- void setUseCablingConditions(bool UseCablingConditions);
- bool getUseCablingConditions() const;
-
// Digitization parameters
void setBunchSpace(double bunchSpace);
double getBunchSpace() const;
@@ -192,8 +188,6 @@ class PixelModuleData {
typedef std::map<int, std::vector<float>> chipCharge;
- bool m_useCablingConditions;
-
double m_bunchSpace;
bool m_UseComTime;
double m_ComTime;
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
index 0c605f097e8f3bd4712aad5598a06d836dbba593..8f9ba34259b0b98c2bc7b4d7b3688c8f667579d8 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
@@ -34,10 +34,6 @@ int PixelModuleData::getChipStatus(const int chanNum) const {
return 0;
}
-// Switch parameters
-void PixelModuleData::setUseCablingConditions(bool UseCablingConditions) { m_useCablingConditions = UseCablingConditions; }
-bool PixelModuleData::getUseCablingConditions() const { return m_useCablingConditions; }
-
// Digitization parameters
void PixelModuleData::setBunchSpace(double bunchSpace) { m_bunchSpace = bunchSpace; }
double PixelModuleData::getBunchSpace() const { return m_bunchSpace; }
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index 9b983ac600737eab76202e62dbbf3427247b1e77..5a31f5d9d9b40acba815feec38330249d65fd19e 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -33,7 +33,7 @@ StatusCode PixelConditionsSummaryTool::initialize(){
ATH_CHECK(m_condTDAQKey.initialize( !m_condTDAQKey.empty() ));
ATH_CHECK(m_condDeadMapKey.initialize());
ATH_CHECK(m_pixelCabling.retrieve());
-
+
for (unsigned int istate=0; istate<m_isActiveStates.size(); istate++) {
if (m_isActiveStates[istate]=="READY") { m_activeState.push_back(PixelDCSStateData::DCSModuleState::READY); }
else if (m_isActiveStates[istate]=="ON") { m_activeState.push_back(PixelDCSStateData::DCSModuleState::ON); }
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
index 8aa5670788033feacd0401edf2cebb4c838aa6c5..38c174d351e302774c9d0605f4223e3af1e4289c 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
@@ -47,7 +47,6 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
# ITk:
if geoFlags.isSLHC():
IdMappingDat = "ITk_Atlas_IdMapping.dat"
@@ -74,7 +73,6 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
ReadDeadMapKey = "",
- UseCablingConditions=False,
CablingMapFileName=IdMappingDat)
if useNewDeadmapFormat:
@@ -130,9 +128,7 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
- MappingFile=IdMappingDat,
- RodIDForSingleLink40=rodIDForSingleLink40)
+ condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg", ReadKey="")
if not conddb.folderRequested('/PIXEL/PixdEdx'):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixdEdx", className="AthenaAttributeList")
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 2b2b09cba25790105523aef717991252cd3183eb..d5cf18f794d0e7bcd54c4ca1934a7429693889f4 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -97,19 +97,31 @@ def EndcapRD53SimTool(name="EndcapRD53SimTool", **kwargs):
def BarrelFEI4SimTool(name="BarrelFEI4SimTool", **kwargs):
kwargs.setdefault("BarrelEC", 0)
kwargs.setdefault("DoNoise", digitizationFlags.doInDetNoise.get_Value())
+ from PixelConditionsTools.PixelConditionsToolsConf import PixelConditionsSummaryTool
+ pixelConditionsSummaryToolSetup = PixelConditionsSummaryTool("PixelConditionsSummaryTool", UseByteStream=False)
+ kwargs.setdefault("PixelConditionsSummaryTool", pixelConditionsSummaryToolSetup)
return CfgMgr.FEI4SimTool(name, **kwargs)
def DBMFEI4SimTool(name="DBMFEI4SimTool", **kwargs):
kwargs.setdefault("BarrelEC", 4)
kwargs.setdefault("DoNoise", digitizationFlags.doInDetNoise.get_Value())
+ from PixelConditionsTools.PixelConditionsToolsConf import PixelConditionsSummaryTool
+ pixelConditionsSummaryToolSetup = PixelConditionsSummaryTool("PixelConditionsSummaryTool", UseByteStream=False)
+ kwargs.setdefault("PixelConditionsSummaryTool", pixelConditionsSummaryToolSetup)
return CfgMgr.FEI4SimTool(name, **kwargs)
def BarrelFEI3SimTool(name="BarrelFEI3SimTool", **kwargs):
kwargs.setdefault("BarrelEC", 0)
+ from PixelConditionsTools.PixelConditionsToolsConf import PixelConditionsSummaryTool
+ pixelConditionsSummaryToolSetup = PixelConditionsSummaryTool("PixelConditionsSummaryTool", UseByteStream=False)
+ kwargs.setdefault("PixelConditionsSummaryTool", pixelConditionsSummaryToolSetup)
return CfgMgr.FEI3SimTool(name, **kwargs)
def EndcapFEI3SimTool(name="EndcapFEI3SimTool", **kwargs):
kwargs.setdefault("BarrelEC", 2)
+ from PixelConditionsTools.PixelConditionsToolsConf import PixelConditionsSummaryTool
+ pixelConditionsSummaryToolSetup = PixelConditionsSummaryTool("PixelConditionsSummaryTool", UseByteStream=False)
+ kwargs.setdefault("PixelConditionsSummaryTool", pixelConditionsSummaryToolSetup)
return CfgMgr.FEI3SimTool(name, **kwargs)
def IdMapping():
@@ -161,7 +173,6 @@ def PixelConfigCondAlg_MC():
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
alg = PixelConfigCondAlg(name="PixelConfigCondAlg")
- alg.UseCablingConditions=False
from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Beam.beamType == "cosmics" :
@@ -326,6 +337,9 @@ def PixelConfigCondAlg_MC():
alg.CablingMapFileName=IdMapping()
+ if useNewDeadmapFormat:
+ alg.ReadDeadMapKey = ''
+
return alg
def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
@@ -340,6 +354,7 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
if not hasattr(condSeq, 'PixelConfigCondAlg'):
condSeq += PixelConfigCondAlg_MC()
+
useNewDeadmapFormat = False
useNewChargeFormat = False
@@ -417,11 +432,7 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
- ReadKey = pixelReadKey,
- MappingFile=IdMapping(),
- RodIDForSingleLink40=0,
- RecordInInitialize=not globalflags.isOverlay())
+ condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg", ReadKey = pixelReadKey)
if not conddb.folderRequested("/PIXEL/PixReco"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixReco", className="DetCondCFloat")
@@ -568,5 +579,4 @@ def PixelOverlayDigitization(name="PixelOverlayDigitization",**kwargs):
kwargs.setdefault('Cardinality', concurrencyProps.ConcurrencyFlags.NumThreads())
# Set common overlay extra inputs
kwargs.setdefault("ExtraInputs", [("McEventCollection", "TruthEvent")])
-
return CfgMgr.PixelDigitization(name,**kwargs)
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index bb9daa4ff5bf9f4786a53e5400212902e73b7c31..71563d2317a37231cf2d884d8c61a58b05437ed8 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -160,7 +160,6 @@ def EndcapFEI3SimToolCfg(flags, name="EndcapFEI3SimTool", **kwargs):
def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationBasicTool", **kwargs):
"""Return ComponentAccumulator with configured PixelDigitizationTool"""
acc = PixelGeometryCfg(flags)
-
# module parameters
acc.merge(PixelConfigCondAlgCfg(flags))
# charge calibration
@@ -324,7 +323,6 @@ def PixelOverlayDigitizationBasicCfg(flags, **kwargs):
# Set common overlay extra inputs
kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs)
-
PixelDigitization = CompFactory.PixelDigitization
acc.addEventAlgo(PixelDigitization(name="PixelOverlayDigitization", **kwargs))
return acc
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
index 1bd41c8feb4e1a19fbb367561c2e2eab2ab6a38e..2d4a1366434582d2c78bd060e06bc1ed0b0e5278 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
@@ -13,6 +13,111 @@ from AthenaCommon.DetFlags import DetFlags
# --- Pixel cabling
#
if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
+ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
+ 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
+
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
+ if (globalflags.DataSource()=='geant4'):
+ from PixelDigitization.PixelDigitizationConfig import PixelConfigCondAlg_MC, IdMapping
+ condSeq += PixelConfigCondAlg_MC()
+ IdMappingDat=IdMapping()
+
+ elif (globalflags.DataSource=='data'):
+ from RecExConfig.AutoConfiguration import GetRunNumber
+ runNum = GetRunNumber()
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ if (runNum<222222):
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
+ else:
+ # Even though we are reading from COOL, set the correct fallback map.
+ if (runNum >= 344494):
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ elif (runNum >= 314940 and runNum < 344494):
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_314940.dat"
+ elif (runNum >= 289350 and runNum < 314940): # 2016
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
+ elif (runNum >= 222222 and runNum < 289350): # 2015
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
+ else:
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+
+ # Data overlay: hard-scatter MC digitization + pileup data configuration
+ if (globalflags.isOverlay()):
+ from PixelDigitization.PixelDigitizationConfig import PixelConfigCondAlg_MC, IdMapping
+ alg = PixelConfigCondAlg_MC()
+ alg.CablingMapFileName=IdMappingDat
+ else:
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
+ CablingMapFileName=IdMappingDat)
+
+ if jobproperties.Beam.beamType() == 'cosmics':
+ alg.BarrelTimeJitter=[25.0,25.0,25.0,25.0]
+ alg.EndcapTimeJitter=[25.0,25.0,25.0]
+ alg.DBMTimeJitter=[25.0,25.0,25.0]
+ alg.BarrelNumberOfBCID=[8,8,8,8]
+ alg.EndcapNumberOfBCID=[8,8,8]
+ alg.DBMNumberOfBCID=[8,8,8]
+ alg.BarrelTimeOffset=[100.0,100.0,100.0,100.0]
+ 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
+
+ #####################
+ # Cabling map Setup #
+ #####################
+ if (conddb.dbdata=="CONDBR2" or (conddb.dbmc=="OFLP200" and geoFlags.isIBL()==True)) and not conddb.folderRequested("/PIXEL/HitDiscCnfg"):
+ conddb.addFolderSplitMC("PIXEL","/PIXEL/HitDiscCnfg","/PIXEL/HitDiscCnfg", className="AthenaAttributeList")
+
+ if not hasattr(condSeq, 'PixelHitDiscCnfgAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
+ condSeq += PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg")
+
+ if not conddb.folderRequested("/PIXEL/ReadoutSpeed"):
+ if not (globalflags.DataSource() == 'geant4'):
+ conddb.addFolder("PIXEL", "/PIXEL/ReadoutSpeed", className="AthenaAttributeList")
+ else:
+ conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed", className="AthenaAttributeList")
+
+ if not hasattr(condSeq, 'PixelReadoutSpeedAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelReadoutSpeedAlg
+ condSeq += PixelReadoutSpeedAlg(name="PixelReadoutSpeedAlg")
+
+ if (globalflags.DataSource=='data' and conddb.dbdata == 'CONDBR2'):
+ if not conddb.folderRequested("/PIXEL/CablingMap"):
+ conddb.addFolderSplitOnline("PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList")
+
+ if not hasattr(condSeq, 'PixelCablingCondAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
+ alg = PixelCablingCondAlg(name="PixelCablingCondAlg")
+ if (not conddb.folderRequested("/PIXEL/CablingMap") and not conddb.folderRequested("/PIXEL/Onl/CablingMap")):
+ alg.ReadKey = ''
+ if (globalflags.DataSource()=='geant4'):
+ alg.ReadKey = ''
+ if (globalflags.DataSource=='data'):
+ from RecExConfig.AutoConfiguration import GetRunNumber
+ runNum = GetRunNumber()
+ if (runNum<222222):
+ alg.ReadKey = ''
+ # data-overlay does not need DB for cabling.
+ if (globalflags.isOverlay()):
+ alg.ReadKey = ''
+
+ condSeq += alg
+
from PixelCabling.PixelCablingConf import PixelCablingSvc
PixelCablingSvc = PixelCablingSvc()
ServiceMgr += PixelCablingSvc
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 5ddaf73a445376482cee256f995d69efe750b40e..920897831edef35fe01205b63e3efd5094e6dcaa 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -55,26 +55,17 @@ if DetFlags.pixel_on():
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- useCablingConditions = False
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
if (globalflags.DataSource()=='geant4'):
from PixelDigitization.PixelDigitizationConfig import PixelConfigCondAlg_MC, IdMapping
condSeq += PixelConfigCondAlg_MC()
- IdMappingDat=IdMapping()
-
+
elif (globalflags.DataSource=='data'):
from RecExConfig.AutoConfiguration import GetRunNumber
runNum = GetRunNumber()
- if (runNum is None):
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- elif (runNum<222222):
- useCablingConditions = False
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ if (runNum<222222):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- rodIDForSingleLink40=1300000
else:
- useCablingConditions = True
- rodIDForSingleLink40=1300000
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
@@ -88,8 +79,7 @@ if DetFlags.pixel_on():
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ CablingMapFileName=IdMappingDat)
if jobproperties.Beam.beamType() == 'cosmics':
alg.BarrelTimeJitter=[25.0,25.0,25.0,25.0]
alg.EndcapTimeJitter=[25.0,25.0,25.0]
@@ -102,7 +92,9 @@ if DetFlags.pixel_on():
alg.DBMTimeOffset=[100.0,100.0,100.0]
if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ""
+ alg.ReadDeadMapKey = ''
+ if useNewDeadmapFormat:
+ alg.ReadDeadMapKey = ''
condSeq += alg
if useNewDeadmapFormat:
@@ -151,40 +143,6 @@ if DetFlags.pixel_on():
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeLUTCalibCondAlg
condSeq += PixelChargeLUTCalibCondAlg(name="PixelChargeLUTCalibCondAlg", ReadKey="/PIXEL/ChargeCalibration")
- #####################
- # Cabling map Setup #
- #####################
- if (conddb.dbdata=="CONDBR2" or (conddb.dbmc=="OFLP200" and geoFlags.isIBL()==True)) and not conddb.folderRequested("/PIXEL/HitDiscCnfg"):
- conddb.addFolderSplitMC("PIXEL","/PIXEL/HitDiscCnfg","/PIXEL/HitDiscCnfg", className="AthenaAttributeList")
-
- if not hasattr(condSeq, 'PixelHitDiscCnfgAlg'):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
- condSeq += PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg")
-
- if not conddb.folderRequested("/PIXEL/ReadoutSpeed"):
- if not (globalflags.DataSource() == 'geant4'):
- conddb.addFolder("PIXEL", "/PIXEL/ReadoutSpeed", className="AthenaAttributeList")
- else:
- conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed", className="AthenaAttributeList")
-
- if not hasattr(condSeq, 'PixelReadoutSpeedAlg'):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelReadoutSpeedAlg
- condSeq += PixelReadoutSpeedAlg(name="PixelReadoutSpeedAlg")
-
- if (globalflags.DataSource=='data' and conddb.dbdata == 'CONDBR2'):
- if not conddb.folderRequested("/PIXEL/CablingMap"):
- conddb.addFolderSplitOnline("PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList")
-
- if not hasattr(condSeq, 'PixelCablingCondAlg'):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- alg = PixelCablingCondAlg(name="PixelCablingCondAlg",
- MappingFile=IdMappingDat,
- RodIDForSingleLink40=rodIDForSingleLink40)
- if (not conddb.folderRequested("/PIXEL/CablingMap") and
- not conddb.folderRequested("/PIXEL/Onl/CablingMap")):
- alg.ReadKey = ''
- condSeq += alg
-
if not athenaCommonFlags.isOnline():
if not conddb.folderRequested('/PIXEL/PixdEdx'):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixdEdx", className="AthenaAttributeList")
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index b6b92a9c868b8d298a33da7a7cbac67bc994624c..22ac03f304ceb29dd1a3a038c6651db46326ac5d 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -76,9 +76,7 @@ class PixelConditionsServicesSetup:
if not hasattr(condSeq, 'PixelConfigCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
if (globalflags.DataSource()=='geant4'):
# ITk:
if geoFlags.isSLHC():
@@ -108,12 +106,8 @@ class PixelConditionsServicesSetup:
from RecExConfig.AutoConfiguration import GetRunNumber
runNum = GetRunNumber()
if (runNum<222222):
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- rodIDForSingleLink40=1300000
else:
- useCablingConditions = True
- rodIDForSingleLink40=1300000
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
@@ -127,7 +121,6 @@ class PixelConditionsServicesSetup:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseCablingConditions=useCablingConditions,
CablingMapFileName=IdMappingDat)
if not self.usePixMap:
alg.ReadDeadMapKey = ""
@@ -258,9 +251,7 @@ class PixelConditionsServicesSetup:
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
- MappingFile=IdMappingDat,
- RodIDForSingleLink40=rodIDForSingleLink40)
+ condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg")
#############################
# Offline calibration Setup #
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index a9db2d8b2b2a64b387ebfae222d688e7a63be924..c01360735dccb7bb87b95537df23fc41930b6d8b 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -197,9 +197,7 @@ if doPixel:
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
if (globalflags.DataSource()=='geant4'):
# ITk:
if geoFlags.isSLHC():
@@ -229,12 +227,8 @@ if doPixel:
from RecExConfig.AutoConfiguration import GetRunNumber
runNum = GetRunNumber()
if (runNum<222222):
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- rodIDForSingleLink40=1300000
else:
- useCablingConditions = True
- rodIDForSingleLink40=1300000
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
@@ -245,13 +239,13 @@ if doPixel:
elif (runNum >= 222222 and runNum < 289350): # 2015
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
else:
- IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg", CablingMapFileName=IdMappingDat)
if athenaCommonFlags.isOnline():
alg.ReadDeadMapKey = ''
+ if useNewDeadmapFormat:
+ alg.ReadDeadMapKey = ''
condSeq += alg
if useNewDeadmapFormat:
@@ -320,9 +314,17 @@ if doPixel:
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
- MappingFile=IdMappingDat,
- RodIDForSingleLink40=rodIDForSingleLink40)
+ alg = PixelCablingCondAlg(name="PixelCablingCondAlg")
+ if (not conddb.folderRequested("/PIXEL/CablingMap") and not conddb.folderRequested("/PIXEL/Onl/CablingMap")):
+ alg.ReadKey = ''
+ if (globalflags.DataSource()=='geant4'):
+ alg.ReadKey = ''
+ if (globalflags.DataSource=='data'):
+ from RecExConfig.AutoConfiguration import GetRunNumber
+ runNum = GetRunNumber()
+ if (runNum<222222):
+ alg.ReadKey = ''
+ condSeq += alg
if not athenaCommonFlags.isOnline():
if not conddb.folderRequested('/PIXEL/PixdEdx'):
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index c302596a57458dff2e682c4a16f9866231302af9..6c27312341ca5e8544b59717508732f685bdcb03 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -184,9 +184,7 @@ if doPixel:
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- rodIDForSingleLink40=0
if (globalflags.DataSource()=='geant4'):
# ITk:
if geoFlags.isSLHC():
@@ -216,12 +214,8 @@ if doPixel:
from RecExConfig.AutoConfiguration import GetRunNumber
runNum = GetRunNumber()
if (runNum<222222):
- useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- rodIDForSingleLink40=1300000
else:
- useCablingConditions = True
- rodIDForSingleLink40=1300000
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
@@ -234,11 +228,11 @@ if doPixel:
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg", CablingMapFileName=IdMappingDat)
if athenaCommonFlags.isOnline():
- alg.ReadDeadMapKey = ""
+ alg.ReadDeadMapKey = ''
+ if useNewDeadmapFormat:
+ alg.ReadDeadMapKey = ''
condSeq += alg
if useNewDeadmapFormat:
@@ -307,10 +301,17 @@ if doPixel:
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
- ReadKey='',
- MappingFile=IdMappingDat,
- RodIDForSingleLink40=rodIDForSingleLink40)
+ alg = PixelCablingCondAlg(name="PixelCablingCondAlg")
+ if (not conddb.folderRequested("/PIXEL/CablingMap") and not conddb.folderRequested("/PIXEL/Onl/CablingMap")):
+ alg.ReadKey = ''
+ if (globalflags.DataSource()=='geant4'):
+ alg.ReadKey = ''
+ if (globalflags.DataSource=='data'):
+ from RecExConfig.AutoConfiguration import GetRunNumber
+ runNum = GetRunNumber()
+ if (runNum<222222):
+ alg.ReadKey = ''
+ condSeq += alg
if not athenaCommonFlags.isOnline():
if not conddb.folderRequested('/PIXEL/PixdEdx'):
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 786863b43a86cfb27e575155fb470ccc9d4ac0e1..7372331fbc6714cd706e3c0dbcf7142da466e151 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -34,7 +34,7 @@ ciRefFileMap = {
'overlay-d1592-22.0' : 'v1',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
- 'dataoverlay-d1590-22.0' : 'v3',
+ 'dataoverlay-d1590-22.0' : 'v4',
'dataoverlay-hits-22.0' : 'v1',
}