From 2085e9168c92964fe4e84eea75917acb983470f1 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Tue, 29 Sep 2020 07:04:53 +0200 Subject: [PATCH 01/20] fix commit issue --- .../src/PixelConfigCondAlg.cxx | 4 +++- .../src/PixelDeadMapCondAlg.cxx | 4 ++-- .../src/PixelConditionsSummaryTool.cxx | 15 ++++++++++----- .../src/PixelConditionsSummaryTool.h | 13 +++++++------ .../python/PixelDigitizationConfig.py | 2 +- .../share/InDetRecConditionsAccess.py | 2 +- .../python/InDetTrigConfigConditions.py | 2 +- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx index b6fbbaa61fb..0f6e6db121c 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx @@ -30,7 +30,7 @@ StatusCode PixelConfigCondAlg::initialize() { ATH_CHECK(m_condSvc.retrieve()); - if (m_useDeadmapConditions) { ATH_CHECK(m_readDeadMapKey.initialize()); } +// if (m_useDeadmapConditions) { ATH_CHECK(m_readDeadMapKey.initialize()); } ATH_CHECK(m_writeKey.initialize()); if (m_condSvc->regHandle(this,m_writeKey).isFailure()) { @@ -62,6 +62,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const { // Set dead map //============== EventIDRange rangeDeadMap{start, stop}; +/* if (m_useDeadmapConditions) { SG::ReadCondHandle readHandle(m_readDeadMapKey, ctx); const CondAttrListCollection* readCdo = *readHandle; @@ -109,6 +110,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const { } } } +*/ // Switch parameters writeCdo -> setUseCalibConditions(m_useCalibConditions); diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx index 4421fc4c34b..de51200e41e 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx @@ -90,8 +90,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/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx index 987cbe69384..65370b49a5e 100644 --- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx @@ -182,7 +182,8 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } - if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } + if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } +// if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } return true; } @@ -200,7 +201,8 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } - if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } + if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } +// if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } return checkChipStatus(moduleHash, elementId); } @@ -250,7 +252,8 @@ bool PixelConditionsSummaryTool::isGood(const Identifier& elementId, const InDet if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } - if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } + if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } +// if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } if (h==InDetConditions::PIXEL_CHIP) { if (!checkChipStatus(moduleHash, elementId)) { return false; } @@ -280,7 +283,8 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash& moduleHash, const if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } - if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } + if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } +// if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } return true; } @@ -305,7 +309,8 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash & moduleHash, const if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } - if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } + if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } +// if (SG::ReadCondHandle(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 cd02679876e..7efa789fd8e 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,11 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool SG::ReadCondHandleKey m_condTDAQKey {this, "PixelTDAQCondData", "", "Pixel TDAQ conditions key"}; //Default empty - legacy option - SG::ReadCondHandleKey m_condDeadMapKey - {this, "PixelModuleData", "PixelModuleData", "Pixel deadmap conditions key"}; +// SG::ReadCondHandleKey m_condDeadMapKey +// {this, "PixelModuleData", "PixelModuleData", "Pixel deadmap conditions key"}; -// NEW FOR RUN3 SG::ReadCondHandleKey m_condDeadMapKey -// NEW FOR RUN3 {this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"}; + SG::ReadCondHandleKey m_condDeadMapKey + {this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"}; ServiceHandle m_pixelCabling {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"}; @@ -140,7 +140,8 @@ inline InterfaceID& PixelConditionsSummaryTool::interfaceID(){ } inline bool PixelConditionsSummaryTool::checkChipStatus(IdentifierHash moduleHash, Identifier pixid, const EventContext& ctx) const { - std::bitset<16> chipStatus(SG::ReadCondHandle(m_condDeadMapKey, ctx)->getChipStatus(moduleHash)); + std::bitset<16> chipStatus(SG::ReadCondHandle(m_condDeadMapKey, ctx)->getChipStatus(moduleHash)); +// std::bitset<16> chipStatus(SG::ReadCondHandle(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/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py index 9fda804bfb2..c24b0d5716a 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py @@ -117,7 +117,7 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs): ################# # Module status # ################# - useNewDeadmapFormat = False + useNewDeadmapFormat = True useNewChargeFormat = False if not useNewDeadmapFormat: diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index 335ae6e7d84..2fdd03007cf 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -45,7 +45,7 @@ if DetFlags.pixel_on(): ################# # Module status # ################# - useNewDeadmapFormat = False + useNewDeadmapFormat = True useNewChargeFormat = False if not useNewDeadmapFormat: diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py index 56fda0c7da4..c52e9dd2de6 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py @@ -66,7 +66,7 @@ class PixelConditionsServicesSetup: from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags - useNewDeadmapFormat = False + useNewDeadmapFormat = True useNewChargeFormat = False if not useNewDeadmapFormat: -- GitLab From f8f24f1bc51a19d3c38c6c054414402dcb1e2a37 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Wed, 30 Sep 2020 05:31:27 +0200 Subject: [PATCH 02/20] update --- .../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx index ba6a3eaa6e8..e9e450739eb 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx @@ -105,6 +105,18 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const { int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) ); if (pixlayer == 99) continue; + int numFE = 16; + if (m_pixelid->barrel_ec(waferID)==0 && m_pixelid->layer_disk(waferID)==0) { + if (m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) { numFE=2; } // IBL Planar + else { numFE=1; } // IBL 3D + } + if (std::abs(m_pixelid->barrel_ec(waferID))==4) { numFE=1; } // DBM + + for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); + std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; + } + if (m_pixelCondSummaryTool->isActive(id_hash) == true) { if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) nActive_layer[pixlayer]+=2; else nActive_layer[pixlayer]++; -- GitLab From d91e9bed28634074c097bc294a89425b6ada1610 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Fri, 2 Oct 2020 07:06:00 +0200 Subject: [PATCH 03/20] update --- .../InDetRecExample/share/InDetRecConditionsAccess.py | 1 - 1 file changed, 1 deletion(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index 2fdd03007cf..7467a77c0b8 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -47,7 +47,6 @@ if DetFlags.pixel_on(): ################# useNewDeadmapFormat = True 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') -- GitLab From dcc09abadd36bca35850ec2423f87932974301d0 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Mon, 5 Oct 2020 06:56:44 +0200 Subject: [PATCH 04/20] update --- .../InDetRecExample/share/InDetRecConditionsAccess.py | 1 + 1 file changed, 1 insertion(+) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index af50fd78d5e..b5e1e7d353b 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -109,6 +109,7 @@ if DetFlags.pixel_on(): CablingMapFileName=IdMappingDat) if athenaCommonFlags.isOnline(): alg.ReadDeadMapKey = "" + alg.ReadDeadMapKey = "" condSeq += alg if useNewDeadmapFormat: -- GitLab From 77a049bb96dc0ec9919f514234351b7c1f24657c Mon Sep 17 00:00:00 2001 From: Andreas Kirchhoff Date: Thu, 15 Oct 2020 15:14:04 +0200 Subject: [PATCH 05/20] Creation and application of FEmask --- .../Application/makeInactiveModuleList.C | 879 +++++-- .../PixelCalibAlgs/CMakeLists.txt | 5 + .../PixelCalibAlgs/share/HashVSdcsID.dat | 2048 ++++++++++++++++ .../PixelCalibAlgs/share/table_Run2.txt | 2066 +++++++++++++++++ .../src/PixelAthClusterMonAlg.cxx | 80 +- .../src/PixelAthClusterMonAlg.h | 2 + .../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 2 +- 7 files changed, 4851 insertions(+), 231 deletions(-) create mode 100644 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/HashVSdcsID.dat create mode 100644 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/table_Run2.txt diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C index 179bb46531b..f2331c94508 100644 --- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C +++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C @@ -1,7 +1,3 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - #include #include #include @@ -10,6 +6,9 @@ #include #include #include +#include + + #include "TFile.h" #include "TH1.h" @@ -17,19 +16,18 @@ #include "TKey.h" #include "Riostream.h" -#include "PixelCalibAlgs/PixelConvert.h" -#include "PixelConditionsData/SpecialPixelMap.h" -std::vector< std::pair< std::string, std::vector > > m_pixelMapping; -std::vector< std::pair< int, std::vector > > m_hashMapping; -std::vector< std::pair< std::string, std::vector > > m_channelMapping; -void setPixelMapping(bool m_isIBL); +std::vector< std::pair< std::string, std::vector > > pixelMapping; +std::vector< std::pair< int, std::vector > > hashMapping; +std::vector< std::pair< std::string, std::vector > > channelMapping; +void setPixelMapping(bool isIBL); std::string getDCSIDFromPosition (int barrel_ec, int layer, int module_phi, int module_eta); int getHashFromPosition (int barrel_ec, int layer, int module_phi, int module_eta); std::vector getPositionFromDCSID (std::string module_name); std::vector getChannelFromHashID (int hashid); -void checkInactiveModule(bool m_isIBL, TFile* hitMapFile, int &npush_back, std::vector &vsmodule, std::vector &vLB_start, std::vector &vLB_end); -void make_pyfile(std::string srun, std::string stag_name, int npush_back, std::vector vsmodule, std::vector vLB_start, std::vector vLB_end, bool flag_first); +void checkInactiveModule(bool isIBL, TFile* hitMapFile, int &npush_back, std::vector &vsmodule, std::vector &vLB_start, std::vector &vLB_end); +void checkInactiveFEs(bool isIBL, TFile* hitMapFile, int &npush_backFE, std::vector &vsFE, std::vector &FEcode); +void make_txt(std::string srun, int npush_back, int npush_backFE, std::vector vsFE, std::vector vsmodule, std::vector vLB_start, std::vector vLB_end, std::vector FEcode); std::vector &splitter(const std::string &s, char delim, std::vector &elems) { @@ -57,8 +55,8 @@ bool is_file_exist(const char *fileName) using namespace std; int main(int argc, char* argv[]){ - bool m_isIBL = true; - std::string stag_name = "PixMapOverlay-RUN2-DATA-UPD4-02"; + bool isIBL = true; + std::string stag_name = "PixMapOverlay-RUN2-DATA-UPD4-04"; //----------------------------------- //Usage configuration of the program @@ -66,7 +64,6 @@ int main(int argc, char* argv[]){ std::string runNumber = "0"; std::string finname = ""; std::string sflag_first = ""; - bool optionOnline = false; bool flag_first = false; if( argc == 2 ){ @@ -89,44 +86,53 @@ int main(int argc, char* argv[]){ //----------------------------- //Read pixel mapping //------------------------------ - setPixelMapping(m_isIBL); + setPixelMapping(isIBL); //----------------------------- - //Open input and output files + //Open input and output files; define variables //------------------------------ int npush_back = 0; + int npush_backFE = 0; std::vector vsmodule; + std::vector vsFE; + std::vector FEcode; std::vector vLB_start; std::vector vLB_end; + if(flag_first != true){ TFile* hitMapFile = new TFile(finname.c_str(), "READ"); if( !hitMapFile || !hitMapFile->IsOpen() ){ std::cerr << "Error: Unable to open input file." << std::endl; return 1; + } - checkInactiveModule(m_isIBL, hitMapFile, npush_back, vsmodule, vLB_start, vLB_end); + checkInactiveFEs(isIBL, hitMapFile, npush_backFE, vsFE, FEcode); + checkInactiveModule(isIBL, hitMapFile, npush_back, vsmodule, vLB_start, vLB_end); + hitMapFile->Close(); delete hitMapFile; } //----------------------------- - // Open file to save python fragment with disabled modules + // Open file to save txt fragment with disabled modules //----------------------------- - make_pyfile(runNumber, stag_name, npush_back, vsmodule, vLB_start, vLB_end, flag_first); + std::cout<<"create txt file"< &vsmodule, std::vector &vLB_start, std::vector &vLB_end){ - - - TH1D* nEventsHistogram = 0; - TH1D* nEventsLBHistogram = 0; - hitMapFile->GetObject("NEvents", nEventsHistogram); +//----------------------------- +// Function to read infos from Lumi-block information (IBL for each FE, rest for each module) +//----------------------------- +void checkInactiveModule(bool isIBL, TFile* hitMapFile, int &npush_back, std::vector &vsmodule, std::vector &vLB_start, std::vector &vLB_end){ + //----------------------------- + // Everything adopted to new noise maps + //----------------------------- + TH1* nEventsLBHistogram = 0; hitMapFile->GetObject("NEventsLB", nEventsLBHistogram); - // double nEvents = nEventsHistogram->GetBinContent(1); - + //------------------------------- // Initialization //------------------------------- @@ -137,10 +143,10 @@ void checkInactiveModule(bool m_isIBL, TFile* hitMapFile, int &npush_back, std:: components.push_back("Disk1C"); components.push_back("Disk2C"); components.push_back("Disk3C"); - if (m_isIBL) components.push_back("IBL"); // kazuki - components.push_back("B-layer"); - components.push_back("Layer1"); - components.push_back("Layer2"); + if (isIBL) components.push_back("IBL"); // kazuki + components.push_back("B0"); + components.push_back("B1"); + components.push_back("B2"); std::map lbdep; //------------------------------------ @@ -157,19 +163,17 @@ void checkInactiveModule(bool m_isIBL, TFile* hitMapFile, int &npush_back, std:: for(std::vector::const_iterator hemisphere = hemispheres.begin(); hemisphere != hemispheres.end(); ++hemisphere){ - std::string lbdepDirName = std::string("LBdep_endcap") + (*hemisphere); - TDirectory* lbdepDir = 0; + std::string lbdepDirName = std::string("All/OccupancyLb"); for(int k = 1; k <= 3; k ++){ std::ostringstream component, lbdepPath; component << "Disk" << k << (*hemisphere); - lbdepPath << lbdepDirName << "/Disk" << k; + lbdepPath << lbdepDirName << "/Disk" << k <<(*hemisphere); for(int phi = 0; phi < 48; phi++){ std::string name((static_cast((static_cast(hitMapFile->Get(lbdepPath.str().c_str())))->GetListOfKeys()->At(phi)))->GetName()); lbdep[name] = static_cast((static_cast(((static_cast(hitMapFile->Get(lbdepPath.str().c_str())))->GetListOfKeys())->At(phi)))->ReadObj()); lbdep[name]->SetName(name.c_str()); - //lbdep[name]->Divide(nEventsLBHistogram); } } // loop over k } @@ -184,46 +188,47 @@ void checkInactiveModule(bool m_isIBL, TFile* hitMapFile, int &npush_back, std:: // eta_index [0,143] for layer 0, 1 & 2 //----------------------------------------------------------- std::vector staves; - if(m_isIBL) staves.push_back(14); + if(isIBL) staves.push_back(14); staves.push_back(22); staves.push_back(38); staves.push_back(52); std::vector layers; - if(m_isIBL) layers.push_back("IBL"); - layers.push_back("B-layer"); - layers.push_back("Layer1"); - layers.push_back("Layer2"); + if(isIBL) layers.push_back("IBL"); + layers.push_back("B0"); + layers.push_back("B1"); + layers.push_back("B2"); std::string lbdepDirName("lbdep_barrel"); - TDirectory* lbdepDir = 0; for(unsigned int layer = 0; layer < staves.size(); layer++){ std::ostringstream lbdepPath; - lbdepPath << "LBdep_barrel/" << layers[layer]; + lbdepPath << "All/OccupancyLb/" << layers[layer]; int nModulesPerStave = 13; - if (m_isIBL && layer == 0) nModulesPerStave = 20; // --- IBL --- // - for(int module = 0; module < staves[layer] * nModulesPerStave; module++){ // loop on modules - std::string name((static_cast((static_cast(hitMapFile->Get(lbdepPath.str().c_str())))->GetListOfKeys()->At(module)))->GetName()); - - lbdep[name] = static_cast((static_cast(((static_cast(hitMapFile->Get( lbdepPath.str().c_str() ) ))->GetListOfKeys() )->At(module) ))->ReadObj()); - - lbdep[name]->SetName(name.c_str()); - //lbdep[name]->Divide(nEventsLBHistogram); - } + if (isIBL && layer == 0) nModulesPerStave = 32; // --- IBL --- // + for(int module = 0; module < staves[layer] * nModulesPerStave; module++){ // loop on modules + std::string name((static_cast((static_cast(hitMapFile->Get(lbdepPath.str().c_str())))->GetListOfKeys()->At(module)))->GetName()); + lbdep[name] = static_cast((static_cast(((static_cast(hitMapFile->Get( lbdepPath.str().c_str() ) ))->GetListOfKeys() )->At(module) ))->ReadObj()); + lbdep[name]->SetName(name.c_str()); + } } - + for(std::map::const_iterator module = lbdep.begin(); module != lbdep.end(); ++module){ std::string moduleID = (*module).first; int LB_start = 0; int LB_end = 0; int flag_start = 0; - //int flag_end = 0; - int nbin = nEventsLBHistogram->GetNbinsX(); - for (int LB = 1; LB < nbin; LB++) { - if(nEventsLBHistogram->GetBinContent(LB + 1) < 10.) continue; // nEventsLBHistogram starts from 0 // #events in LB >= 10 - - if(lbdep[moduleID]->GetBinContent(LB + 1) < 1.) { // (#module hits in LB) / (#events in LB) < 1 + int nbin =nEventsLBHistogram->GetNbinsX(); + + //----------------------------- + // Writing list of modules (or FEs in IBL modules) that do not work during a LB + //----------------------------- + for (int LB = 1; LB <= nbin; LB++) { + + if(nEventsLBHistogram->GetBinContent(LB) < 80.) continue; // #events in LB >= 80 + + if(lbdep[moduleID]->GetBinContent(LB) ==0) { // (#module hits in LB) / (#events in LB) < 1 + if(flag_start == 0){ flag_start = 1; LB_start = LB; @@ -247,20 +252,451 @@ void checkInactiveModule(bool m_isIBL, TFile* hitMapFile, int &npush_back, std:: vLB_end.push_back(LB_end); npush_back++; } + }//for(std::map::const_iterator module = lbdep.begin(); module != lbdep.end(); ++module) } -void setPixelMapping(bool m_isIBL){ +void checkInactiveFEs(bool isIBL, TFile* hitMapFile, int &npush_backFE, std::vector &vsFE, std::vector &FEcode){ //Function for FE masking + // + //------------------------------- + // Everything adopted to new noise maps + // Initialization + //------------------------------- + std::vector components; + components.push_back("Disk1A"); + components.push_back("Disk2A"); + components.push_back("Disk3A"); + components.push_back("Disk1C"); + components.push_back("Disk2C"); + components.push_back("Disk3C"); + if (isIBL) components.push_back("IBL"); // kazuki + components.push_back("B0"); + components.push_back("B1"); + components.push_back("B2"); + + std::map hitMaps; + //------------------------------------ + // read hit maps from input file + // + // endcaps + // 48 modules each disk + // phi_index [0,327] + // eta_index [0,143] + //------------------------------------ + std::vector hemispheres; + hemispheres.push_back("A"); + hemispheres.push_back("C"); + + for(std::vector::const_iterator hemisphere = hemispheres.begin(); + hemisphere != hemispheres.end(); ++hemisphere){ + std::string hitMapsDirName = std::string("All/Occupancy2d"); + + for(int k = 1; k <= 3; k ++){ + std::ostringstream component, hitMapsPath; + component << "Disk" << k << (*hemisphere); + hitMapsPath << hitMapsDirName << "/Disk" << k <<(*hemisphere); + + + for(int phi = 0; phi < 48; phi++){ + std::string name((static_cast((static_cast(hitMapFile->Get(hitMapsPath.str().c_str())))->GetListOfKeys()->At(phi)))->GetName()); + hitMaps[name] = static_cast((static_cast(((static_cast(hitMapFile->Get(hitMapsPath.str().c_str())))->GetListOfKeys())->At(phi)))->ReadObj()); + hitMaps[name]->SetName(name.c_str()); + } + } // loop over k + } + + //----------------------------------------------------------- + // read hit maps from input file + // + // barrel + // 22, 38, 52 slaves for layer 0, 1 and 2 + // 13 modules per stave + // phi_index [0,319] for layer 0, [0,327] for layer 1 & 2 + // eta_index [0,143] for layer 0, 1 & 2 + //----------------------------------------------------------- + std::vector staves; + if(isIBL) staves.push_back(14); + staves.push_back(22); + staves.push_back(38); + staves.push_back(52); + + std::vector layers; + if(isIBL) layers.push_back("IBL"); + layers.push_back("B0"); + layers.push_back("B1"); + layers.push_back("B2"); + + std::string hitMapsDirName("hitMaps_barrel"); + for(unsigned int layer = 0; layer < staves.size(); layer++){ + std::ostringstream hitMapsPath; + hitMapsPath << "All/Occupancy2d/" << layers[layer]; + int nModulesPerStave = 13; + if (isIBL && layer == 0) nModulesPerStave = 32; // --- IBL --- // + if (layer !=0){ //IBL ignored,because treated in function for LB information + for(int module = 0; module < staves[layer] * nModulesPerStave; module++){ // loop on modules + std::string name((static_cast((static_cast(hitMapFile->Get(hitMapsPath.str().c_str())))->GetListOfKeys()->At(module)))->GetName()); + hitMaps[name] = static_cast((static_cast(((static_cast(hitMapFile->Get( hitMapsPath.str().c_str() ) ))->GetListOfKeys() )->At(module) ))->ReadObj()); + hitMaps[name]->SetName(name.c_str()); + } + } + } + //--------------------------------------- + // Writing list of FE that shall be masked + //--------------------------------------- + std::cout<<"hitMaps.size(): "<::const_iterator module = hitMaps.begin(); module != hitMaps.end(); ++module){ + std::string moduleID = (*module).first; + //--------------------------------------- + // Further variables for counting + //--------------------------------------- + //int sum_FE_all=0; //variable was used to do some threshold studies + int nbinx =hitMaps[moduleID]->GetNbinsX(); + int nbiny =hitMaps[moduleID]->GetNbinsY(); + double FE0=0; + double FE1=0; + double FE2=0; + double FE3=0; + double FE4=0; + double FE5=0; + double FE6=0; + double FE7=0; + double FE8=0; + double FE9=0; + double FE10=0; + double FE11=0; + double FE12=0; + double FE13=0; + double FE14=0; + double FE15=0; + //--------------------------------------- + // Variables to identify modules + //--------------------------------------- + std::string D1A ("D1A"); + std::string D2A ("D2A"); + std::string D3A ("D3A"); + std::string D1C ("D1C"); + std::string D2C ("D2C"); + std::string D3C ("D3C"); + std::string M1 ("M1"); + std::string M2 ("M2"); + std::string M3 ("M3"); + std::string M4 ("M4"); + std::string M5 ("M5"); + std::string M6 ("M6"); + std::size_t disk1A = moduleID.find(D1A); + std::size_t disk2A = moduleID.find(D2A); + std::size_t disk3A = moduleID.find(D3A); + std::size_t disk1C = moduleID.find(D1C); + std::size_t disk2C = moduleID.find(D2C); + std::size_t disk3C = moduleID.find(D3C); + std::size_t M1_find = moduleID.find(M1); + std::size_t M2_find = moduleID.find(M2); + std::size_t M3_find = moduleID.find(M3); + std::size_t M4_find = moduleID.find(M4); + std::size_t M5_find = moduleID.find(M5); + std::size_t M6_find = moduleID.find(M6); + //--------------------------------------- + // Check for hits in FEs + //--------------------------------------- + for(int k=1; k<=nbinx; k++){ + for(int l=1; l<=nbiny; l++){ + if(k<=18){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE7=FE7+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE8=FE8+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE8=FE8+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE7=FE7+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=19 and k<=36){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE6=FE6+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE9=FE9+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE9=FE9+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE6=FE6+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=37 and k<=54){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE5=FE5+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE10=FE10+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE10=FE10+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE5=FE5+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=55 and k<=72){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE4=FE4+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE11=FE11+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE11=FE11+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE4=FE4+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=73 and k<=90){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE3=FE3+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE12=FE12+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE12=FE12+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE3=FE3+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=91 and k<=108){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE2=FE2+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE13=FE13+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE13=FE13+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE2=FE2+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=109 and k<=126){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE1=FE1+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE14=FE14+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE14=FE14+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE1=FE1+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "<=127){ + if(l<=164){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE0=FE0+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE15=FE15+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else if(l>=165){ + if(((!disk1A or !disk2A or !disk3A) and (M1_find==11 or M2_find==11 or M3_find==11)) or ((!disk1C or !disk2C or !disk3C) and (M4_find==11 or M5_find==11 or M6_find==11))){ + FE15=FE15+hitMaps[moduleID]->GetBinContent(k,l); + } + else{ + FE0=FE0+hitMaps[moduleID]->GetBinContent(k,l); + } + } + else{ + std::cout<<"ERROR"<<" "< paths = splitter(cmtpath, ':'); std::ifstream ifs; std::ifstream ifs2; std::ifstream ifs3; - for (const auto& x : paths){ + for(const auto& x : paths){ + if(is_file_exist((x + "/PixelMapping_Run2.dat").c_str())){ - std::cout << "datapath: " << x << std::endl; - if(m_isIBL){ + std::cout << "datapath: " << x <<" "< tmp_position; tmp_position.resize(4); + + while(ifs >> tmp_barrel_ec >> tmp_layer >> tmp_module_phi >> tmp_module_eta >> tmp_module_name) { + tmp_position[0] = tmp_barrel_ec; tmp_position[1] = tmp_layer; tmp_position[2] = tmp_module_phi; tmp_position[3] = tmp_module_eta; - m_pixelMapping.push_back(std::make_pair(tmp_module_name, tmp_position)); + pixelMapping.push_back(std::make_pair(tmp_module_name, tmp_position)); } int tmp_hash; int tmp0; int tmp1; int tmp2; int tmp3; int tmp4; std::string tmp_id; while(ifs2 >> tmp0 >> tmp_hash >> tmp1 >> tmp2 >> tmp_barrel_ec >> tmp_layer >> tmp_module_phi >> tmp_module_eta >> tmp3 >> tmp4 >> tmp_id) { + tmp_position[0] = tmp_barrel_ec; tmp_position[1] = tmp_layer; tmp_position[2] = tmp_module_phi; tmp_position[3] = tmp_module_eta; - m_hashMapping.push_back(std::make_pair(tmp_hash, tmp_position)); + hashMapping.push_back(std::make_pair(tmp_hash, tmp_position)); } - //break; - }else if(is_file_exist((x + "/table_Run2.txt").c_str())){ + } + if(is_file_exist((x + "/table_Run2.txt").c_str())){ + std::cout << "datapath: " << x << std::endl; ifs3.open(x + "/table_Run2.txt"); std::string str; std::string tmp_word1, tmp_word2, tmp_word3; - int tmp_channel, tmp_hashid; + int tmp_channel; + int tmp_hashid; std::string tmp_module_name; std::vector tmp_position; tmp_position.resize(2); @@ -306,173 +748,216 @@ void setPixelMapping(bool m_isIBL){ if(str.find("[") != std::string::npos) tmp_module_name = str.substr(pos, 19); tmp_position[0] = tmp_channel; tmp_position[1] = tmp_hashid; - m_channelMapping.push_back(std::make_pair(tmp_module_name, tmp_position)); - //std::cout << tmp_module_name << ": " << tmp_position[0] << ", " << tmp_position[1] << std::endl; + channelMapping.push_back(std::make_pair(tmp_module_name, tmp_position)); } if(str.find("PixMapOverlayWr") != std::string::npos) flag_start = 1; - }//while(getline(ifs3, str)) + }// while(getline(ifs3, str)) + std::cout< getPositionFromDCSID (const std::string& module_name){ - for(unsigned int ii = 0; ii < m_pixelMapping.size(); ii++) { - if (m_pixelMapping[ii].first == module_name) - return m_pixelMapping[ii].second; +std::vector getPositionFromDCSID (std::string module_name){ + std::string number1 = "7"; + std::string number2 = "8"; + std::string character = "I"; + if(module_name[13]!=number1 and module_name[13]!=number2 and module_name[1]==character){ + module_name.erase(14,2); + } + for(unsigned int ii = 0; ii < pixelMapping.size(); ii++) { + if (pixelMapping[ii].first == module_name) + return pixelMapping[ii].second; } std::cout << "[getPositionFromDCSID] Not found!" << std::endl; - return m_pixelMapping[0].second; + return pixelMapping[0].second; } std::vector getChannelFromHashID (int hashid){ - for(unsigned int ii = 0; ii < m_channelMapping.size(); ii++) { - if (m_channelMapping[ii].second[1] == hashid) - return m_channelMapping[ii].second; + for(unsigned int ii = 0; ii < channelMapping.size(); ii++) { + if (channelMapping[ii].second[1] == hashid) + return channelMapping[ii].second; } std::cout << "[getChannelFromHashID] Not found!" << std::endl; - return m_channelMapping[1].second; + return channelMapping[1].second; } - -void make_pyfile(const std::string& srun, const std::string& stag_name, int npush_back, const std::vector& vsmodule, const std::vector& vLB_start, const std::vector& vLB_end, bool flag_first){ +//--------------------------------------- +// Make a txt file out of masked modules/FEs +//--------------------------------------- +void make_txt(std::string srun, int npush_back, int npush_backFE, std::vector vsFE, std::vector vsmodule, std::vector vLB_start, std::vector vLB_end, std::vector FEcode){ std::string spyfilename = "./PixMapOverlay_run" + srun; - spyfilename += ".py"; - std::ofstream pyFile; - pyFile.open(spyfilename.c_str(),std::ofstream::out); - std::cout << spyfilename << std::endl; - - std::string sdbfilename = "PixMapOverlay_run" + srun; - sdbfilename += ".db"; - - pyFile << "import os, time,sys" << std::endl; - pyFile << "from PyCool import cool" << std::endl; - pyFile << "from CoolConvUtilities import AtlCoolLib" << std::endl; - pyFile << "# For resolving tags" << std::endl; - pyFile << "sys.path.append('/afs/cern.ch/user/a/atlcond/utils/python/')" << std::endl; - pyFile << "dbFile = '"<< sdbfilename << "'" << std::endl; - pyFile << "dbName = 'CONDBR2'" << std::endl; - pyFile << "path='/PIXEL/PixMapOverlay'" << std::endl; - // pyFile << "tag = 'PixMapOverlay-Test'" << std::endl; - pyFile << "tag = '" << stag_name << "'" << std::endl; - pyFile << "try:" << std::endl; - pyFile << " os.remove(dbFile)" << std::endl; - pyFile << "except:" << std::endl; - pyFile << " pass" << std::endl; - pyFile << "dbSvc = cool.DatabaseSvcFactory.databaseService()" << std::endl; - pyFile << "dbString = \"sqlite://;schema=%s;dbname=%s\" % (dbFile, dbName)" << std::endl; - pyFile << "try:" << std::endl; - pyFile << " db = dbSvc.createDatabase(dbString)" << std::endl; - pyFile << "except Exception, e:" << std::endl; - pyFile << " print 'Problem creating database', e" << std::endl; - pyFile << " sys.exit(-1)" << std::endl; - pyFile << "print \"Created database\", dbString" << std::endl; - pyFile << "spec = cool.RecordSpecification()" << std::endl; - pyFile << "spec.extend('moduleID', cool.StorageType.Int32)" << std::endl; - pyFile << "spec.extend('ModuleSpecialPixelMap_Clob', cool.StorageType.String4k)" << std::endl; - pyFile << "desc = 'run-lumiCondAttrListCollection'" << std::endl; - pyFile << "folderSpec = cool.FolderSpecification(cool.FolderVersioning.MULTI_VERSION, spec)" << std::endl; - pyFile << "folder = db.createFolder(path, folderSpec, desc, True)" << std::endl; - pyFile << "data = cool.Record(spec)" << std::endl; - pyFile << "" << std::endl; - - pyFile << "# Write BAD modules" << std::endl; - if(flag_first == true){ - std::cout << "Make py-file for initialization." << std::endl; - pyFile << "for channel in range(0, 2048):" << std::endl; - pyFile << " print \"Good modules: run\", 0, \"LB\", 0, \"-\", \"run\", 2147483647, \"LB\", 4294967295, \": \", channel" << std::endl; - pyFile << " since = (0 << 32) + 0" << std::endl; - pyFile << " until = (2147483647 << 32) + 4294967295" << std::endl; - pyFile << "" << std::endl; - pyFile << " data['moduleID'] = channel" << std::endl; - pyFile << " data['ModuleSpecialPixelMap_Clob'] = '0 0'" << std::endl; - pyFile << " channel = channel + 1" << std::endl; - pyFile << " folder.storeObject(since, until, data, channel, tag)" << std::endl; - pyFile << "" << std::endl; - }else{ - std::cout << "Initialize for run" << srun << std::endl; - pyFile << "for channel in range(0, 2048):" << std::endl; - pyFile << " print \"Good modules: run\", " << srun << ", \"LB\", 0, \"-\", \"run\", " << srun << ", \"LB\", 4294967295, \": \", channel" << std::endl; - pyFile << " since = (" << srun << " << 32) + 0" << std::endl; - pyFile << " until = (" << srun << " << 32) + 4294967295" << std::endl; - pyFile << "" << std::endl; - pyFile << " data['moduleID'] = channel" << std::endl; - pyFile << " data['ModuleSpecialPixelMap_Clob'] = '0 0'" << std::endl; - pyFile << " channel = channel + 1" << std::endl; - pyFile << " folder.storeObject(since, until, data, channel, tag)" << std::endl; - pyFile << "" << std::endl; - - std::vector ::iterator it_smodule = vsmodule.begin(); - std::vector ::iterator it_LBstart = vLB_start.begin(); - std::vector ::iterator it_LBend = vLB_end.begin(); - for(int i=0; i position = getPositionFromDCSID(*it_smodule); + spyfilename += ".txt"; + std::ofstream txtFile; + txtFile.open(spyfilename.c_str(),std::ofstream::out); + std::cout <<"spyfilename: "< 0){ + for(int i=1; i<=npush_backFE; i++){ + + std::vector position = getPositionFromDCSID(vsFE[i-1]); int barrel = position[0]; int layer = position[1]; int module_phi = position[2]; int module_eta = position[3]; int module_hash = getHashFromPosition(barrel, layer, module_phi, module_eta); - //std::string dcs_position = getDCSIDFromPosition(barrel, layer, module_phi, module_eta); std::vector channel_set = getChannelFromHashID(module_hash); int channel = channel_set[0]; - - std::cout << *it_smodule << "(" << channel << "): " << *it_LBstart << "-" << (*it_LBend + 1) << std::endl; - if(i == 0){ - pyFile << "badModulesList = ["; - pyFile << "[" << srun << ", " << *it_LBstart << ", " << (*it_LBend + 1) << ", " << channel << "]," << std::endl; - }else if(i != (npush_back-1)){ - pyFile << " [" << srun << ", " << *it_LBstart << ", " << (*it_LBend + 1) << ", " << channel << "]," << std::endl; - }else{ - pyFile << " [" << srun << ", " << *it_LBstart << ", " << (*it_LBend + 1)<< ", " << channel << "]]" << std::endl; - }//(i != (npush_back-1)) - ++it_smodule; - ++it_LBstart; - ++it_LBend; - }//for(int i=0; i> FECode; + channel_FEcode[i][0]=channel; + channel_FEcode[i][1]=FECode; + for(int l=1; lchannel_FEcode[l][0]){ + continue; + } + else{ + for(int k=0; k::iterator it_smodule = vsmodule.begin(); + std::vector ::iterator it_LBstart = vLB_start.begin(); + std::vector ::iterator it_LBend = vLB_end.begin(); + std::cout< 0){ + for(int i=1; i<=npush_back; i++){ + std::vector position = getPositionFromDCSID(*it_smodule); + int barrel = position[0]; + int layer = position[1]; + int module_phi = position[2]; + int module_eta = position[3]; + int module_hash = getHashFromPosition(barrel, layer, module_phi, module_eta); + std::vector channel_set = getChannelFromHashID(module_hash); + int channel = channel_set[0]; + unsigned long sRun = std::stoi (srun); + unsigned long iov_start = (sRun << 32)+*it_LBstart; + unsigned long iov_end = (sRun << 32)+*it_LBend; + channel_Modulecode[i][0]=channel; + channel_Modulecode[i][1]=65535; + channel_Modulecode[i][2]=iov_start; + channel_Modulecode[i][3]=iov_end; + //std::cout<channel_Modulecode[l][0]){ + continue; + } + else{ + for(int k=0; kretrieve(m_atlasid, "AtlasID") ); ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") ); ATH_CHECK( m_pixelCondSummaryTool.retrieve() ); + ATH_CHECK( m_pixelCableSvc.retrieve() ); if ( !m_holeSearchTool.empty() ) ATH_CHECK( m_holeSearchTool.retrieve() ); if ( !m_trackSelTool.empty() ) ATH_CHECK( m_trackSelTool.retrieve() ); @@ -67,41 +70,52 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) ); if (pixlayer == 99) continue; - - // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess - if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash) == true) { - index = 0; - } else if (m_pixelCondSummaryTool->isActive(id_hash) == false) { - index = 2; // inactive or bad modules - nDisabledMod[pixlayer]++; - getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval); - switch (pixlayer) { - case PixLayers::kECA : - clusPerEventArray.DA[phiMod][etaMod] = -1; - break; - case PixLayers::kECC : - clusPerEventArray.DC[phiMod][etaMod] = -1; - break; - case PixLayers::kB0 : - clusPerEventArray.B0[phiMod][etaMod] = -1; - break; - case PixLayers::kB1 : - clusPerEventArray.B1[phiMod][etaMod] = -1; - break; - case PixLayers::kB2 : - clusPerEventArray.B2[phiMod][etaMod] = -1; - break; - case PixLayers::kIBL : - clusPerEventArray.IBL[phiMod][etaMod] = -1; - if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1; - break; + + int numFE = 16; + if (m_pixelid->barrel_ec(waferID)==0 && m_pixelid->layer_disk(waferID)==0) { + if (m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) { numFE=2; } // IBL Planar + else { numFE=1; } // IBL 3D + } + if (std::abs(m_pixelid->barrel_ec(waferID))==4) { numFE=1; } // DBM + + for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); + //std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; + // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess + if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash,pixelID) == true) { + index = 0; + } else if (m_pixelCondSummaryTool->isActive(id_hash) == false) { + index = 2; // inactive or bad modules + nDisabledMod[pixlayer]++; + getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval); + switch (pixlayer) { + case PixLayers::kECA : + clusPerEventArray.DA[phiMod][etaMod] = -1; + break; + case PixLayers::kECC : + clusPerEventArray.DC[phiMod][etaMod] = -1; + break; + case PixLayers::kB0 : + clusPerEventArray.B0[phiMod][etaMod] = -1; + break; + case PixLayers::kB1 : + clusPerEventArray.B1[phiMod][etaMod] = -1; + break; + case PixLayers::kB2 : + clusPerEventArray.B2[phiMod][etaMod] = -1; + break; + case PixLayers::kIBL : + clusPerEventArray.IBL[phiMod][etaMod] = -1; + if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1; + break; + } + } else { + index = 1; // bad but active modules + nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer]; } - } else { - index = 1; // bad but active modules - nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer]; + //std::cout<<"Index "< m_pixelCableSvc; //FE info ToolHandle m_holeSearchTool; ToolHandle m_trackSelTool; ToolHandle m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"}; diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx index e9e450739eb..081243c717b 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx @@ -114,7 +114,7 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const { for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); - std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; + //std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; } if (m_pixelCondSummaryTool->isActive(id_hash) == true) { -- GitLab From e436d45b5318b6ce76a19b63f07082e7bcfacdd9 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Sat, 21 Nov 2020 08:10:03 +0100 Subject: [PATCH 06/20] update --- .../python/PixelConditionsConfig.py | 2 -- .../src/PixelConfigCondAlg.h | 2 +- .../src/PixelConditionsSummaryTool.cxx | 5 ---- .../src/PixelConditionsSummaryTool.h | 4 --- .../python/FastSiDigitizationConfig.py | 8 ++--- .../share/PixelDigitization_jobOptions.py | 8 ++--- .../python/PixelDigitizationConfig.py | 20 +++++-------- .../share/InDetRecConditionsAccess.py | 29 +++++++++---------- .../share/postInclude.SLHC_Rec.py | 9 ++---- .../python/InDetTrigConfigConditions.py | 29 +++++++++---------- .../share/SiSPSeededTracksStandalone.py | 22 +++++--------- .../SiSPSeededTracksStandaloneFromESD.py | 22 +++++--------- 12 files changed, 59 insertions(+), 101 deletions(-) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py index c373d9cb417..b177f0d5525 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 diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h index 5852fd614ed..319930421c5 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h @@ -81,7 +81,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm { // Dead map key. This will be replaced once new deadmap format is validated. SG::ReadCondHandleKey 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/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx index e1d26a6c0b7..86e644570d6 100644 --- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx @@ -184,7 +184,6 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } -// if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } return true; } @@ -205,7 +204,6 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } -// if (SG::ReadCondHandle(m_condDeadMapKey,ctx)->getModuleStatus(moduleHash)) { return false; } return checkChipStatus(moduleHash, elementId); } @@ -256,7 +254,6 @@ bool PixelConditionsSummaryTool::isGood(const Identifier& elementId, const InDet if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } -// if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } if (h==InDetConditions::PIXEL_CHIP) { if (!checkChipStatus(moduleHash, elementId)) { return false; } @@ -287,7 +284,6 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash& moduleHash, const if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } -// if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } return true; } @@ -313,7 +309,6 @@ bool PixelConditionsSummaryTool::isGood(const IdentifierHash & moduleHash, const if (!m_condTDAQKey.empty() && SG::ReadCondHandle(m_condTDAQKey,ctx)->getModuleStatus(moduleHash)) { return false; } if (SG::ReadCondHandle(m_condDeadMapKey, ctx)->getModuleStatus(moduleHash)) { return false; } -// if (SG::ReadCondHandle(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 e19053d8da8..ee460a28b42 100644 --- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h +++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h @@ -88,9 +88,6 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool SG::ReadCondHandleKey m_condTDAQKey {this, "PixelTDAQCondData", "", "Pixel TDAQ conditions key"}; //Default empty - legacy option -// SG::ReadCondHandleKey m_condDeadMapKey -// {this, "PixelModuleData", "PixelModuleData", "Pixel deadmap conditions key"}; - SG::ReadCondHandleKey m_condDeadMapKey {this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"}; @@ -141,7 +138,6 @@ inline InterfaceID& PixelConditionsSummaryTool::interfaceID(){ inline bool PixelConditionsSummaryTool::checkChipStatus(IdentifierHash moduleHash, Identifier pixid, const EventContext& ctx) const { std::bitset<16> chipStatus(SG::ReadCondHandle(m_condDeadMapKey, ctx)->getChipStatus(moduleHash)); -// std::bitset<16> chipStatus(SG::ReadCondHandle(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/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py index 8aa56707880..34d24b2352b 100644 --- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py @@ -41,7 +41,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): UseCablingConditions=False, 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 not 'doFastPixelDigi' in digitizationFlags.experimentalDigi(): diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py b/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py index 5273dfdd56e..0d32b356a94 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 2b2b09cba25..d481797f98b 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py @@ -154,11 +154,6 @@ def PixelConfigCondAlg_MC(): ################# # 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") alg.UseCablingConditions=False @@ -340,18 +335,19 @@ 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!!!)) + 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/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index eb206c68b89..1a3d91dcd3b 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -45,11 +45,7 @@ if DetFlags.pixel_on(): ################# # Module status # ################# - useNewDeadmapFormat = True 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 @@ -99,20 +95,21 @@ if DetFlags.pixel_on(): 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 = "" 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") + 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/InDetSLHC_Example/share/postInclude.SLHC_Rec.py b/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py index cf08dcad681..d25976b75c0 100644 --- a/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py +++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py @@ -46,13 +46,8 @@ if rec.doWriteESD() or rec.doWriteAOD() or ('doWriteESD' in dir() and doWriteESD from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeLUTCalibCondAlg PixelChargeLUTCalibCondAlg.ReadKey="" - useNewDeadmapFormat = False - if not useNewDeadmapFormat: - from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg - PixelConfigCondAlg.ReadDeadMapKey = "" - else: - from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg - PixelDeadMapCondAlg.ReadKey = "" + from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg + PixelDeadMapCondAlg.ReadKey = "" # --- switch alignment for IBL geometry off (gives WARNING) from PixelGeoModel.PixelGeoModelConf import PixelDetectorTool diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py index 44773d9aeb7..d0b8e787bcb 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py @@ -66,13 +66,8 @@ class PixelConditionsServicesSetup: from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags - useNewDeadmapFormat = True 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 @@ -129,22 +124,24 @@ class PixelConditionsServicesSetup: alg = PixelConfigCondAlg(name="PixelConfigCondAlg", UseCablingConditions=useCablingConditions, CablingMapFileName=IdMappingDat) - if not self.usePixMap: - alg.ReadDeadMapKey = "" condSeq += alg ######################### # Deadmap Setup (RUN-3) # ######################### - 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 not self.usePixMap: - 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. + 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 = "" + condSeq += alg ######################## # DCS Conditions Setup # diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py index a9db2d8b2b2..d09d72412f2 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 @@ -254,15 +249,14 @@ if doPixel: 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 c302596a574..bf7c0975178 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 @@ -241,15 +236,14 @@ if doPixel: 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") + 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"): -- GitLab From 23ead6ac9f59f540ae53c3cca4fdb0a1f336d225 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Sat, 21 Nov 2020 08:14:12 +0100 Subject: [PATCH 07/20] update --- .../InDetRecExample/share/InDetRecCabling.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py index 2d4a1366434..6fbb40c3df7 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 ##################### -- GitLab From daa4d1f62887eea953b9a5f12444b9c7ae44e00f Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Sat, 21 Nov 2020 09:53:54 +0100 Subject: [PATCH 08/20] activate new deadmap folder. --- .../PixelDigitization/python/PixelDigitizationConfig.py | 3 --- .../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 1 - Tools/PROCTools/data/master_q221_AOD_digest.ref | 8 ++++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py index e6496d7bc17..63bedb0f996 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py @@ -332,9 +332,6 @@ def PixelConfigCondAlg_MC(): alg.CablingMapFileName=IdMapping() - if useNewDeadmapFormat: - alg.ReadDeadMapKey = '' - return alg def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs): diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx index e3d6f8fe525..c49d7d996e5 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx @@ -114,7 +114,6 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const { for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); - std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; } if (m_pixelCondSummaryTool->isActive(id_hash) == true) { diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref index 0fbea1060ec..cae7bd3ad60 100644 --- a/Tools/PROCTools/data/master_q221_AOD_digest.ref +++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref @@ -1,13 +1,13 @@ run event nTopo nIdTracks nJets nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot 284500 87473001 122 130 4 1 8 2 6 7 4 3 - 284500 87473014 83 80 6 0 10 1 9 7 5 2 + 284500 87473014 83 79 6 0 10 1 9 7 5 2 284500 87473022 38 29 4 0 4 1 3 3 2 1 284500 87473032 30 33 4 1 10 4 6 5 2 3 284500 87473037 62 38 7 0 12 2 10 6 4 2 - 284500 87473040 107 96 10 1 17 1 16 10 5 5 + 284500 87473040 107 93 10 1 17 1 16 11 6 5 284500 87473051 140 112 11 1 16 1 15 23 16 7 284500 87473063 62 76 5 2 7 1 6 6 4 2 - 284500 87473068 25 34 1 1 0 0 0 0 0 0 + 284500 87473068 25 33 1 1 0 0 0 0 0 0 284500 87473075 60 85 6 0 5 0 5 6 5 1 284500 87473084 78 85 7 2 14 1 13 9 3 6 284500 87473091 41 49 3 0 4 2 2 4 2 2 @@ -15,7 +15,7 @@ 284500 87473104 64 62 6 0 5 1 4 4 3 1 284500 87473114 89 81 7 2 12 1 11 9 6 3 284500 87473121 93 100 6 3 15 4 11 8 6 2 - 284500 87473132 84 57 9 1 12 0 12 3 3 0 + 284500 87473132 84 58 9 1 12 0 12 3 3 0 284500 87473137 94 70 8 3 15 0 15 8 8 0 284500 87473144 78 65 7 1 8 2 6 8 6 2 284500 87473154 86 88 7 0 13 3 10 10 4 6 -- GitLab From c3fa579f5a45f932574cbb566da57960a886e293 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Sun, 22 Nov 2020 06:50:03 +0100 Subject: [PATCH 09/20] update --- .../PixelCalibAlgs/Application/makeInactiveModuleList.C | 9 +++++---- .../InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C index f2331c94508..19d8d1951c7 100644 --- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C +++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/makeInactiveModuleList.C @@ -731,7 +731,7 @@ void setPixelMapping(bool isIBL){ std::string str; std::string tmp_word1, tmp_word2, tmp_word3; int tmp_channel; - int tmp_hashid; + int tmp_hashid = 0; std::string tmp_module_name; std::vector tmp_position; tmp_position.resize(2); @@ -825,7 +825,8 @@ void make_txt(std::string srun, int npush_back, int npush_backFE, std::vector> channel_FEcode; std::cout< 0){ for(int i=1; i<=npush_backFE; i++){ @@ -868,7 +869,7 @@ void make_txt(std::string srun, int npush_back, int npush_backFE, std::vector> channel_Modulecode; if(npush_back > 0){ for(int i=1; i<=npush_back; i++){ std::vector position = getPositionFromDCSID(*it_smodule); @@ -929,7 +930,7 @@ void make_txt(std::string srun, int npush_back, int npush_backFE, std::vector> combine; std::string module_info; for(int i=1; i<=npush_backFE+npush_back; i++){ diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt index 395b63a070d..bf37b9ee028 100644 --- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt +++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt @@ -21,7 +21,7 @@ atlas_add_component( PixelCalibAlgs LINK_LIBRARIES GaudiKernel InDetByteStreamErrors PixelConditionsData PixelCalibAlgsLib ) atlas_add_executable( makeInactiveModuleList - Application/makeInactiveModuleList.C - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib ) + Application/makeInactiveModuleList.C + INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} + LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib ) -- GitLab From dbe778b60b9640822e54310e60d3fadd83d26daa Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Mon, 23 Nov 2020 13:20:20 +0100 Subject: [PATCH 10/20] fix ci-problems --- .../python/PixelConditionsConfig.py | 24 +- .../python/PixelDigitizationConfig.py | 6 +- .../python/PixelDigitizationConfigNew.py | 7 +- .../share/InDetRecConditionsAccess.py | 18 +- .../python/InDetTrigConfigConditions.py | 19 +- .../share/SiSPSeededTracksStandalone.py | 5 +- .../SiSPSeededTracksStandaloneFromESD.py | 13 +- .../TrigInDetConfig/python/TrigInDetConfig.py | 7 +- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 226 +++++++++--------- 9 files changed, 169 insertions(+), 156 deletions(-) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py index f7bfb09db84..0754d2ff4ac 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py @@ -361,15 +361,21 @@ 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() + + # 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/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py index 63bedb0f996..0d61c2f0af2 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py @@ -355,7 +355,11 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs): 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!!!)) - conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03") + 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") diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py index 71563d2317a..ea13e20bc48 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 @@ -175,7 +176,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/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index e32a14a2e63..2bb56b572cd 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -88,18 +88,20 @@ if DetFlags.pixel_on(): 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 athenaCommonFlags.isOnline(): + 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") if athenaCommonFlags.isOnline(): - alg.ReadKey = "" + alg.ReadKey = '' condSeq += alg if globalflags.DataSource=='data' and InDetFlags.usePixelDCS(): diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py index 71f41289c06..adc53e58cd7 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py @@ -65,6 +65,7 @@ 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 useNewChargeFormat = False @@ -122,18 +123,21 @@ class PixelConditionsServicesSetup: ######################### # Deadmap Setup (RUN-3) # ######################### - if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"): - conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection") + if not (conddb.folderRequested("/PIXEL/PixelModuleFeMask") or conddb.folderRequested("/PIXEL/Onl/PixelModuleFeMask")): # TODO: Once global tag is updated, this line should be removed. - 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 athenaCommonFlags.isOnline(): + conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection") + 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 = "" + alg.ReadKey = '' + if athenaCommonFlags.isOnline(): + alg.ReadKey = '' condSeq += alg ######################## @@ -143,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 e3356dd563c..62ee4883883 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py @@ -237,10 +237,7 @@ 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 not conddb.folderRequested("/PIXEL/PixelModuleFeMask"): diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py index 7706a38fcef..158086d7395 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py @@ -224,19 +224,20 @@ 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 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") - if athenaCommonFlags.isOnline(): - alg.ReadKey = "" + alg.ReadKey = '' condSeq += alg if globalflags.DataSource=='data' and InDetFlags.usePixelDCS(): diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py index 87adfc9736d..c06d3a0e127 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 5482e3fc9ba..45f5f43c8e1 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: 314 + 1: 304 2: 16 3: 12 HLT_2e17_lhvloose_L12EM15VH: @@ -59,7 +59,7 @@ HLT_2e3_etcut_L12EM3: 3: 20 stepFeatures: 0: 342 - 1: 3730 + 1: 3656 2: 796 3: 304 HLT_2g10_loose_mu20_L1MU20: @@ -197,7 +197,7 @@ HLT_2mu14_l2io_L12MU10: 3: 1 stepFeatures: 0: 8 - 1: 14 + 1: 12 2: 4 3: 4 HLT_2mu15_L12MU10: @@ -395,13 +395,11 @@ HLT_5j70_0eta240_L14J20: stepFeatures: 0: 5 HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15: - eventCount: 1 + eventCount: 0 stepCounts: 0: 9 - 1: 1 stepFeatures: 0: 9 - 1: 5 HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15: eventCount: 1 stepCounts: @@ -514,7 +512,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10: 8: 2 stepFeatures: 0: 2 - 1: 43 + 1: 41 2: 4 3: 2 4: 2 @@ -532,7 +530,7 @@ HLT_e17_lhvloose_nod0_L1EM15VH: 4: 5 stepFeatures: 0: 6 - 1: 80 + 1: 79 2: 9 3: 6 4: 5 @@ -554,7 +552,7 @@ HLT_e24_lhvloose_L1EM20VH: 4: 5 stepFeatures: 0: 6 - 1: 80 + 1: 79 2: 9 3: 6 4: 5 @@ -567,7 +565,7 @@ HLT_e26_etcut_L1EM22VHI: 3: 6 stepFeatures: 0: 7 - 1: 132 + 1: 131 2: 7 3: 7 HLT_e26_lhloose_L1EM15VH: @@ -580,7 +578,7 @@ HLT_e26_lhloose_L1EM15VH: 4: 5 stepFeatures: 0: 6 - 1: 80 + 1: 79 2: 9 3: 6 4: 5 @@ -594,7 +592,7 @@ HLT_e26_lhloose_L1EM22VHI: 4: 4 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -608,7 +606,7 @@ HLT_e26_lhmedium_L1EM15VH: 4: 4 stepFeatures: 0: 6 - 1: 80 + 1: 79 2: 9 3: 6 4: 4 @@ -622,7 +620,7 @@ HLT_e26_lhmedium_L1EM22VHI: 4: 4 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -638,7 +636,7 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI: 6: 2 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -654,7 +652,7 @@ HLT_e26_lhtight_L1EM15VH: 4: 4 stepFeatures: 0: 6 - 1: 80 + 1: 79 2: 9 3: 6 4: 4 @@ -668,7 +666,7 @@ HLT_e26_lhtight_L1EM22VHI: 4: 4 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -682,7 +680,7 @@ HLT_e26_lhtight_ivarloose_L1EM22VHI: 4: 3 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 3 @@ -696,7 +694,7 @@ HLT_e26_lhtight_ivarmedium_L1EM22VHI: 4: 3 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 3 @@ -710,7 +708,7 @@ HLT_e26_lhtight_ivartight_L1EM22VHI: 4: 3 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 3 @@ -724,7 +722,7 @@ HLT_e26_lhtight_nod0_L1EM22VHI: 4: 4 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -738,7 +736,7 @@ HLT_e26_lhtight_nod0_L1EM24VHI: 4: 4 stepFeatures: 0: 5 - 1: 63 + 1: 64 2: 8 3: 5 4: 4 @@ -763,7 +761,7 @@ HLT_e3_etcut_L1EM3: 3: 20 stepFeatures: 0: 171 - 1: 1865 + 1: 1828 2: 398 3: 152 HLT_e5_etcut_L1EM3: @@ -775,7 +773,7 @@ HLT_e5_etcut_L1EM3: 3: 20 stepFeatures: 0: 137 - 1: 1656 + 1: 1627 2: 190 3: 115 HLT_e5_lhloose_L1EM3: @@ -788,7 +786,7 @@ HLT_e5_lhloose_L1EM3: 4: 5 stepFeatures: 0: 54 - 1: 575 + 1: 566 2: 88 3: 50 4: 6 @@ -802,7 +800,7 @@ HLT_e5_lhloose_noringer_L1EM3: 4: 5 stepFeatures: 0: 56 - 1: 651 + 1: 639 2: 103 3: 55 4: 6 @@ -816,7 +814,7 @@ HLT_e5_lhmedium_L1EM3: 4: 4 stepFeatures: 0: 53 - 1: 570 + 1: 562 2: 86 3: 49 4: 5 @@ -830,7 +828,7 @@ HLT_e5_lhmedium_noringer_L1EM3: 4: 4 stepFeatures: 0: 48 - 1: 528 + 1: 517 2: 81 3: 47 4: 5 @@ -844,7 +842,7 @@ HLT_e5_lhtight_L1EM3: 4: 4 stepFeatures: 0: 51 - 1: 551 + 1: 542 2: 82 3: 47 4: 5 @@ -858,7 +856,7 @@ HLT_e5_lhtight_nod0_L1EM3: 4: 4 stepFeatures: 0: 51 - 1: 551 + 1: 542 2: 82 3: 47 4: 5 @@ -872,7 +870,7 @@ HLT_e5_lhtight_noringer_L1EM3: 4: 4 stepFeatures: 0: 45 - 1: 513 + 1: 501 2: 73 3: 44 4: 5 @@ -886,7 +884,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3: 4: 4 stepFeatures: 0: 45 - 1: 513 + 1: 501 2: 73 3: 44 4: 5 @@ -900,7 +898,7 @@ HLT_e60_lhmedium_L1EM22VHI: 4: 2 stepFeatures: 0: 2 - 1: 34 + 1: 35 2: 4 3: 2 4: 2 @@ -914,7 +912,7 @@ HLT_e60_lhmedium_nod0_L1EM22VHI: 4: 2 stepFeatures: 0: 2 - 1: 34 + 1: 35 2: 4 3: 2 4: 2 @@ -927,7 +925,7 @@ HLT_e7_etcut_L1EM3: 3: 20 stepFeatures: 0: 89 - 1: 1124 + 1: 1103 2: 122 3: 78 HLT_e7_lhmedium_mu24_L1MU20: @@ -944,7 +942,7 @@ HLT_e7_lhmedium_mu24_L1MU20: 8: 1 stepFeatures: 0: 9 - 1: 97 + 1: 90 2: 13 3: 9 4: 2 @@ -1469,7 +1467,7 @@ HLT_j45_csskpf_nojcalib_ftf_L1J20: 1: 17 stepFeatures: 0: 19 - 1: 40 + 1: 39 HLT_j45_cssktc_nojcalib_L1J20: eventCount: 15 stepCounts: @@ -1531,15 +1529,15 @@ HLT_j45_pf_subjesgscIS_ftf_L1J20: 0: 19 1: 51 HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20: - eventCount: 15 + eventCount: 11 stepCounts: 0: 19 1: 18 - 2: 15 + 2: 11 stepFeatures: 0: 19 1: 48 - 2: 29 + 2: 24 HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20: eventCount: 18 stepCounts: @@ -1587,7 +1585,7 @@ HLT_j45_subjesgscIS_ftf_059jvt_L1J15: 1: 18 stepFeatures: 0: 20 - 1: 43 + 1: 44 HLT_j45_subjesgscIS_ftf_L1J15: eventCount: 19 stepCounts: @@ -1597,15 +1595,15 @@ HLT_j45_subjesgscIS_ftf_L1J15: 0: 20 1: 48 HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20: - eventCount: 14 + eventCount: 10 stepCounts: 0: 19 1: 19 - 2: 14 + 2: 10 stepFeatures: 0: 19 1: 47 - 2: 24 + 2: 19 HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20: eventCount: 15 stepCounts: @@ -1615,7 +1613,7 @@ HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20: stepFeatures: 0: 19 1: 47 - 2: 29 + 2: 27 HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20: eventCount: 19 stepCounts: @@ -1703,13 +1701,13 @@ HLT_j85_ftf_L1J20: 0: 19 1: 21 HLT_j85_pf_ftf_L1J20: - eventCount: 13 + eventCount: 12 stepCounts: 0: 19 - 1: 13 + 1: 12 stepFeatures: 0: 19 - 1: 22 + 1: 20 HLT_mb_sptrk_L1RD0_FILLED: eventCount: 0 HLT_mu0_muoncalib_L1MU20: @@ -2077,7 +2075,7 @@ HLT_mu4_l2io_L1MU4: 3: 11 stepFeatures: 0: 15 - 1: 50 + 1: 53 2: 15 3: 15 HLT_mu50_L1MU20: @@ -2405,9 +2403,9 @@ HLT_tau0_perf_ptonly_L1TAU12: 3: 18 stepFeatures: 0: 42 - 1: 27 - 2: 27 - 3: 27 + 1: 26 + 2: 26 + 3: 26 HLT_tau0_perf_ptonly_L1TAU60: eventCount: 3 stepCounts: @@ -2465,9 +2463,9 @@ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 24 1: 17 - 2: 14 - 3: 13 - 4: 13 + 2: 15 + 3: 14 + 4: 14 HLT_tau25_idperf_tracktwo_L1TAU12IM: eventCount: 11 stepCounts: @@ -2480,10 +2478,10 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM: stepFeatures: 0: 24 1: 17 - 2: 14 - 3: 14 - 4: 13 - 5: 13 + 2: 15 + 3: 15 + 4: 14 + 5: 14 HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM: eventCount: 8 stepCounts: @@ -2495,9 +2493,9 @@ HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 - 4: 9 + 2: 13 + 3: 12 + 4: 10 HLT_tau25_looseRNN_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -2507,7 +2505,7 @@ HLT_tau25_looseRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 + 2: 13 HLT_tau25_medium1_tracktwoEF_L1TAU12IM: eventCount: 0 stepCounts: @@ -2518,8 +2516,8 @@ HLT_tau25_medium1_tracktwoEF_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 + 2: 13 + 3: 12 HLT_tau25_medium1_tracktwoMVA_L1TAU12IM: eventCount: 0 stepCounts: @@ -2530,8 +2528,8 @@ HLT_tau25_medium1_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 + 2: 13 + 3: 12 HLT_tau25_medium1_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -2541,7 +2539,7 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 + 2: 13 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM: eventCount: 5 stepCounts: @@ -2553,8 +2551,8 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 + 2: 13 + 3: 12 4: 5 HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: eventCount: 0 @@ -2565,7 +2563,7 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 + 2: 13 HLT_tau25_perf_tracktwoMVA_L1TAU12IM: eventCount: 11 stepCounts: @@ -2577,9 +2575,9 @@ HLT_tau25_perf_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 24 1: 17 - 2: 14 - 3: 13 - 4: 13 + 2: 15 + 3: 14 + 4: 14 HLT_tau25_perf_tracktwo_L1TAU12IM: eventCount: 11 stepCounts: @@ -2592,10 +2590,10 @@ HLT_tau25_perf_tracktwo_L1TAU12IM: stepFeatures: 0: 24 1: 17 - 2: 14 - 3: 14 - 4: 13 - 5: 13 + 2: 15 + 3: 15 + 4: 14 + 5: 14 HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM: eventCount: 4 stepCounts: @@ -2607,8 +2605,8 @@ HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 + 2: 13 + 3: 12 4: 4 HLT_tau25_tightRNN_tracktwo_L1TAU12IM: eventCount: 0 @@ -2619,7 +2617,7 @@ HLT_tau25_tightRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 + 2: 13 HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: eventCount: 8 stepCounts: @@ -2631,9 +2629,9 @@ HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 - 3: 11 - 4: 9 + 2: 13 + 3: 12 + 4: 10 HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -2643,7 +2641,7 @@ HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 15 - 2: 12 + 2: 13 HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM: eventCount: 4 stepCounts: @@ -2655,8 +2653,8 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 20 1: 14 - 2: 11 - 3: 10 + 2: 12 + 3: 11 4: 4 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25: eventCount: 0 @@ -2699,11 +2697,11 @@ HLT_timeburner_L1All: HLT_unconvtrk120_isohpttrack_iaggrmedium_L1XE50: eventCount: 0 HLT_unconvtrk120_isohpttrack_imedium_L1XE50: - eventCount: 6 + eventCount: 7 stepCounts: - 0: 6 + 0: 7 stepFeatures: - 0: 6 + 0: 7 HLT_xe100_cvfpufit_L1XE50: eventCount: 6 stepCounts: @@ -2727,13 +2725,13 @@ HLT_xe100_mhtpufit_em_subjesgscIS_L1XE50: 0: 10 1: 6 HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50: - eventCount: 5 + eventCount: 7 stepCounts: 0: 10 - 1: 5 + 1: 7 stepFeatures: 0: 10 - 1: 5 + 1: 7 HLT_xe100_pfopufit_L1XE50: eventCount: 4 stepCounts: @@ -2743,13 +2741,13 @@ HLT_xe100_pfopufit_L1XE50: 0: 10 1: 4 HLT_xe100_pfsum_L1XE50: - eventCount: 5 + eventCount: 6 stepCounts: 0: 10 - 1: 5 + 1: 6 stepFeatures: 0: 10 - 1: 5 + 1: 6 HLT_xe100_tcpufit_L1XE50: eventCount: 6 stepCounts: @@ -2779,13 +2777,13 @@ HLT_xe110_mht_L1XE50: stepFeatures: 0: 7 HLT_xe110_pfsum_L1XE50: - eventCount: 4 + eventCount: 3 stepCounts: 0: 10 - 1: 4 + 1: 3 stepFeatures: 0: 10 - 1: 4 + 1: 3 HLT_xe110_pfsum_cssk_L1XE50: eventCount: 3 stepCounts: @@ -2795,13 +2793,13 @@ HLT_xe110_pfsum_cssk_L1XE50: 0: 10 1: 3 HLT_xe110_pfsum_vssk_L1XE50: - eventCount: 4 + eventCount: 3 stepCounts: 0: 10 - 1: 4 + 1: 3 stepFeatures: 0: 10 - 1: 4 + 1: 3 HLT_xe110_tc_em_L1XE50: eventCount: 5 stepCounts: @@ -2857,21 +2855,21 @@ HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10: 0: 19 1: 17 HLT_xe30_pfopufit_L1XE10: - eventCount: 15 + eventCount: 16 stepCounts: 0: 19 - 1: 15 + 1: 16 stepFeatures: 0: 19 - 1: 15 + 1: 16 HLT_xe30_pfsum_L1XE10: - eventCount: 17 + eventCount: 16 stepCounts: 0: 19 - 1: 17 + 1: 16 stepFeatures: 0: 19 - 1: 17 + 1: 16 HLT_xe30_pfsum_cssk_L1XE10: eventCount: 16 stepCounts: @@ -2919,17 +2917,17 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrloose_L1XE50: HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrmedium_L1XE50: eventCount: 0 HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50: - eventCount: 5 - stepCounts: - 0: 5 - stepFeatures: - 0: 5 -HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50: eventCount: 6 stepCounts: 0: 6 stepFeatures: 0: 6 +HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50: + eventCount: 7 + stepCounts: + 0: 7 + stepFeatures: + 0: 7 HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50: eventCount: 4 stepCounts: -- GitLab From de0ea07e8491bca454fcf5b4301d6a5843a9d9ee Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Tue, 24 Nov 2020 09:40:17 +0100 Subject: [PATCH 11/20] update monitoring codes --- .../PixelCalibAlgs/Application/Makefile | 33 +++++++++++++++++++ .../PixelCalibAlgs/CMakeLists.txt | 5 --- .../src/PixelAthClusterMonAlg.cxx | 2 -- .../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 11 ------- 4 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Application/Makefile new file mode 100644 index 00000000000..073afc9a5eb --- /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/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt index bf37b9ee028..8ee48bc31d6 100644 --- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt +++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt @@ -20,8 +20,3 @@ atlas_add_component( PixelCalibAlgs src/components/*.cxx LINK_LIBRARIES GaudiKernel InDetByteStreamErrors PixelConditionsData PixelCalibAlgsLib ) -atlas_add_executable( makeInactiveModuleList - Application/makeInactiveModuleList.C - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib ) - diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx index 2fa1fcac7af..b732bb28498 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx @@ -80,7 +80,6 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); - //std::cout << "TESTTEST " << id_hash << " " << iFE << " " << m_pixelCondSummaryTool->isGood(id_hash,pixelID) << std::endl; // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash,pixelID) == true) { index = 0; @@ -113,7 +112,6 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons index = 1; // bad but active modules nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer]; } - //std::cout<<"Index "<barrel_ec(waferID), m_pixelid->layer_disk(waferID) ); if (pixlayer == 99) continue; - int numFE = 16; - if (m_pixelid->barrel_ec(waferID)==0 && m_pixelid->layer_disk(waferID)==0) { - if (m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) { numFE=2; } // IBL Planar - else { numFE=1; } // IBL 3D - } - if (std::abs(m_pixelid->barrel_ec(waferID))==4) { numFE=1; } // DBM - - for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); - } - if (m_pixelCondSummaryTool->isActive(id_hash) == true) { if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) nActive_layer[pixlayer]+=2; else nActive_layer[pixlayer]++; -- GitLab From e2a96074a2f515477130d627f951eff5ceae5257 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Tue, 24 Nov 2020 16:38:07 +0100 Subject: [PATCH 12/20] fix ci-test. --- .../python/PixelConditionsConfig.py | 1 + .../python/PixelConditionsSummaryConfig.py | 7 +++---- InnerDetector/InDetConfig/python/InDetRecToolConfig.py | 3 ++- .../InDetConfig/python/NewTrackingTRTExtensionConfig.py | 7 ++++--- InnerDetector/InDetConfig/python/TRTPreProcessing.py | 7 ++++--- InnerDetector/InDetConfig/python/TrackRecoConfig.py | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py index 0754d2ff4ac..7e6203597a4 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py @@ -364,6 +364,7 @@ def PixelDCSCondTempAlgCfg(flags, name="PixelDCSCondTempAlg", **kwargs): 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")) diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py index d56148f1ac1..1af6d831107 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/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py index 640aec7d2fc..7a6c8c4304e 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/NewTrackingTRTExtensionConfig.py b/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py index f2e3f048b3b..99739a1f85d 100644 --- a/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py +++ b/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py @@ -569,9 +569,10 @@ 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, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg, PixelOfflineCalibCondAlgCfg, PixelDistortionAlgCfg) - top_acc.merge(PixelChargeCalibCondAlgCfg(ConfigFlags)) + from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg, PixelOfflineCalibCondAlgCfg, PixelDistortionAlgCfg) top_acc.merge(PixelConfigCondAlgCfg(ConfigFlags)) + top_acc.merge(PixelDeadMapCondAlgCfg(flags)) + top_acc.merge(PixelChargeCalibCondAlgCfg(ConfigFlags)) top_acc.merge(PixelCablingCondAlgCfg(ConfigFlags)) top_acc.merge(PixelReadoutSpeedAlgCfg(ConfigFlags)) top_acc.merge(PixelOfflineCalibCondAlgCfg(ConfigFlags)) @@ -659,4 +660,4 @@ if __name__ == "__main__": # top_acc.printConfig() top_acc.run(25) - top_acc.store(open("NewTrackingTRTExtensionConfig.pkl", "wb")) \ No newline at end of file + top_acc.store(open("NewTrackingTRTExtensionConfig.pkl", "wb")) diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py index 38f100e267d..fceec6556cc 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)) @@ -333,4 +334,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 0291fe7b237..f70962afb05 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)) -- GitLab From a452c90a5bff9aa88a63a0fff89a4942cf039195 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Wed, 25 Nov 2020 02:24:54 +0100 Subject: [PATCH 13/20] update --- .../python/NewTrackingTRTExtensionConfig.py | 2 +- Tools/PROCTools/python/RunTier0TestsTools.py | 2 +- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 64 ++++++++----------- 3 files changed, 29 insertions(+), 39 deletions(-) diff --git a/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py b/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py index 99739a1f85d..f8688ec3db9 100644 --- a/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py +++ b/InnerDetector/InDetConfig/python/NewTrackingTRTExtensionConfig.py @@ -571,7 +571,7 @@ if __name__ == "__main__": from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg, PixelOfflineCalibCondAlgCfg, PixelDistortionAlgCfg) top_acc.merge(PixelConfigCondAlgCfg(ConfigFlags)) - top_acc.merge(PixelDeadMapCondAlgCfg(flags)) + top_acc.merge(PixelDeadMapCondAlgCfg(ConfigFlags)) top_acc.merge(PixelChargeCalibCondAlgCfg(ConfigFlags)) top_acc.merge(PixelCablingCondAlgCfg(ConfigFlags)) top_acc.merge(PixelReadoutSpeedAlgCfg(ConfigFlags)) diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py index 7372331fbc6..6768dee8b58 100644 --- a/Tools/PROCTools/python/RunTier0TestsTools.py +++ b/Tools/PROCTools/python/RunTier0TestsTools.py @@ -31,7 +31,7 @@ ciRefFileMap = { # OverlayTier0Test_required-test 'overlay-d1498-21.0' : 'v2', 'overlay-d1498-22.0' : 'v38', - 'overlay-d1592-22.0' : 'v1', + 'overlay-d1592-22.0' : 'v2', 'overlay-bkg-21.0' : 'v1', 'overlay-bkg-22.0' : 'v4', 'dataoverlay-d1590-22.0' : 'v4', diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 7a5a754384b..45f5f43c8e1 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -325,7 +325,7 @@ HLT_2mu6_bJpsimumul2io_L12MU6: 3: 2 stepFeatures: 0: 12 - 1: 26 + 1: 28 2: 8 3: 4 HLT_2mu6_l2io_L12MU6: @@ -337,7 +337,7 @@ HLT_2mu6_l2io_L12MU6: 3: 2 stepFeatures: 0: 12 - 1: 26 + 1: 28 2: 8 3: 8 HLT_2mu6_muonqual_L12MU6: @@ -536,16 +536,6 @@ HLT_e17_lhvloose_nod0_L1EM15VH: 4: 5 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3: eventCount: 0 - stepCounts: - 0: 1 - 1: 1 - 2: 1 - 3: 1 - stepFeatures: - 0: 2 - 1: 20 - 2: 3 - 3: 2 HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH: eventCount: 0 HLT_e24_lhmedium_g25_medium_L12EM20VH: @@ -579,13 +569,13 @@ HLT_e26_etcut_L1EM22VHI: 2: 7 3: 7 HLT_e26_lhloose_L1EM15VH: - eventCount: 4 + eventCount: 5 stepCounts: - 0: 5 - 1: 5 - 2: 5 - 3: 5 - 4: 4 + 0: 6 + 1: 6 + 2: 6 + 3: 6 + 4: 5 stepFeatures: 0: 6 1: 79 @@ -609,10 +599,10 @@ HLT_e26_lhloose_L1EM22VHI: HLT_e26_lhmedium_L1EM15VH: eventCount: 4 stepCounts: - 0: 5 - 1: 5 - 2: 5 - 3: 5 + 0: 6 + 1: 6 + 2: 6 + 3: 6 4: 4 stepFeatures: 0: 6 @@ -655,10 +645,10 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI: HLT_e26_lhtight_L1EM15VH: eventCount: 4 stepCounts: - 0: 5 - 1: 5 - 2: 5 - 3: 5 + 0: 6 + 1: 6 + 2: 6 + 3: 6 4: 4 stepFeatures: 0: 6 @@ -787,13 +777,13 @@ HLT_e5_etcut_L1EM3: 2: 190 3: 115 HLT_e5_lhloose_L1EM3: - eventCount: 4 + eventCount: 5 stepCounts: 0: 18 1: 18 2: 18 3: 18 - 4: 4 + 4: 5 stepFeatures: 0: 54 1: 566 @@ -1933,17 +1923,17 @@ HLT_mu24_L1MU20: 2: 5 3: 5 HLT_mu24_idperf_L1MU20: - eventCount: 5 + eventCount: 4 stepCounts: + 0: 5 + 1: 5 + 2: 4 + 3: 4 + stepFeatures: 0: 6 1: 6 2: 5 3: 5 - stepFeatures: - 0: 7 - 1: 7 - 2: 6 - 3: 6 HLT_mu24_ivarmedium_L1MU20: eventCount: 2 stepCounts: @@ -2067,7 +2057,7 @@ HLT_mu35_ivarmedium_L1MU20: stepCounts: 0: 8 1: 5 - 2: 3 + 2: 4 3: 2 4: 1 stepFeatures: @@ -2079,8 +2069,8 @@ HLT_mu35_ivarmedium_L1MU20: HLT_mu4_l2io_L1MU4: eventCount: 11 stepCounts: - 0: 11 - 1: 11 + 0: 12 + 1: 12 2: 11 3: 11 stepFeatures: -- GitLab From 8a970b13187760888834d87a2c8c1e77896459af Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Mon, 21 Dec 2020 05:53:45 +0100 Subject: [PATCH 14/20] update --- .../PixelMonitoring/src/PixelAthClusterMonAlg.cxx | 2 +- Tools/PROCTools/data/master_q221_AOD_digest.ref | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx index 0ab864f80a5..1aba684d07f 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx @@ -81,7 +81,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons if (std::abs(m_pixelid->barrel_ec(waferID))==4) { numFE=1; } // DBM for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); + Identifier pixelID = m_pixelCablingSvc->getPixelIdfromHash(id_hash, iFE, 1, 1); // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash,pixelID) == true) { index = 0; diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref index cae7bd3ad60..0fbea1060ec 100644 --- a/Tools/PROCTools/data/master_q221_AOD_digest.ref +++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref @@ -1,13 +1,13 @@ run event nTopo nIdTracks nJets nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot 284500 87473001 122 130 4 1 8 2 6 7 4 3 - 284500 87473014 83 79 6 0 10 1 9 7 5 2 + 284500 87473014 83 80 6 0 10 1 9 7 5 2 284500 87473022 38 29 4 0 4 1 3 3 2 1 284500 87473032 30 33 4 1 10 4 6 5 2 3 284500 87473037 62 38 7 0 12 2 10 6 4 2 - 284500 87473040 107 93 10 1 17 1 16 11 6 5 + 284500 87473040 107 96 10 1 17 1 16 10 5 5 284500 87473051 140 112 11 1 16 1 15 23 16 7 284500 87473063 62 76 5 2 7 1 6 6 4 2 - 284500 87473068 25 33 1 1 0 0 0 0 0 0 + 284500 87473068 25 34 1 1 0 0 0 0 0 0 284500 87473075 60 85 6 0 5 0 5 6 5 1 284500 87473084 78 85 7 2 14 1 13 9 3 6 284500 87473091 41 49 3 0 4 2 2 4 2 2 @@ -15,7 +15,7 @@ 284500 87473104 64 62 6 0 5 1 4 4 3 1 284500 87473114 89 81 7 2 12 1 11 9 6 3 284500 87473121 93 100 6 3 15 4 11 8 6 2 - 284500 87473132 84 58 9 1 12 0 12 3 3 0 + 284500 87473132 84 57 9 1 12 0 12 3 3 0 284500 87473137 94 70 8 3 15 0 15 8 8 0 284500 87473144 78 65 7 1 8 2 6 8 6 2 284500 87473154 86 88 7 0 13 3 10 10 4 6 -- GitLab From e029c10d496c5c0eafd29d5634a6e8b4cbc6f412 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Tue, 22 Dec 2020 01:36:17 +0100 Subject: [PATCH 15/20] update monitoring code --- .../src/PixelAthClusterMonAlg.cxx | 74 ++++++++----------- 1 file changed, 31 insertions(+), 43 deletions(-) diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx index 1aba684d07f..f2025d05bc8 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx @@ -3,7 +3,6 @@ */ #include "PixelAthClusterMonAlg.h" -#include "PixelCabling/IPixelCablingSvc.h" PixelAthClusterMonAlg::PixelAthClusterMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) : AthMonitorAlgorithm(name, pSvcLocator), @@ -72,49 +71,38 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) ); if (pixlayer == 99) continue; - - int numFE = 16; - if (m_pixelid->barrel_ec(waferID)==0 && m_pixelid->layer_disk(waferID)==0) { - if (m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) { numFE=2; } // IBL Planar - else { numFE=1; } // IBL 3D - } - if (std::abs(m_pixelid->barrel_ec(waferID))==4) { numFE=1; } // DBM - - for (int iFE=0; iFEgetPixelIdfromHash(id_hash, iFE, 1, 1); - // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess - if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash,pixelID) == true) { - index = 0; - } else if (m_pixelCondSummaryTool->isActive(id_hash) == false) { - index = 2; // inactive or bad modules - nDisabledMod[pixlayer]++; - getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval); - switch (pixlayer) { - case PixLayers::kECA : - clusPerEventArray.DA[phiMod][etaMod] = -1; - break; - case PixLayers::kECC : - clusPerEventArray.DC[phiMod][etaMod] = -1; - break; - case PixLayers::kB0 : - clusPerEventArray.B0[phiMod][etaMod] = -1; - break; - case PixLayers::kB1 : - clusPerEventArray.B1[phiMod][etaMod] = -1; - break; - case PixLayers::kB2 : - clusPerEventArray.B2[phiMod][etaMod] = -1; - break; - case PixLayers::kIBL : - clusPerEventArray.IBL[phiMod][etaMod] = -1; - if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1; - break; - } - } else { - index = 1; // bad but active modules - nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer]; + + // read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess + if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash) == true) { + index = 0; + } else if (m_pixelCondSummaryTool->isActive(id_hash) == false) { + index = 2; // inactive or bad modules + nDisabledMod[pixlayer]++; + getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval); + switch (pixlayer) { + case PixLayers::kECA : + clusPerEventArray.DA[phiMod][etaMod] = -1; + break; + case PixLayers::kECC : + clusPerEventArray.DC[phiMod][etaMod] = -1; + break; + case PixLayers::kB0 : + clusPerEventArray.B0[phiMod][etaMod] = -1; + break; + case PixLayers::kB1 : + clusPerEventArray.B1[phiMod][etaMod] = -1; + break; + case PixLayers::kB2 : + clusPerEventArray.B2[phiMod][etaMod] = -1; + break; + case PixLayers::kIBL : + clusPerEventArray.IBL[phiMod][etaMod] = -1; + if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1; + break; } - Map_Of_Modules_Status.add(pixlayer, waferID, m_pixelid, index); + } else { + index = 1; // bad but active modules + nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer]; } Map_Of_Modules_Status.add(pixlayer, waferID, m_pixelid, index); -- GitLab From c74148e29187b7e4768c3b9071c2d9ee50a9eb10 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Tue, 19 Jan 2021 10:17:06 +0100 Subject: [PATCH 16/20] final test --- .../PixelDigitization/python/PixelDigitizationConfig.py | 1 - 1 file changed, 1 deletion(-) diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py index 7a579ed4143..d36dd6eed62 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py @@ -149,7 +149,6 @@ def PixelConfigCondAlg_MC(): ############################################################################################ # Set up Pixel Module data (2018 condition) ############################################################################################ - from IOVDbSvc.CondDB import conddb ################# # Module status # -- GitLab From a7dc764929677f33c7e8146d55d7c67f65c4e62f Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Wed, 20 Jan 2021 09:02:08 +0100 Subject: [PATCH 17/20] update pileup reference --- Tools/PROCTools/python/RunTier0TestsTools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py index 1ac3f486062..7ba90f892d8 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', } -- GitLab From 02aa34486a23ede7d4e44789cc17b475981037da Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Thu, 21 Jan 2021 18:41:59 +0100 Subject: [PATCH 18/20] update trigger reference --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 322 ++++++++++-------- 1 file changed, 185 insertions(+), 137 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 83a67b6935e..1fc5fe8efc0 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: @@ -159,11 +159,13 @@ HLT_2mu10_bJpsimumu_L12MU10: 1: 2 2: 1 3: 1 + 4: 1 stepFeatures: 0: 8 1: 6 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu10_bUpsimumu_L12MU10: eventCount: 0 stepCounts: @@ -171,11 +173,13 @@ HLT_2mu10_bUpsimumu_L12MU10: 1: 2 2: 1 3: 1 + 4: 1 stepFeatures: 0: 8 1: 6 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu14_L12MU10: eventCount: 1 stepCounts: @@ -301,11 +305,13 @@ HLT_2mu4_bDimu_L12MU4: 1: 3 2: 1 3: 1 + 4: 1 stepFeatures: 0: 12 1: 10 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu4_bJpsimumu_L12MU4: eventCount: 0 stepCounts: @@ -313,11 +319,13 @@ HLT_2mu4_bJpsimumu_L12MU4: 1: 3 2: 1 3: 1 + 4: 1 stepFeatures: 0: 12 1: 10 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu4_bUpsimumu_L12MU4: eventCount: 0 stepCounts: @@ -325,11 +333,13 @@ HLT_2mu4_bUpsimumu_L12MU4: 1: 3 2: 1 3: 1 + 4: 1 stepFeatures: 0: 12 1: 10 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu4_muonqual_L12MU4: eventCount: 2 stepCounts: @@ -381,11 +391,13 @@ HLT_2mu6_bJpsimumu_L12MU6: 1: 3 2: 1 3: 1 + 4: 1 stepFeatures: 0: 12 1: 10 2: 4 - 3: 2 + 3: 4 + 4: 2 HLT_2mu6_bJpsimumul2io_L12MU6: eventCount: 0 stepCounts: @@ -393,11 +405,13 @@ HLT_2mu6_bJpsimumul2io_L12MU6: 1: 2 2: 2 3: 2 + 4: 2 stepFeatures: 0: 12 1: 14 2: 8 - 3: 4 + 3: 8 + 4: 4 HLT_2mu6_l2io_L12MU6: eventCount: 2 stepCounts: @@ -436,8 +450,18 @@ HLT_3j200_subresjesgscIS_ftf_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_3mu4_bJpsi_L13MU4: + eventCount: 0 +HLT_3mu4_bPhi_L13MU4: + eventCount: 0 +HLT_3mu4_bTau_L13MU4: + eventCount: 0 +HLT_3mu4_bUpsi_L13MU4: + eventCount: 0 HLT_3mu6_L13MU6: eventCount: 0 +HLT_3mu6_bDimu_L13MU6: + eventCount: 0 HLT_3mu6_msonly_L13MU6: eventCount: 0 HLT_3mu8_msonly_L13MU6: @@ -458,6 +482,8 @@ HLT_4j120_subresjesgscIS_ftf_L13J50: 0: 1 HLT_4mu4_L14MU4: eventCount: 0 +HLT_4mu4_bDimu6000_L14MU4: + eventCount: 0 HLT_5j70_0eta240_L14J20: eventCount: 1 stepCounts: @@ -465,11 +491,13 @@ HLT_5j70_0eta240_L14J20: stepFeatures: 0: 5 HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15: - eventCount: 0 + eventCount: 1 stepCounts: 0: 9 + 1: 1 stepFeatures: 0: 9 + 1: 5 HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15: eventCount: 1 stepCounts: @@ -670,7 +698,7 @@ HLT_e20_lhmedium_e15_idperf_Zee_L12EM3: 4: 19 stepFeatures: 0: 176 - 1: 715 + 1: 705 2: 330 3: 158 4: 114 @@ -753,7 +781,7 @@ HLT_e26_etcut_L1EM22VHI: 3: 5 stepFeatures: 0: 7 - 1: 30 + 1: 29 2: 6 3: 6 HLT_e26_idperf_L1EM24VHI: @@ -1001,9 +1029,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: @@ -1013,7 +1041,7 @@ HLT_e5_etcut_L1EM3: 3: 20 stepFeatures: 0: 137 - 1: 459 + 1: 449 2: 173 3: 102 HLT_e5_idperf_L1EM3: @@ -1038,7 +1066,7 @@ HLT_e5_lhloose_L1EM3: 4: 6 stepFeatures: 0: 60 - 1: 146 + 1: 138 2: 81 3: 46 4: 7 @@ -1066,7 +1094,7 @@ HLT_e5_lhmedium_L1EM3: 4: 4 stepFeatures: 0: 58 - 1: 132 + 1: 125 2: 76 3: 44 4: 5 @@ -1080,7 +1108,7 @@ HLT_e5_lhmedium_noringer_L1EM3: 4: 4 stepFeatures: 0: 48 - 1: 99 + 1: 98 2: 66 3: 38 4: 5 @@ -1094,7 +1122,7 @@ HLT_e5_lhtight_L1EM3: 4: 4 stepFeatures: 0: 57 - 1: 129 + 1: 123 2: 74 3: 43 4: 5 @@ -1108,7 +1136,7 @@ HLT_e5_lhtight_gsf_L1EM3: 4: 4 stepFeatures: 0: 57 - 1: 129 + 1: 123 2: 74 3: 43 4: 5 @@ -1122,7 +1150,7 @@ HLT_e5_lhtight_nod0_L1EM3: 4: 4 stepFeatures: 0: 57 - 1: 129 + 1: 123 2: 74 3: 43 4: 5 @@ -1136,7 +1164,7 @@ HLT_e5_lhtight_noringer_L1EM3: 4: 4 stepFeatures: 0: 45 - 1: 94 + 1: 93 2: 61 3: 36 4: 5 @@ -1150,7 +1178,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3: 4: 4 stepFeatures: 0: 45 - 1: 94 + 1: 93 2: 61 3: 36 4: 5 @@ -1191,7 +1219,7 @@ HLT_e7_etcut_L1EM3: 3: 20 stepFeatures: 0: 89 - 1: 362 + 1: 354 2: 117 3: 73 HLT_e7_lhmedium_mu24_L1MU20: @@ -1883,15 +1911,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: @@ -1925,13 +1953,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: @@ -1947,27 +1975,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: @@ -1976,8 +2004,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: @@ -2062,6 +2090,8 @@ HLT_j85_pf_ftf_L1J20: stepFeatures: 0: 19 1: 22 +HLT_mb_sp_L1RD0_FILLED: + eventCount: 0 HLT_mb_sptrk_L1RD0_FILLED: eventCount: 0 HLT_mu0_muoncalib_L1MU20: @@ -2101,57 +2131,71 @@ HLT_mu11_mu6_bBmumu_L1MU11_2MU6: stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bDimu2700_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bDimu_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bPhi_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bTau_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6: eventCount: 0 stepCounts: 0: 3 1: 1 + 2: 1 stepFeatures: 0: 6 1: 2 + 2: 2 HLT_mu14_L1MU10: eventCount: 7 stepCounts: @@ -2199,8 +2243,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 @@ -2299,17 +2343,17 @@ HLT_mu24_L1MU20: 2: 6 3: 6 HLT_mu24_idperf_L1MU20: - eventCount: 4 + eventCount: 5 stepCounts: - 0: 5 - 1: 5 - 2: 4 - 3: 4 - stepFeatures: 0: 6 1: 6 2: 5 3: 5 + stepFeatures: + 0: 7 + 1: 7 + 2: 6 + 3: 6 HLT_mu24_ivarmedium_L1MU20: eventCount: 3 stepCounts: @@ -2399,13 +2443,13 @@ HLT_mu28_ivarmedium_L1MU20: HLT_mu4_l2io_L1MU4: eventCount: 11 stepCounts: - 0: 12 - 1: 12 + 0: 11 + 1: 11 2: 11 3: 11 stepFeatures: 0: 14 - 1: 28 + 1: 29 2: 15 3: 15 HLT_mu50_L1MU20: @@ -2452,6 +2496,10 @@ HLT_mu60_L1MU20: 1: 7 2: 1 3: 1 +HLT_mu6_2mu4_bDimu2700_L1MU6_3MU4: + eventCount: 0 +HLT_mu6_2mu4_bDimu6000_L1MU6_3MU4: + eventCount: 0 HLT_mu6_L1MU6: eventCount: 10 stepCounts: @@ -2799,9 +2847,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: @@ -2813,9 +2861,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: @@ -2828,10 +2876,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_tracktwoMVABDT_L1TAU12IM: eventCount: 9 stepCounts: @@ -2843,8 +2891,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 @@ -2857,9 +2905,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: @@ -2869,7 +2917,7 @@ HLT_tau25_looseRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 + 2: 14 HLT_tau25_medium1_tracktwoEF_L1TAU12IM: eventCount: 0 stepCounts: @@ -2880,8 +2928,8 @@ HLT_tau25_medium1_tracktwoEF_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 - 3: 12 + 2: 14 + 3: 14 HLT_tau25_medium1_tracktwoMVABDT_L1TAU12IM: eventCount: 0 stepCounts: @@ -2892,8 +2940,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: @@ -2904,8 +2952,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: @@ -2915,34 +2963,34 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 + 2: 14 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 @@ -2953,7 +3001,7 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 + 2: 14 HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: eventCount: 12 stepCounts: @@ -2965,9 +3013,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: @@ -2979,9 +3027,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: @@ -2994,10 +3042,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_tracktwoMVABDT_L1TAU12IM: eventCount: 7 stepCounts: @@ -3009,8 +3057,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 @@ -3023,8 +3071,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 @@ -3035,7 +3083,7 @@ HLT_tau25_tightRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 + 2: 14 HLT_tau25_verylooseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 9 stepCounts: @@ -3047,8 +3095,8 @@ HLT_tau25_verylooseRNN_tracktwoMVABDT_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 13 - 3: 13 + 2: 14 + 3: 14 4: 12 HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: eventCount: 9 @@ -3061,9 +3109,9 @@ HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 - 3: 12 - 4: 11 + 2: 14 + 3: 14 + 4: 12 HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -3073,34 +3121,34 @@ HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 + 2: 14 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_tau80_medium1_tracktwo_L1TAU60: eventCount: 0 @@ -3135,11 +3183,11 @@ 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: 7 stepCounts: @@ -3169,21 +3217,21 @@ HLT_xe100_mhtpufit_em_subjesgscIS_L1XE50: 0: 10 1: 6 HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50: - eventCount: 7 + eventCount: 5 stepCounts: 0: 10 - 1: 7 + 1: 5 stepFeatures: 0: 10 - 1: 7 + 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: @@ -3299,13 +3347,13 @@ HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10: 0: 19 1: 17 HLT_xe30_pfopufit_L1XE10: - eventCount: 16 + eventCount: 15 stepCounts: 0: 19 - 1: 16 + 1: 15 stepFeatures: 0: 19 - 1: 16 + 1: 15 HLT_xe30_pfsum_L1XE10: eventCount: 16 stepCounts: @@ -3363,23 +3411,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: -- GitLab From c51bb3fbd9be21a1e59f93fc74f514968482128b Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Fri, 22 Jan 2021 03:48:33 +0100 Subject: [PATCH 19/20] update trigger reference --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 504 ++---------------- 1 file changed, 56 insertions(+), 448 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index c39ff7ef6f4..1fc5fe8efc0 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -618,56 +618,6 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10: 6: 4 7: 4 8: 4 -HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1EM15VHI_2TAU12IM_4J12: - eventCount: 2 - stepCounts: - 0: 3 - 1: 2 - 2: 2 - 3: 2 - 4: 2 - 5: 2 - 6: 2 - 7: 2 - 8: 2 - 9: 2 - stepFeatures: - 0: 11 - 1: 9 - 2: 8 - 3: 8 - 4: 8 - 5: 8 - 6: 5 - 7: 5 - 8: 5 - 9: 4 -HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35: - eventCount: 1 - stepCounts: - 0: 3 - 1: 2 - 2: 2 - 3: 2 - 4: 2 - 5: 2 - 6: 2 - 7: 2 - 8: 2 - 9: 2 - 10: 1 - stepFeatures: - 0: 13 - 1: 10 - 2: 9 - 3: 9 - 4: 9 - 5: 9 - 6: 8 - 7: 7 - 8: 7 - 9: 6 - 10: 3 HLT_e17_lhvloose_L1EM15VH: eventCount: 5 stepCounts: @@ -2258,74 +2208,6 @@ HLT_mu14_L1MU10: 1: 8 2: 8 3: 8 -HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU12IM_3J12: - eventCount: 3 - stepCounts: - 0: 6 - 1: 5 - 2: 5 - 3: 5 - 4: 5 - 5: 4 - 6: 4 - 7: 4 - 8: 3 - stepFeatures: - 0: 16 - 1: 14 - 2: 14 - 3: 14 - 4: 14 - 5: 9 - 6: 8 - 7: 8 - 8: 6 -HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU20IM: - eventCount: 3 - stepCounts: - 0: 5 - 1: 5 - 2: 5 - 3: 5 - 4: 5 - 5: 4 - 6: 4 - 7: 4 - 8: 3 - stepFeatures: - 0: 14 - 1: 14 - 2: 14 - 3: 14 - 4: 14 - 5: 9 - 6: 8 - 7: 8 - 8: 6 -HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35: - eventCount: 1 - stepCounts: - 0: 4 - 1: 3 - 2: 3 - 3: 3 - 4: 3 - 5: 3 - 6: 3 - 7: 3 - 8: 2 - 9: 1 - stepFeatures: - 0: 15 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - 5: 10 - 6: 9 - 7: 9 - 8: 6 - 9: 3 HLT_mu20_2mu4noL1_L1MU20: eventCount: 1 stepCounts: @@ -2888,6 +2770,8 @@ HLT_noalg_zb_L1ZB: eventCount: 0 HLT_sct_noise_SCTPEB_L1RD0_EMPTY: eventCount: 0 +HLT_tau0_perf_ptonly_L1TAU100: + eventCount: 0 HLT_tau0_perf_ptonly_L1TAU12: eventCount: 16 stepCounts: @@ -2912,8 +2796,6 @@ HLT_tau0_perf_ptonly_L1TAU60: 1: 3 2: 3 3: 3 -HLT_tau160_idperf_ptonly_L1TAU100: - eventCount: 0 HLT_tau160_idperf_track_L1TAU100: eventCount: 0 HLT_tau160_idperf_tracktwoMVABDT_L1TAU100: @@ -2922,60 +2804,24 @@ HLT_tau160_idperf_tracktwoMVA_L1TAU100: eventCount: 0 HLT_tau160_idperf_tracktwo_L1TAU100: eventCount: 0 -HLT_tau160_medium1_track_L1TAU100: - eventCount: 0 -HLT_tau160_medium1_tracktwoMVABDT_L1TAU100: - eventCount: 0 -HLT_tau160_medium1_tracktwoMVA_L1TAU100: +HLT_tau160_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau160_medium1_tracktwo_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_track_L1TAU100: - eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 -HLT_tau160_perf_track_L1TAU100: - eventCount: 0 HLT_tau160_perf_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwoMVA_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwo_L1TAU100: eventCount: 0 -HLT_tau200_medium1_track_L1TAU100: - eventCount: 0 -HLT_tau200_medium1_tracktwoMVABDT_L1TAU100: - eventCount: 0 -HLT_tau200_medium1_tracktwoMVA_L1TAU100: - eventCount: 0 -HLT_tau200_medium1_tracktwo_L1TAU100: - eventCount: 0 -HLT_tau200_mediumRNN_ptonly_L1TAU100: - eventCount: 0 -HLT_tau200_mediumRNN_track_L1TAU100: - eventCount: 0 -HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100: +HLT_tau200_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau200_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 -HLT_tau25_idperf_ptonly_L1TAU12IM: - eventCount: 11 - stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 HLT_tau25_idperf_track_L1TAU12IM: eventCount: 11 stepCounts: @@ -3030,18 +2876,10 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM: stepFeatures: 0: 24 1: 16 - 2: 14 - 3: 14 - 4: 14 - 5: 14 -HLT_tau25_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 + 2: 16 + 3: 16 + 4: 16 + 5: 16 HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 9 stepCounts: @@ -3079,15 +2917,19 @@ HLT_tau25_looseRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 -HLT_tau25_medium1_track_L1TAU12IM: + 2: 14 +HLT_tau25_medium1_tracktwoEF_L1TAU12IM: eventCount: 0 stepCounts: 0: 12 - 1: 9 + 1: 10 + 2: 10 + 3: 10 stepFeatures: 0: 22 - 1: 13 + 1: 14 + 2: 14 + 3: 14 HLT_tau25_medium1_tracktwoMVABDT_L1TAU12IM: eventCount: 0 stepCounts: @@ -3121,15 +2963,7 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 -HLT_tau25_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 + 2: 14 HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 7 stepCounts: @@ -3167,21 +3001,7 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 -HLT_tau25_perf_track_L1TAU12IM: - eventCount: 11 - stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - 4: 11 - stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 - 4: 15 + 2: 14 HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: eventCount: 12 stepCounts: @@ -3222,18 +3042,10 @@ HLT_tau25_perf_tracktwo_L1TAU12IM: stepFeatures: 0: 24 1: 16 - 2: 14 - 3: 14 - 4: 14 - 5: 14 -HLT_tau25_tightRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 + 2: 16 + 3: 16 + 4: 16 + 5: 16 HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 7 stepCounts: @@ -3271,145 +3083,45 @@ HLT_tau25_tightRNN_tracktwo_L1TAU12IM: stepFeatures: 0: 22 1: 14 - 2: 12 -HLT_tau35_idperf_ptonly_L1TAU12IM: - eventCount: 11 - stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 -HLT_tau35_idperf_track_L1TAU12IM: - eventCount: 11 - stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - 4: 11 - stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 - 4: 15 -HLT_tau35_idperf_tracktwoMVABDT_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - stepFeatures: - 0: 24 - 1: 16 - 2: 15 - 3: 15 - 4: 15 -HLT_tau35_idperf_tracktwoMVA_L1TAU12IM: - eventCount: 12 + 2: 14 +HLT_tau25_verylooseRNN_tracktwoMVABDT_L1TAU12IM: + eventCount: 9 stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 + 0: 12 + 1: 10 + 2: 10 + 3: 10 + 4: 9 stepFeatures: - 0: 24 - 1: 16 + 0: 22 + 1: 14 2: 14 3: 14 - 4: 14 -HLT_tau35_idperf_tracktwo_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 4: 12 - 5: 12 +HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: + eventCount: 9 + stepCounts: + 0: 12 + 1: 10 + 2: 10 + 3: 10 + 4: 9 stepFeatures: - 0: 24 - 1: 16 + 0: 22 + 1: 14 2: 14 3: 14 - 4: 14 - 5: 14 -HLT_tau35_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 8 - stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM: - eventCount: 8 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - 3: 9 - 4: 8 - stepFeatures: - 0: 20 - 1: 13 - 2: 12 - 3: 12 - 4: 11 -HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM: - eventCount: 8 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - 3: 9 - 4: 8 - stepFeatures: - 0: 20 - 1: 13 - 2: 11 - 3: 11 - 4: 10 -HLT_tau35_looseRNN_tracktwo_L1TAU12IM: + 4: 12 +HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: - 0: 11 - 1: 9 - 2: 9 - stepFeatures: - 0: 19 - 1: 12 + 0: 12 + 1: 10 2: 10 -HLT_tau35_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 8 stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM: - eventCount: 7 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - 3: 9 - 4: 7 - stepFeatures: - 0: 20 - 1: 13 - 2: 12 - 3: 12 - 4: 8 + 0: 22 + 1: 14 + 2: 14 HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM: eventCount: 6 stepCounts: @@ -3438,120 +3150,16 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J2 2: 6 3: 6 4: 2 -HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - stepFeatures: - 0: 19 - 1: 12 - 2: 10 -HLT_tau35_perf_track_L1TAU12IM: - eventCount: 11 - stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - 4: 11 - stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 - 4: 15 -HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - stepFeatures: - 0: 24 - 1: 16 - 2: 15 - 3: 15 - 4: 15 -HLT_tau35_perf_tracktwoMVA_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - stepFeatures: - 0: 24 - 1: 16 - 2: 14 - 3: 14 - 4: 14 -HLT_tau35_perf_tracktwo_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - 5: 12 - stepFeatures: - 0: 24 - 1: 16 - 2: 14 - 3: 14 - 4: 14 - 5: 14 -HLT_tau35_tightRNN_track_L1TAU12IM: +HLT_tau80_medium1_tracktwo_L1TAU60: eventCount: 0 stepCounts: - 0: 11 - 1: 8 - stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM: - eventCount: 6 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - 3: 9 - 4: 6 - stepFeatures: - 0: 20 - 1: 13 - 2: 12 - 3: 12 - 4: 6 -HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM: - eventCount: 6 - stepCounts: - 0: 11 - 1: 9 - 2: 9 - 3: 9 - 4: 6 - stepFeatures: - 0: 20 - 1: 13 - 2: 11 - 3: 11 - 4: 6 -HLT_tau35_tightRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 9 - 2: 9 + 0: 4 + 1: 1 + 2: 1 stepFeatures: - 0: 19 - 1: 12 - 2: 10 + 0: 4 + 1: 1 + 2: 1 HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I: eventCount: 0 stepCounts: -- GitLab From 57916733620c3f045ab0f6247751d4ea2038c8c0 Mon Sep 17 00:00:00 2001 From: Soshi Tsuno Date: Fri, 22 Jan 2021 09:20:36 +0100 Subject: [PATCH 20/20] update trigger reference --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 484 ++++++++++++++++-- 1 file changed, 437 insertions(+), 47 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 1fc5fe8efc0..5c683a3be96 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -618,6 +618,56 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10: 6: 4 7: 4 8: 4 +HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1EM15VHI_2TAU12IM_4J12: + eventCount: 2 + stepCounts: + 0: 3 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 2 + 6: 2 + 7: 2 + 8: 2 + 9: 2 + stepFeatures: + 0: 11 + 1: 9 + 2: 8 + 3: 8 + 4: 8 + 5: 8 + 6: 5 + 7: 5 + 8: 5 + 9: 4 +HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35: + eventCount: 1 + stepCounts: + 0: 3 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 2 + 6: 2 + 7: 2 + 8: 2 + 9: 2 + 10: 1 + stepFeatures: + 0: 13 + 1: 10 + 2: 9 + 3: 9 + 4: 9 + 5: 9 + 6: 8 + 7: 8 + 8: 8 + 9: 6 + 10: 3 HLT_e17_lhvloose_L1EM15VH: eventCount: 5 stepCounts: @@ -2208,6 +2258,72 @@ HLT_mu14_L1MU10: 1: 8 2: 8 3: 8 +HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU12IM_3J12: + eventCount: 2 + stepCounts: + 0: 6 + 1: 5 + 2: 5 + 3: 5 + 4: 5 + 5: 4 + 6: 4 + 7: 4 + 8: 2 + stepFeatures: + 0: 16 + 1: 14 + 2: 14 + 3: 14 + 4: 14 + 5: 9 + 6: 9 + 7: 9 + 8: 4 +HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRtt_L1MU10_TAU20IM: + eventCount: 2 + stepCounts: + 0: 5 + 1: 5 + 2: 5 + 3: 5 + 4: 5 + 5: 4 + 6: 4 + 7: 4 + 8: 2 + stepFeatures: + 0: 14 + 1: 14 + 2: 14 + 3: 14 + 4: 14 + 5: 9 + 6: 9 + 7: 9 + 8: 4 +HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35: + eventCount: 0 + stepCounts: + 0: 4 + 1: 3 + 2: 3 + 3: 3 + 4: 3 + 5: 3 + 6: 3 + 7: 3 + 8: 1 + stepFeatures: + 0: 15 + 1: 12 + 2: 12 + 3: 12 + 4: 12 + 5: 10 + 6: 10 + 7: 10 + 8: 3 HLT_mu20_2mu4noL1_L1MU20: eventCount: 1 stepCounts: @@ -2770,8 +2886,6 @@ HLT_noalg_zb_L1ZB: eventCount: 0 HLT_sct_noise_SCTPEB_L1RD0_EMPTY: eventCount: 0 -HLT_tau0_perf_ptonly_L1TAU100: - eventCount: 0 HLT_tau0_perf_ptonly_L1TAU12: eventCount: 16 stepCounts: @@ -2796,6 +2910,8 @@ HLT_tau0_perf_ptonly_L1TAU60: 1: 3 2: 3 3: 3 +HLT_tau160_idperf_ptonly_L1TAU100: + eventCount: 0 HLT_tau160_idperf_track_L1TAU100: eventCount: 0 HLT_tau160_idperf_tracktwoMVABDT_L1TAU100: @@ -2804,24 +2920,60 @@ HLT_tau160_idperf_tracktwoMVA_L1TAU100: eventCount: 0 HLT_tau160_idperf_tracktwo_L1TAU100: eventCount: 0 -HLT_tau160_medium1_tracktwoEF_L1TAU100: +HLT_tau160_medium1_track_L1TAU100: + eventCount: 0 +HLT_tau160_medium1_tracktwoMVABDT_L1TAU100: + eventCount: 0 +HLT_tau160_medium1_tracktwoMVA_L1TAU100: eventCount: 0 HLT_tau160_medium1_tracktwo_L1TAU100: eventCount: 0 +HLT_tau160_mediumRNN_track_L1TAU100: + eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 +HLT_tau160_mediumRNN_tracktwo_L1TAU100: + eventCount: 0 +HLT_tau160_perf_track_L1TAU100: + eventCount: 0 HLT_tau160_perf_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwoMVA_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwo_L1TAU100: eventCount: 0 -HLT_tau200_medium1_tracktwoEF_L1TAU100: +HLT_tau200_medium1_track_L1TAU100: + eventCount: 0 +HLT_tau200_medium1_tracktwoMVABDT_L1TAU100: + eventCount: 0 +HLT_tau200_medium1_tracktwoMVA_L1TAU100: + eventCount: 0 +HLT_tau200_medium1_tracktwo_L1TAU100: + eventCount: 0 +HLT_tau200_mediumRNN_ptonly_L1TAU100: + eventCount: 0 +HLT_tau200_mediumRNN_track_L1TAU100: + eventCount: 0 +HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 +HLT_tau200_mediumRNN_tracktwo_L1TAU100: + eventCount: 0 +HLT_tau25_idperf_ptonly_L1TAU12IM: + eventCount: 11 + stepCounts: + 0: 14 + 1: 11 + 2: 11 + 3: 11 + stepFeatures: + 0: 24 + 1: 15 + 2: 15 + 3: 15 HLT_tau25_idperf_track_L1TAU12IM: eventCount: 11 stepCounts: @@ -2880,6 +3032,14 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM: 3: 16 4: 16 5: 16 +HLT_tau25_looseRNN_track_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 12 + 1: 9 + stepFeatures: + 0: 22 + 1: 13 HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 9 stepCounts: @@ -2918,18 +3078,14 @@ HLT_tau25_looseRNN_tracktwo_L1TAU12IM: 0: 22 1: 14 2: 14 -HLT_tau25_medium1_tracktwoEF_L1TAU12IM: +HLT_tau25_medium1_track_L1TAU12IM: eventCount: 0 stepCounts: 0: 12 - 1: 10 - 2: 10 - 3: 10 + 1: 9 stepFeatures: 0: 22 - 1: 14 - 2: 14 - 3: 14 + 1: 13 HLT_tau25_medium1_tracktwoMVABDT_L1TAU12IM: eventCount: 0 stepCounts: @@ -2964,6 +3120,14 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: 0: 22 1: 14 2: 14 +HLT_tau25_mediumRNN_track_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 12 + 1: 9 + stepFeatures: + 0: 22 + 1: 13 HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 7 stepCounts: @@ -3002,6 +3166,20 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: 0: 22 1: 14 2: 14 +HLT_tau25_perf_track_L1TAU12IM: + eventCount: 11 + stepCounts: + 0: 14 + 1: 11 + 2: 11 + 3: 11 + 4: 11 + stepFeatures: + 0: 24 + 1: 15 + 2: 15 + 3: 15 + 4: 15 HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: eventCount: 12 stepCounts: @@ -3046,6 +3224,14 @@ HLT_tau25_perf_tracktwo_L1TAU12IM: 3: 16 4: 16 5: 16 +HLT_tau25_tightRNN_track_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 12 + 1: 9 + stepFeatures: + 0: 22 + 1: 13 HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 7 stepCounts: @@ -3084,44 +3270,144 @@ HLT_tau25_tightRNN_tracktwo_L1TAU12IM: 0: 22 1: 14 2: 14 -HLT_tau25_verylooseRNN_tracktwoMVABDT_L1TAU12IM: - eventCount: 9 +HLT_tau35_idperf_ptonly_L1TAU12IM: + eventCount: 11 stepCounts: - 0: 12 - 1: 10 - 2: 10 - 3: 10 - 4: 9 + 0: 14 + 1: 11 + 2: 11 + 3: 11 stepFeatures: - 0: 22 - 1: 14 - 2: 14 - 3: 14 + 0: 24 + 1: 15 + 2: 15 + 3: 15 +HLT_tau35_idperf_track_L1TAU12IM: + eventCount: 11 + stepCounts: + 0: 14 + 1: 11 + 2: 11 + 3: 11 + 4: 11 + stepFeatures: + 0: 24 + 1: 15 + 2: 15 + 3: 15 + 4: 15 +HLT_tau35_idperf_tracktwoMVABDT_L1TAU12IM: + eventCount: 12 + stepCounts: + 0: 14 + 1: 12 + 2: 12 + 3: 12 4: 12 -HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM: - eventCount: 9 + stepFeatures: + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 +HLT_tau35_idperf_tracktwoMVA_L1TAU12IM: + eventCount: 12 stepCounts: - 0: 12 - 1: 10 - 2: 10 - 3: 10 - 4: 9 + 0: 14 + 1: 12 + 2: 12 + 3: 12 + 4: 12 stepFeatures: - 0: 22 - 1: 14 - 2: 14 - 3: 14 + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 +HLT_tau35_idperf_tracktwo_L1TAU12IM: + eventCount: 12 + stepCounts: + 0: 14 + 1: 12 + 2: 12 + 3: 12 4: 12 -HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM: + 5: 12 + stepFeatures: + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 + 5: 16 +HLT_tau35_looseRNN_track_L1TAU12IM: eventCount: 0 stepCounts: - 0: 12 - 1: 10 - 2: 10 + 0: 11 + 1: 8 stepFeatures: - 0: 22 - 1: 14 - 2: 14 + 0: 19 + 1: 11 +HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM: + eventCount: 8 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 8 + stepFeatures: + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 11 +HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM: + eventCount: 8 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 8 + stepFeatures: + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 11 +HLT_tau35_looseRNN_tracktwo_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + stepFeatures: + 0: 19 + 1: 12 + 2: 12 +HLT_tau35_mediumRNN_track_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 11 + 1: 8 + stepFeatures: + 0: 19 + 1: 11 +HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM: + eventCount: 6 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 6 + stepFeatures: + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 8 HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM: eventCount: 6 stepCounts: @@ -3150,16 +3436,120 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J2 2: 6 3: 6 4: 2 -HLT_tau80_medium1_tracktwo_L1TAU60: +HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: - 0: 4 - 1: 1 - 2: 1 + 0: 11 + 1: 9 + 2: 9 stepFeatures: - 0: 4 - 1: 1 - 2: 1 + 0: 19 + 1: 12 + 2: 12 +HLT_tau35_perf_track_L1TAU12IM: + eventCount: 11 + stepCounts: + 0: 14 + 1: 11 + 2: 11 + 3: 11 + 4: 11 + stepFeatures: + 0: 24 + 1: 15 + 2: 15 + 3: 15 + 4: 15 +HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM: + eventCount: 12 + stepCounts: + 0: 14 + 1: 12 + 2: 12 + 3: 12 + 4: 12 + stepFeatures: + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 +HLT_tau35_perf_tracktwoMVA_L1TAU12IM: + eventCount: 12 + stepCounts: + 0: 14 + 1: 12 + 2: 12 + 3: 12 + 4: 12 + stepFeatures: + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 +HLT_tau35_perf_tracktwo_L1TAU12IM: + eventCount: 12 + stepCounts: + 0: 14 + 1: 12 + 2: 12 + 3: 12 + 4: 12 + 5: 12 + stepFeatures: + 0: 24 + 1: 16 + 2: 16 + 3: 16 + 4: 16 + 5: 16 +HLT_tau35_tightRNN_track_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 11 + 1: 8 + stepFeatures: + 0: 19 + 1: 11 +HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM: + eventCount: 6 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 6 + stepFeatures: + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 6 +HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM: + eventCount: 6 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 6 + stepFeatures: + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 6 +HLT_tau35_tightRNN_tracktwo_L1TAU12IM: + eventCount: 0 + stepCounts: + 0: 11 + 1: 9 + 2: 9 + stepFeatures: + 0: 19 + 1: 12 + 2: 12 HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I: eventCount: 0 stepCounts: -- GitLab