From ac7d36ea0632e3e7748140192e30ec76ae132e84 Mon Sep 17 00:00:00 2001 From: Sascha Stahl <sascha.stahl@cern.ch> Date: Mon, 14 Aug 2017 17:18:47 +0200 Subject: [PATCH 01/11] Change Hlt2 TOS fractions for HCAL, ECAL, and Muons. This is a workaround to ignore HCAL, ECAL, and Muons hits which get added to Turbo SelReports. --- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index a0db430f6..e9caf199b 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -25,6 +25,12 @@ Hlt2TriggerTisTos::Hlt2TriggerTisTos( const std::string& type, : TriggerTisTos ( type, name , parent ) { declareInterface<ITriggerTisTos>(this); + setProperty("TOSFracEcal", 0.0 ); + setProperty("TOSFracHcal", 0.0 ); + setProperty("TOSFracMuon", 0.0 ); + always()<<m_TOSFrac[kMuon]<<endmsg; + always()<<m_TOSFrac[kHcal]<<endmsg; + always()<<m_TOSFrac[kEcal]<<endmsg; } //============================================================================= @@ -48,5 +54,6 @@ StatusCode Hlt2TriggerTisTos::initialize() { m_HltSelReportsLocation = "Hlt2/SelReports"; } + return sc; } -- GitLab From e6e1809d056fc2c27a2f09f2c278655e11e632e0 Mon Sep 17 00:00:00 2001 From: Sascha Stahl <sascha.stahl@cern.ch> Date: Tue, 15 Aug 2017 15:41:56 +0200 Subject: [PATCH 02/11] Use setProperty to set defaults instead of changing members in initialize --- Phys/TisTosTobbing/src/Hlt1TriggerTisTos.cpp | 10 ++-------- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 15 +++------------ Phys/TisTosTobbing/src/L0TriggerTisTos.cpp | 10 ++-------- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Phys/TisTosTobbing/src/Hlt1TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt1TriggerTisTos.cpp index 76b4d1f53..f6a3729d8 100644 --- a/Phys/TisTosTobbing/src/Hlt1TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt1TriggerTisTos.cpp @@ -25,6 +25,8 @@ Hlt1TriggerTisTos::Hlt1TriggerTisTos( const std::string& type, : TriggerTisTos ( type, name , parent ) { declareInterface<ITriggerTisTos>(this); + setProperty("HltDecReportsLocation", "Hlt1/DecReports" ); + setProperty("HltSelReportsLocation", "Hlt1/SelReports" ); } //============================================================================= @@ -40,13 +42,5 @@ StatusCode Hlt1TriggerTisTos::initialize() const StatusCode sc = TriggerTisTos::initialize(); if ( sc.isFailure() ) return sc; - if ( m_HltDecReportsLocation.value() == LHCb::HltDecReportsLocation::Default ) - { - m_HltDecReportsLocation = "Hlt1/DecReports"; - } - if ( m_HltSelReportsLocation.value() == LHCb::HltSelReportsLocation::Default ) - { - m_HltSelReportsLocation = "Hlt1/SelReports"; - } return sc; } diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index e9caf199b..8adb0975b 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -25,12 +25,12 @@ Hlt2TriggerTisTos::Hlt2TriggerTisTos( const std::string& type, : TriggerTisTos ( type, name , parent ) { declareInterface<ITriggerTisTos>(this); + setProperty("HltDecReportsLocation", "Hlt2/DecReports" ); + setProperty("HltSelReportsLocation", "Hlt2/SelReports" ); setProperty("TOSFracEcal", 0.0 ); setProperty("TOSFracHcal", 0.0 ); setProperty("TOSFracMuon", 0.0 ); - always()<<m_TOSFrac[kMuon]<<endmsg; - always()<<m_TOSFrac[kHcal]<<endmsg; - always()<<m_TOSFrac[kEcal]<<endmsg; + } //============================================================================= @@ -46,14 +46,5 @@ StatusCode Hlt2TriggerTisTos::initialize() const StatusCode sc = TriggerTisTos::initialize(); if ( sc.isFailure() ) return sc; - if ( m_HltDecReportsLocation.value() == LHCb::HltDecReportsLocation::Default ) - { - m_HltDecReportsLocation = "Hlt2/DecReports"; - } - if ( m_HltSelReportsLocation.value() == LHCb::HltSelReportsLocation::Default ) - { - m_HltSelReportsLocation = "Hlt2/SelReports"; - } - return sc; } diff --git a/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp b/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp index 180dde440..ab3a1c210 100644 --- a/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp @@ -25,6 +25,8 @@ L0TriggerTisTos::L0TriggerTisTos( const std::string& type, : TriggerTisTos ( type, name , parent ) { declareInterface<ITriggerTisTos>(this); + setProperty("HltDecReportsLocation", "HltLikeL0/DecReports" ); + setProperty("HltSelReportsLocation", "HltLikeL0/SelReports" ); } //============================================================================= @@ -40,14 +42,6 @@ StatusCode L0TriggerTisTos::initialize() const StatusCode sc = TriggerTisTos::initialize(); if ( sc.isFailure() ) return sc; - if ( m_HltDecReportsLocation.value() == LHCb::HltDecReportsLocation::Default ) - { - m_HltDecReportsLocation = "HltLikeL0/DecReports"; - } - if ( m_HltSelReportsLocation.value() == LHCb::HltSelReportsLocation::Default ) - { - m_HltSelReportsLocation = "HltLikeL0/SelReports"; - } debug() << "L0DecReportsMaker and L0SelReportsMaker must be executed before using this tool" << endmsg; debug() << "DecReport location = " << m_HltDecReportsLocation.value() -- GitLab From 75bca9bea4ba65a92676c35704b122eac3feaf67 Mon Sep 17 00:00:00 2001 From: eduardo-rodriguesgit <eduardo.rodrigues@cern.ch> Date: Mon, 28 Aug 2017 16:08:06 +0200 Subject: [PATCH 03/11] Documentation and dependencies for the v23r6 release. --- CMakeLists.txt | 4 ++-- ReleaseNotes/v23r6.md | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ReleaseNotes/v23r6.md diff --git a/CMakeLists.txt b/CMakeLists.txt index a9cba78a2..845a3c6eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,5 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Phys v23r5 - USE Rec v21r5) +gaudi_project(Phys v23r6 + USE Rec v21r6) diff --git a/ReleaseNotes/v23r6.md b/ReleaseNotes/v23r6.md new file mode 100644 index 000000000..3d156be58 --- /dev/null +++ b/ReleaseNotes/v23r6.md @@ -0,0 +1,16 @@ +2017-08-28 Phys v23r6 +===================== + +Release for 2017 production +--------------------------- + +This version is released on the 2017-patches branch. +It is based on Gaudi v28r2, LHCb v42r6, Lbcom v20r6 and Rec v21r6 and uses LCG_88 with ROOT 6.08.06. + +- Add TrackClonerWithClusters tool, modify CaloDigitCloner to support existing CaloAdc containers. + Required in Moore and Tesla, respectively. + - See merge request !168 +- Add a new functor for accessing related info. + - See merge request !158 +- LoKiPhys: add new functor ANNPID to provide access to arbitrary ANNPID tuning. + - See merge request !155 -- GitLab From d6036c437ba8bfaf422b899d01b2fdb70da108e4 Mon Sep 17 00:00:00 2001 From: Sascha Stahl <sascha.stahl@cern.ch> Date: Mon, 4 Sep 2017 23:13:05 +0200 Subject: [PATCH 04/11] Set only Muon fraction to 0 by default --- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index 8adb0975b..58d0b7b8e 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -27,8 +27,11 @@ Hlt2TriggerTisTos::Hlt2TriggerTisTos( const std::string& type, declareInterface<ITriggerTisTos>(this); setProperty("HltDecReportsLocation", "Hlt2/DecReports" ); setProperty("HltSelReportsLocation", "Hlt2/SelReports" ); - setProperty("TOSFracEcal", 0.0 ); - setProperty("TOSFracHcal", 0.0 ); + + // For Run 2 data Hlt2SelReports contain muon hits when IsMuonLoose is fulfiled. + // Due to an inconsistency with the TrigerTisTosTool which asks for IsMuon to take + // offline hits into account, this leads to particles being TPS instead of TOS. + // The following line disables that Muon hits are considered for TOS decisions. setProperty("TOSFracMuon", 0.0 ); } -- GitLab From 8ab5735ac9e41c4fb23f2e4e955bc58e0e091c27 Mon Sep 17 00:00:00 2001 From: Olli Lupton <oliver.lupton@cern.ch> Date: Tue, 5 Sep 2017 18:32:35 +0200 Subject: [PATCH 05/11] Minimal set of changes to allow L0/Hlt1/Hlt2 tools to have different TOS fractions. --- .../src/TisTosParticleTagger.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Phys/TisTosTobbing/src/TisTosParticleTagger.cpp b/Phys/TisTosTobbing/src/TisTosParticleTagger.cpp index 098c564eb..b1e3dbe5d 100644 --- a/Phys/TisTosTobbing/src/TisTosParticleTagger.cpp +++ b/Phys/TisTosTobbing/src/TisTosParticleTagger.cpp @@ -417,21 +417,21 @@ StatusCode TisTosParticleTagger::execute() Particle* candi = const_cast<Particle*>(*particle); - - // This is a slow part of TisTos tool - do it only once - // only this tool is guaranteed to be allocated and configured - m_tistostool->setOfflineInput(*candi); - // copying offline hits is fast - if( split ){ - if( m_tistostoolHlt1 ){ - m_tistostoolHlt1->setOfflineInput( m_tistostool->offlineLHCbIDs() ); + // In general the TOSFraction settings of the different tools are different, so we can't rely on one of them to get + // the correct set of LHCbIDs for all of them. + if( split ) { + if( m_tistostoolHlt1 ) { + m_tistostoolHlt1->setOfflineInput( *candi ); } - if( m_tistostoolHlt2 ){ - m_tistostoolHlt2->setOfflineInput( m_tistostool->offlineLHCbIDs() ); + if( m_tistostoolHlt2 ) { + m_tistostoolHlt2->setOfflineInput( *candi ); } + } else { + m_tistostool->setOfflineInput( *candi ); } - if( m_tistostoolL0 ){ - m_tistostoolL0->setOfflineInput( m_tistostool->offlineLHCbIDs() ); + + if( m_tistostoolL0 ) { + m_tistostoolL0->setOfflineInput( *candi ); } bool acceptStage[NTriggerStages] = { false, false, false }; -- GitLab From b56b7baa774a783e7ad276bd51dcd291a7e79612 Mon Sep 17 00:00:00 2001 From: Sascha Stahl <sascha.stahl@cern.ch> Date: Wed, 6 Sep 2017 14:14:38 +0200 Subject: [PATCH 06/11] Add warnings for non-sensible configurations --- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 9 ++++++++- Phys/TisTosTobbing/src/L0TriggerTisTos.cpp | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index 58d0b7b8e..87f5263a0 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -29,9 +29,10 @@ Hlt2TriggerTisTos::Hlt2TriggerTisTos( const std::string& type, setProperty("HltSelReportsLocation", "Hlt2/SelReports" ); // For Run 2 data Hlt2SelReports contain muon hits when IsMuonLoose is fulfiled. - // Due to an inconsistency with the TrigerTisTosTool which asks for IsMuon to take + // Due to an inconsistency with the TriggerTisTosTool which asks for IsMuon to take // offline hits into account, this leads to particles being TPS instead of TOS. // The following line disables that Muon hits are considered for TOS decisions. + // For a more detailed disucssion look at https://its.cern.ch/jira/browse/LHCBPS-1746 . setProperty("TOSFracMuon", 0.0 ); } @@ -49,5 +50,11 @@ StatusCode Hlt2TriggerTisTos::initialize() const StatusCode sc = TriggerTisTos::initialize(); if ( sc.isFailure() ) return sc; + if ((getTOSFrac( kMuon ) > 0 )){ + Warning("L0 TOS fractions set positive for Muons. Be aware that for Run 2 data there is an issue when" + "including Muons in the Hlt2 TISTOS decision. See https://its.cern.ch/jira/browse/LHCBPS-1746.").ignore(); + Warning("TOS frac muon " + std::to_string(getTOSFrac( kMuon ))).ignore(); + } + return sc; } diff --git a/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp b/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp index ab3a1c210..07eac4b73 100644 --- a/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/L0TriggerTisTos.cpp @@ -41,6 +41,12 @@ StatusCode L0TriggerTisTos::initialize() { const StatusCode sc = TriggerTisTos::initialize(); if ( sc.isFailure() ) return sc; + if ((getTOSFrac( kMuon ) <= 0 ) || (getTOSFrac( kEcal ) <= 0) || (getTOSFrac( kHcal ) <= 0) ){ + Warning("L0 TOS fractions set zero or negative for Muons, ECAL or HCAL. This will make the matching with L0 objects useless.").ignore(); + Warning("TOS frac muon " + std::to_string(getTOSFrac( kMuon ))).ignore(); + Warning("TOS frac ECAL " + std::to_string(getTOSFrac( kEcal ))).ignore(); + Warning("TOS frac HCAL " + std::to_string(getTOSFrac( kHcal ))).ignore(); + } debug() << "L0DecReportsMaker and L0SelReportsMaker must be executed before using this tool" << endmsg; -- GitLab From fc63cb0be3a5139f5d881a1a1fc39a8a92738d36 Mon Sep 17 00:00:00 2001 From: eduardo-rodriguesgit <eduardo.rodrigues@cern.ch> Date: Wed, 13 Sep 2017 22:12:04 +0200 Subject: [PATCH 07/11] Documentation and dependencies for the v23r6p1 release. --- ReleaseNotes/v23r6p1.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 ReleaseNotes/v23r6p1.md diff --git a/ReleaseNotes/v23r6p1.md b/ReleaseNotes/v23r6p1.md new file mode 100644 index 000000000..b73e9edcc --- /dev/null +++ b/ReleaseNotes/v23r6p1.md @@ -0,0 +1,14 @@ +2017-09-13 Phys v23r6p1 +======================= + +Release for 2017 production +--------------------------- + +This version is released on the 2017-patches branch. +It is based on Gaudi v28r2, LHCb v42r6p1, Lbcom v20r6p1 and Rec v21r6p1, and uses LCG_88 with ROOT 6.08.06. + +- Various commits to fix the bugs relating to TISTOSing, see JIRA tasks LHCBPS-1702 and LHCBPS-1746: + - Change Hlt2 Muon TOS frac. + - See merge request !170 + - Allow L0/Hlt1/Hlt2 tools used by TisTosParticleTagger to have different TOS fractions. + - See merge request !177 -- GitLab From 9101eb5c3a2c225dada8ffa3eb25c7ec0d4993fe Mon Sep 17 00:00:00 2001 From: eduardo-rodriguesgit <eduardo.rodrigues@cern.ch> Date: Wed, 13 Sep 2017 22:13:18 +0200 Subject: [PATCH 08/11] Documentation and dependencies for the v23r6p1 release. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 845a3c6eb..bae5b3ddf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,5 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Phys v23r6 - USE Rec v21r6) +gaudi_project(Phys v23r6p1 + USE Rec v21r6p1) -- GitLab From ba7a4232a1fca1d4eae46e16db9f102f93ec6d21 Mon Sep 17 00:00:00 2001 From: eduardo-rodriguesgit <eduardo.rodrigues@cern.ch> Date: Thu, 14 Sep 2017 10:01:47 +0200 Subject: [PATCH 09/11] Documentation and dependencies for the v23r6p1 release (for a retag). --- ReleaseNotes/v23r6p1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseNotes/v23r6p1.md b/ReleaseNotes/v23r6p1.md index b73e9edcc..5707d3329 100644 --- a/ReleaseNotes/v23r6p1.md +++ b/ReleaseNotes/v23r6p1.md @@ -1,4 +1,4 @@ -2017-09-13 Phys v23r6p1 +2017-09-14 Phys v23r6p1 ======================= Release for 2017 production -- GitLab From c87455f262811b172b93b28ab89f37744788726d Mon Sep 17 00:00:00 2001 From: Sascha Stahl <sascha.stahl@cern.ch> Date: Thu, 14 Sep 2017 15:09:29 +0000 Subject: [PATCH 10/11] Fix typos in warning in Hlt2TriggerTisTos --- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index 87f5263a0..b77ebde67 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -51,7 +51,7 @@ StatusCode Hlt2TriggerTisTos::initialize() if ( sc.isFailure() ) return sc; if ((getTOSFrac( kMuon ) > 0 )){ - Warning("L0 TOS fractions set positive for Muons. Be aware that for Run 2 data there is an issue when" + Warning("TOS fractions set positive for Muons. Be aware that for Run 2 data there is an issue when " "including Muons in the Hlt2 TISTOS decision. See https://its.cern.ch/jira/browse/LHCBPS-1746.").ignore(); Warning("TOS frac muon " + std::to_string(getTOSFrac( kMuon ))).ignore(); } -- GitLab From 2412a6bf6c4b28b056a50f576adb6722feebead2 Mon Sep 17 00:00:00 2001 From: Eduardo Rodrigues <eduardo.rodrigues@cern.ch> Date: Thu, 14 Sep 2017 15:18:00 +0000 Subject: [PATCH 11/11] Revert "Merge branch '2017-patches' into 'master'" This reverts merge request !189 --- CMakeLists.txt | 4 ++-- Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp | 2 +- ReleaseNotes/v23r6p1.md | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 ReleaseNotes/v23r6p1.md diff --git a/CMakeLists.txt b/CMakeLists.txt index bae5b3ddf..b8cf874cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,5 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Phys v23r6p1 - USE Rec v21r6p1) +gaudi_project(Phys v24r0 + USE Rec v22r0) diff --git a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp index b77ebde67..87f5263a0 100644 --- a/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp +++ b/Phys/TisTosTobbing/src/Hlt2TriggerTisTos.cpp @@ -51,7 +51,7 @@ StatusCode Hlt2TriggerTisTos::initialize() if ( sc.isFailure() ) return sc; if ((getTOSFrac( kMuon ) > 0 )){ - Warning("TOS fractions set positive for Muons. Be aware that for Run 2 data there is an issue when " + Warning("L0 TOS fractions set positive for Muons. Be aware that for Run 2 data there is an issue when" "including Muons in the Hlt2 TISTOS decision. See https://its.cern.ch/jira/browse/LHCBPS-1746.").ignore(); Warning("TOS frac muon " + std::to_string(getTOSFrac( kMuon ))).ignore(); } diff --git a/ReleaseNotes/v23r6p1.md b/ReleaseNotes/v23r6p1.md deleted file mode 100644 index 5707d3329..000000000 --- a/ReleaseNotes/v23r6p1.md +++ /dev/null @@ -1,14 +0,0 @@ -2017-09-14 Phys v23r6p1 -======================= - -Release for 2017 production ---------------------------- - -This version is released on the 2017-patches branch. -It is based on Gaudi v28r2, LHCb v42r6p1, Lbcom v20r6p1 and Rec v21r6p1, and uses LCG_88 with ROOT 6.08.06. - -- Various commits to fix the bugs relating to TISTOSing, see JIRA tasks LHCBPS-1702 and LHCBPS-1746: - - Change Hlt2 Muon TOS frac. - - See merge request !170 - - Allow L0/Hlt1/Hlt2 tools used by TisTosParticleTagger to have different TOS fractions. - - See merge request !177 -- GitLab