[EVO] Merge CMSSW_16_1 in to CMSSW_16_1_EVOLUTION

DataFormats/EgammaReco/src/classes_def.xml

@@ -119,6 +119,7 @@
   </class>
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::BasicCluster> >, edm::RefProd<std::vector<reco::ClusterShape> > >"/>
 
+  <class name="edm::OneToOne<std::vector<reco::io_v1::SuperCluster>, std::vector<reco::io_v1::HFEMClusterShape>, unsigned int >"/>
   <class name="edm::AssociationMap<edm::OneToOne<std::vector<reco::io_v1::SuperCluster>, std::vector<reco::io_v1::HFEMClusterShape>, unsigned int > >">
     <field name="transientMap_" transient="true" />
   </class>

DataFormats/MuonReco/src/classes_def.xml

@@ -48,6 +48,7 @@ initial version number of a class which has never been stored before.
   <class name="reco::HcalMuonRecHit" ClassVersion="3">
    <version ClassVersion="3" checksum="2031556424"/>
   </class>
+  <class name="std::vector<reco::HcalMuonRecHit>"/>
   <class name="reco::MuonChamberMatch" ClassVersion="14">
    <version ClassVersion="14" checksum="3579435038"/>
    <version ClassVersion="13" checksum="2674954213"/>

DataFormats/ParticleFlowCandidate/src/classes_def.xml

@@ -22,6 +22,7 @@
   <class name="std::vector<reco::io_v1::PFCandidate>"/>
   <class name="edm::Wrapper<reco::io_v1::PFCandidate>"/>
   <class name="edm::Wrapper<std::vector<reco::io_v1::PFCandidate> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFCandidate>,reco::io_v1::PFCandidate>"/>
   <class name="reco::PFCandidateRef"/>
   <class name="reco::PFCandidateRefProd"/>
   <class name="reco::PFCandidateRefVector"/>

DataFormats/ParticleFlowReco/src/classes_def_2.xml

@@ -156,6 +156,7 @@
 
   <class name="std::vector<reco::io_v1::PFBlock>"/>
   <class name="edm::Wrapper<std::vector<reco::io_v1::PFBlock> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFBlock>,reco::io_v1::PFBlock>"/>
   <class name="edm::Ref< std::vector<reco::io_v1::PFBlock>, reco::io_v1::PFBlock, edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFBlock>,reco::io_v1::PFBlock> >"/>
   <class name="edm::Ref<std::vector<reco::PFRecTrack>,reco::PFRecTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecTrack>,reco::PFRecTrack> >"/>
   <class name="edm::RefVector<std::vector<reco::PFRecTrack>,reco::PFRecTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecTrack>,reco::PFRecTrack> >"/>

DataFormats/TauReco/src/classes_def_2.xml

@@ -26,6 +26,7 @@
   <class name="edm::RefVector<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau> >"/>
           <class name="edm::Wrapper<edm::RefVector<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau> > >"/>
   <class name="edm::reftobase::Holder<reco::BaseTau, edm::Ref<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau> > >" />
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau>"/>
   <class name="std::vector<edm::Ref<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTau>,reco::io_v1::PFTau> > >"/>
 
 

DataFormats/TauReco/src/classes_def_3.xml

@@ -97,6 +97,7 @@
   <class name="edm::RefProd<std::vector<reco::io_v1::PFTauTransverseImpactParameter> >"/>
   <class name="edm::RefVector<std::vector<reco::io_v1::PFTauTransverseImpactParameter>,reco::io_v1::PFTauTransverseImpactParameter,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTauTransverseImpactParameter>,reco::io_v1::PFTauTransverseImpactParameter> >"/>
   <class name="edm::reftobase::Holder<reco::io_v1::PFTauTransverseImpactParameter, edm::Ref<std::vector<reco::io_v1::PFTauTransverseImpactParameter>,reco::io_v1::PFTauTransverseImpactParameter,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTauTransverseImpactParameter>,reco::io_v1::PFTauTransverseImpactParameter> > >" />
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PFTauTransverseImpactParameter>,reco::io_v1::PFTauTransverseImpactParameter>"/>
   <class name="edm::Association<std::vector<reco::io_v1::PFTauTransverseImpactParameter> >"/>
   <class name="edm::Wrapper<edm::Association<std::vector<reco::io_v1::PFTauTransverseImpactParameter> > >"/>
 
@@ -136,6 +137,7 @@
   <class name="edm::Association<std::vector<std::vector<reco::VertexRef> > >"/>
   <class name="edm::Wrapper<edm::Association<std::vector<std::vector<reco::VertexRef> > > >"/>
 
+  <class name="std::vector<edm::Ref<std::vector<reco::PFTauTransverseImpactParameter>,reco::PFTauTransverseImpactParameter,edm::refhelper::FindUsingAdvance<std::vector<reco::PFTauTransverseImpactParameter>,reco::PFTauTransverseImpactParameter> > >"/>
   <class name="reco::PFTauTIPAssociation">
     <field name="transientVector_" transient="true"/>
   </class>

DataFormats/TrackReco/src/classes_def.xml

@@ -383,6 +383,7 @@
 
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::io_v1::Track> >,edm::RefProd<std::vector<reco::io_v1::Track> > >" />
 
+  <class name="edm::OneToOne<std::vector<reco::io_v1::Track>,std::vector<reco::io_v1::Track>,unsigned int>"/>
   <class name="edm::AssociationMap<edm::OneToOne<std::vector<reco::io_v1::Track>,std::vector<reco::io_v1::Track>,unsigned int> >">
     <field name="transientMap_" transient="true" />
   </class>

HLTrigger/Timer/plugins/FastTimerService.cc

@@ -261,6 +261,7 @@ void FastTimerService::ResourcesPerJob::reset() {
   idle.reset();
   source.reset();
   eventsetup.reset();
+  cleanup.reset();
   event.reset();
   for (auto& module : highlight)
     module.reset();
@@ -276,6 +277,7 @@ FastTimerService::ResourcesPerJob& FastTimerService::ResourcesPerJob::operator+=
   idle += other.idle;
   source += other.source;
   eventsetup += other.eventsetup;
+  cleanup += other.cleanup;
   event += other.event;
   assert(highlight.size() == other.highlight.size());
   for (unsigned int i : boost::irange(0ul, highlight.size()))
@@ -697,6 +699,7 @@ void FastTimerService::PlotsPerJob::book(dqm::reco::DQMStore::IBooker& booker,
   overhead_.book(booker, "overhead", "Overhead", event_ranges, lumisections, byls);
   idle_.book(booker, "idle", "Idle", event_ranges, lumisections, byls);
   source_.book(booker, "source", "Source", event_ranges, lumisections, byls);
+  cleanup_.book(booker, "cleanup", "Cleanup", event_ranges, lumisections, byls);
 
   if (transitions) {
     lumi_.book(booker, "lumi", "LumiSection transitions", event_ranges, lumisections, byls);
@@ -733,6 +736,7 @@ void FastTimerService::PlotsPerJob::fill(ProcessCallGraph const& job, ResourcesP
   overhead_.fill(data.overhead, ls);
   idle_.fill(data.idle, ls);
   source_.fill(data.source, ls);
+  cleanup_.fill(data.cleanup, ls);
 
   // fill highltight plots
   for (unsigned int group : boost::irange(0ul, highlight_.size()))
@@ -834,6 +838,13 @@ FastTimerService::FastTimerService(const edm::ParameterSet& config, edm::Activit
   registry.watchPostSourceLumi(this, &FastTimerService::postSourceLumi);
   registry.watchPreSourceEvent(this, &FastTimerService::preSourceEvent);
   registry.watchPostSourceEvent(this, &FastTimerService::postSourceEvent);
+  // transform signals
+  //registry.watchPreModuleTransformPrefetching(this, &FastTimerService::preModuleTransformPrefetching);
+  //registry.watchPostModuleTransformPrefetching(this, &FastTimerService::postModuleTransformPrefetching);
+  registry.watchPreModuleTransform(this, &FastTimerService::preModuleTransform);
+  registry.watchPostModuleTransform(this, &FastTimerService::postModuleTransform);
+  registry.watchPreModuleTransformAcquiring(this, &FastTimerService::preModuleTransformAcquiring);
+  registry.watchPostModuleTransformAcquiring(this, &FastTimerService::postModuleTransformAcquiring);
   //registry.watchPreModuleConstruction(      this, & FastTimerService::preModuleConstruction);
   //registry.watchPostModuleConstruction(     this, & FastTimerService::postModuleConstruction);
   //registry.watchPreModuleBeginJob(          this, & FastTimerService::preModuleBeginJob );
@@ -868,6 +879,9 @@ FastTimerService::FastTimerService(const edm::ParameterSet& config, edm::Activit
   registry.watchPostModuleEvent(this, &FastTimerService::postModuleEvent);
   registry.watchPreModuleEventDelayedGet(this, &FastTimerService::preModuleEventDelayedGet);
   registry.watchPostModuleEventDelayedGet(this, &FastTimerService::postModuleEventDelayedGet);
+  // cleanup signals
+  registry.watchPreClearEvent(this, &FastTimerService::preClearEvent);
+  registry.watchPostClearEvent(this, &FastTimerService::postClearEvent);
   registry.watchPreEventReadFromSource(this, &FastTimerService::preEventReadFromSource);
   registry.watchPostEventReadFromSource(this, &FastTimerService::postEventReadFromSource);
   registry.watchPreESModule(this, &FastTimerService::preESModule);
@@ -887,6 +901,45 @@ void FastTimerService::unsupportedSignal(const std::string& signal) const {
                                         << "Please report how to reproduce the issue to cms-hlt@cern.ch .";
 }
 
+void FastTimerService::finalizeEventMeasurement(edm::StreamContext const& sc) {
+  unsigned int sid = sc.streamID();
+  auto& stream = streams_[sid];
+
+  stream.total += stream.cleanup;
+
+  auto& process = callgraph_.processDescription();
+  // measure the event resources as the sum of all modules' resources
+  auto& data = stream.process.total;
+  for (unsigned int id : process.modules_) {
+    data += stream.modules[id].total;
+  }
+  stream.total += data;
+
+  // add to the event resources those used by source (which is not part of any process)
+  stream.total += stream.source;
+
+  // highlighted modules
+  for (unsigned int group : boost::irange(0ul, highlight_modules_.size()))
+    for (unsigned int i : highlight_modules_[group].modules)
+      stream.highlight[group] += stream.modules[i].total;
+
+  // avoid concurrent access to the summary objects
+  {
+    std::lock_guard<std::mutex> guard(summary_mutex_);
+    job_summary_ += stream;
+    run_summary_[sc.runIndex()] += stream;
+  }
+
+  if (print_event_summary_) {
+    edm::LogVerbatim out("FastReport");
+    printEvent(out, stream);
+  }
+
+  if (enable_dqm_) {
+    plots_->fill(callgraph_, stream, sc.eventID().luminosityBlock());
+  }
+}
+
 void FastTimerService::preGlobalBeginRun(edm::GlobalContext const& gc) {
   ignoredSignal(__func__);
 
@@ -1291,6 +1344,7 @@ void FastTimerService::printSummary(T& out, ResourcesPerJob const& data, std::st
   }
   printSummaryLine(out, data.total, data.events, "total");
   printSummaryLine(out, data.eventsetup, data.events, "eventsetup");
+  printSummaryLine(out, data.cleanup, data.events, "cleanup");
   printSummaryLine(out, data.overhead, data.events, "other");
   printSummaryLine(out, data.idle, data.events, "idle");
   out << '\n';
@@ -1309,6 +1363,7 @@ void FastTimerService::printSummary(T& out, ResourcesPerJob const& data, std::st
   }
   printSummaryLine(out, data.total, data.events, "total");
   printSummaryLine(out, data.eventsetup, data.events, "eventsetup");
+  printSummaryLine(out, data.cleanup, data.events, "cleanup");
   printSummaryLine(out, data.overhead, data.events, "other");
   printSummaryLine(out, data.idle, data.events, "idle");
   out << '\n';
@@ -1378,6 +1433,7 @@ void FastTimerService::writeSummaryJSON(ResourcesPerJob const& data, std::string
   }
 
   // add an entry for the non-event transitions, modules, and idle states
+  j["modules"].push_back(encodeToJSON("cleanup", "cleanup", data.events, data.cleanup));
   j["modules"].push_back(encodeToJSON("other", "other", data.events, data.overhead));
   j["modules"].push_back(encodeToJSON("eventsetup", "eventsetup", data.events, data.eventsetup));
   j["modules"].push_back(encodeToJSON("idle", "idle", data.events, data.idle));
@@ -1388,60 +1444,15 @@ void FastTimerService::writeSummaryJSON(ResourcesPerJob const& data, std::string
 
 void FastTimerService::preEvent(edm::StreamContext const& sc) { ignoredSignal(__func__); }
 
-void FastTimerService::postEvent(edm::StreamContext const& sc) {
-  ignoredSignal(__func__);
-
-  unsigned int sid = sc.streamID();
-  auto& stream = streams_[sid];
-  auto& process = callgraph_.processDescription();
-
-  // measure the event resources as the sum of all modules' resources
-  auto& data = stream.process.total;
-  for (unsigned int id : process.modules_) {
-    data += stream.modules[id].total;
-  }
-  stream.total += data;
-
-  // handle the summaries and fill the plots
-
-  // measure the event resources explicitly
-  stream.event_measurement.measure_and_store(stream.event);
-
-  // add to the event resources those used by source (which is not part of any process)
-  stream.total += stream.source;
-
-  // highlighted modules
-  for (unsigned int group : boost::irange(0ul, highlight_modules_.size()))
-    for (unsigned int i : highlight_modules_[group].modules)
-      stream.highlight[group] += stream.modules[i].total;
-
-  // avoid concurrent access to the summary objects
-  {
-    std::lock_guard<std::mutex> guard(summary_mutex_);
-    job_summary_ += stream;
-    run_summary_[sc.runIndex()] += stream;
-  }
-
-  if (print_event_summary_) {
-    edm::LogVerbatim out("FastReport");
-    printEvent(out, stream);
-  }
-
-  if (enable_dqm_) {
-    plots_->fill(callgraph_, stream, sc.eventID().luminosityBlock());
-  }
-}
+void FastTimerService::postEvent(edm::StreamContext const& sc) { ignoredSignal(__func__); }
 
 void FastTimerService::preSourceEvent(edm::StreamID sid) {
   // clear the event counters
   auto& stream = streams_[sid];
   stream.reset();
   ++stream.events;
 
-  // reuse the same measurement for the Source module and for the explicit begin of the Event
-  auto& measurement = thread();
-  measurement.measure_and_accumulate(stream.overhead);
-  stream.event_measurement = measurement;
+  thread().measure_and_accumulate(stream.overhead);
 }
 
 void FastTimerService::postSourceEvent(edm::StreamID sid) {
@@ -1498,6 +1509,50 @@ void FastTimerService::postModuleEventAcquire(edm::StreamContext const& sc, edm:
   thread().measure_and_store(module.total);
 }
 
+// transform signals
+void FastTimerService::preModuleTransformPrefetching(edm::StreamContext const& sc,
+                                                     edm::ModuleCallingContext const& mcc) {
+  ignoredSignal(__func__);
+}
+
+void FastTimerService::postModuleTransformPrefetching(edm::StreamContext const& sc,
+                                                      edm::ModuleCallingContext const& mcc) {
+  ignoredSignal(__func__);
+}
+
+void FastTimerService::preModuleTransformAcquiring(edm::StreamContext const& sc, edm::ModuleCallingContext const& mcc) {
+  unsigned int sid = sc.streamID().value();
+  auto& stream = streams_[sid];
+  thread().measure_and_accumulate(stream.overhead);
+}
+
+void FastTimerService::postModuleTransformAcquiring(edm::StreamContext const& sc,
+                                                    edm::ModuleCallingContext const& mcc) {
+  edm::ModuleDescription const& md = *mcc.moduleDescription();
+  unsigned int id = md.id();
+  unsigned int sid = sc.streamID().value();
+  auto& stream = streams_[sid];
+  auto& module = stream.modules[id];
+
+  thread().measure_and_accumulate(module.total);
+}
+
+void FastTimerService::preModuleTransform(edm::StreamContext const& sc, edm::ModuleCallingContext const& mcc) {
+  unsigned int sid = sc.streamID().value();
+  auto& stream = streams_[sid];
+  thread().measure_and_accumulate(stream.overhead);
+}
+
+void FastTimerService::postModuleTransform(edm::StreamContext const& sc, edm::ModuleCallingContext const& mcc) {
+  edm::ModuleDescription const& md = *mcc.moduleDescription();
+  unsigned int id = md.id();
+  unsigned int sid = sc.streamID().value();
+  auto& stream = streams_[sid];
+  auto& module = stream.modules[id];
+
+  thread().measure_and_accumulate(module.total);
+}
+
 void FastTimerService::preModuleEvent(edm::StreamContext const& sc, edm::ModuleCallingContext const& mcc) {
   unsigned int sid = sc.streamID().value();
   auto& stream = streams_[sid];
@@ -1650,6 +1705,20 @@ void FastTimerService::postESModule(edm::eventsetup::EventSetupRecordKey const&,
   }
 }
 
+void FastTimerService::preClearEvent(edm::StreamContext const& sc) {
+  auto& stream = streams_[sc.streamID()];
+  thread().measure_and_accumulate(stream.overhead);
+}
+
+void FastTimerService::postClearEvent(edm::StreamContext const& sc) {
+  unsigned int sid = sc.streamID();
+  auto& stream = streams_[sid];
+  // measure the cleanup resources first
+  thread().measure_and_store(stream.cleanup);
+
+  finalizeEventMeasurement(sc);
+}
+
 FastTimerService::ThreadGuard::ThreadGuard() {
   auto err = ::pthread_key_create(&key_, retire_thread);
   if (err) {

HLTrigger/Timer/plugins/FastTimerService.h

@@ -58,6 +58,8 @@ class FastTimerService : public tbb::task_scheduler_observer {
 private:
   void ignoredSignal(const std::string& signal) const;
   void unsupportedSignal(const std::string& signal) const;
+  // helper function for event measurement finalization
+  void finalizeEventMeasurement(edm::StreamContext const&);
 
   // these signal pairs are not guaranteed to happen in the same thread
 
@@ -168,12 +170,26 @@ class FastTimerService : public tbb::task_scheduler_observer {
   void preModuleEventDelayedGet(edm::StreamContext const&, edm::ModuleCallingContext const&);
   void postModuleEventDelayedGet(edm::StreamContext const&, edm::ModuleCallingContext const&);
 
+  // transform
+  void preModuleTransformPrefetching(edm::StreamContext const&, edm::ModuleCallingContext const&);
+  void postModuleTransformPrefetching(edm::StreamContext const&, edm::ModuleCallingContext const&);
+
+  void preModuleTransform(edm::StreamContext const&, edm::ModuleCallingContext const&);
+  void postModuleTransform(edm::StreamContext const&, edm::ModuleCallingContext const&);
+
+  void preModuleTransformAcquiring(edm::StreamContext const&, edm::ModuleCallingContext const&);
+  void postModuleTransformAcquiring(edm::StreamContext const&, edm::ModuleCallingContext const&);
+
   void preEventReadFromSource(edm::StreamContext const&, edm::ModuleCallingContext const&);
   void postEventReadFromSource(edm::StreamContext const&, edm::ModuleCallingContext const&);
 
   void preESModule(edm::eventsetup::EventSetupRecordKey const&, edm::ESModuleCallingContext const&);
   void postESModule(edm::eventsetup::EventSetupRecordKey const&, edm::ESModuleCallingContext const&);
 
+  // cleanup
+  void preClearEvent(edm::StreamContext const&);
+  void postClearEvent(edm::StreamContext const&);
+
   // inherited from TBB task_scheduler_observer
   void on_scheduler_entry(bool worker) final;
   void on_scheduler_exit(bool worker) final;
@@ -311,8 +327,8 @@ class FastTimerService : public tbb::task_scheduler_observer {
     AtomicResources eventsetup;
     AtomicResources idle;
     AtomicResources source;
-    Resources event;  // total time etc. spent between preSourceEvent and postEvent
-    Measurement event_measurement;
+    Resources cleanup;  // total time etc. spent between preClearEvent and postClearEvent
+    Resources event;    // total time etc. spent between preSourceEvent and postEvent
     std::vector<Resources> highlight;
     std::vector<ResourcesPerModule> modules;
     // Before the Framework SubProcess feature was removed, the following data
@@ -440,6 +456,7 @@ class FastTimerService : public tbb::task_scheduler_observer {
     PlotsPerElement overhead_;
     PlotsPerElement idle_;
     PlotsPerElement source_;
+    PlotsPerElement cleanup_;
     // resources spent in the modules' lumi and run transitions
     PlotsPerElement lumi_;
     PlotsPerElement run_;

L1Trigger/L1TGlobal/interface/CICADATemplate.h

@@ -1,8 +1,9 @@
 #ifndef L1Trigger_L1TGlobal_CICADATemplate_h
 #define L1Trigger_L1TGlobal_CICADATemplate_h
 
+#include <ostream>
 #include <string>
-#include <iosfwd>
+#include <vector>
 
 #include "L1Trigger/L1TGlobal/interface/GlobalCondition.h"
 
@@ -12,7 +13,7 @@ class CICADATemplate : public GlobalCondition {
   CICADATemplate(const std::string&);
   CICADATemplate(const std::string&, const l1t::GtConditionType&);
   CICADATemplate(const CICADATemplate&);
-  ~CICADATemplate() = default;
+  ~CICADATemplate() override = default;
 
   CICADATemplate& operator=(const CICADATemplate&);