making emulator chain working again.

tschuh · tschuh · commit 506deee1a868 · 2025-04-16T15:15:27.000+01:00
diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc
@@ -55,7 +55,7 @@ namespace trklet {
     // Setup token
     ESGetToken<Setup, SetupRcd> esGetTokenSetup_;
     // LayerEncoding token
-    ESGetToken<LayerEncoding, ChannelAssignmentRcd> esGetTokenLayerEncoding_;
+    ESGetToken<LayerEncoding, DataFormatsRcd> esGetTokenLayerEncoding_;
     // DataFormats token
     ESGetToken<DataFormats, ChannelAssignmentRcd> esGetTokenDataFormats_;
     // ChannelAssignment token
diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc
@@ -38,7 +38,6 @@ namespace trklet {
     ~ProducerKF() override {}
 
   private:
-    void beginRun(const Run&, const EventSetup&) override;
     void produce(Event&, const EventSetup&) override;
     void endStream() override {
       if (printDebug_)
@@ -72,8 +71,6 @@ namespace trklet {
     KFParamsComb* tmtt_;
     // print end job internal unused MSB
     bool printDebug_;
-    //
-    bool use5ParameterFit_;
   };
 
   ProducerKF::ProducerKF(const ParameterSet& iConfig)
@@ -123,9 +120,6 @@ namespace trklet {
     iConfig_.baseShiftC23_ = iConfig.getParameter<int>("BaseShiftC23");
     iConfig_.baseShiftC33_ = iConfig.getParameter<int>("BaseShiftC33");
     printDebug_ = iConfig.getParameter<bool>("PrintKFDebug");
-    use5ParameterFit_ = iConfig.getParameter<bool>("Use5ParameterFit");
-    if (use5ParameterFit_)
-      tmtt_ = &tmtt5_;
     const string& label = iConfig.getParameter<string>("InputLabelKF");
     const string& branchStubs = iConfig.getParameter<string>("BranchStubs");
     const string& branchTracks = iConfig.getParameter<string>("BranchTracks");
@@ -143,21 +137,13 @@ namespace trklet {
     esGetTokenDataFormats_ = esConsumes();
   }
 
-  void ProducerKF::beginRun(const Run& iRun, const EventSetup& iSetup) {
+  void ProducerKF::produce(Event& iEvent, const EventSetup& iSetup) {
     // helper class to store configurations
     const Setup* setup = &iSetup.getData(esGetTokenSetup_);
     settings_.setMagneticField(setup->bField());
     // helper class to extract structured data from tt::Frames
     const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
-    // provides dataformats of Kalman filter internals
     kalmanFilterFormats_.consume(dataFormats, iConfig_);
-  }
-
-  void ProducerKF::produce(Event& iEvent, const EventSetup& iSetup) {
-    // helper class to store configurations
-    const Setup* setup = &iSetup.getData(esGetTokenSetup_);
-    // helper class to extract structured data from tt::Frames
-    const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
     auto valid = [](int sum, const FrameTrack& f) { return sum + (f.first.isNull() ? 0 : 1); };
     // empty KF products
     StreamsStub streamsStub(setup->numRegions() * setup->numLayers());
@@ -170,7 +156,8 @@ namespace trklet {
     // prep TTTracks
     TTTracks ttTracks;
     vector<TTTrackRef> ttTrackRefs;
-    if (use5ParameterFit_) {
+    if (setup->kfUse5ParameterFit()) {
+      tmtt_ = &tmtt5_;
       int nTracks(0);
       for (const StreamTrack& stream : tracks)
         nTracks += accumulate(stream.begin(), stream.end(), 0, valid);
@@ -189,7 +176,7 @@ namespace trklet {
       // fill output products
       kf.produce(streamsStub, streamsTrack, numStatesAccepted, numStatesTruncated);
     }
-    if (use5ParameterFit_) {
+    if (setup->kfUse5ParameterFit()) {
       // store ttTracks
       const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
       // replace ttTrackRefs in track streams
diff --git a/L1Trigger/TrackFindingTracklet/src/KalmanFilterFormats.cc b/L1Trigger/TrackFindingTracklet/src/KalmanFilterFormats.cc
@@ -172,7 +172,7 @@ namespace trklet {
     const double range = 4. * dPhi.range() * dPhi.range();
     const double base = S01.base();
     const int width = ceil(log2(range / base) - 1.e-11);
-    return DataFormatKF(VariableKF::v0, true, iConfig.enableIntegerEmulation_, width, base, range);
+    return DataFormatKF(VariableKF::v0, false, iConfig.enableIntegerEmulation_, width, base, range);
   }
 
   template <>
@@ -182,7 +182,7 @@ namespace trklet {
     const double range = 4. * dZ.range() * dZ.range();
     const double base = S13.base();
     const int width = ceil(log2(range / base) - 1.e-11);
-    return DataFormatKF(VariableKF::v1, true, iConfig.enableIntegerEmulation_, width, base, range);
+    return DataFormatKF(VariableKF::v1, false, iConfig.enableIntegerEmulation_, width, base, range);
   }
 
   template <>
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc
@@ -14,7 +14,7 @@
 
 #include "SimTracker/TrackTriggerAssociation/interface/StubAssociation.h"
 #include "L1Trigger/TrackTrigger/interface/Setup.h"
-#include "L1Trigger/TrackerTFP/interface/DataFormats.h"
+#include "L1Trigger/TrackFindingTracklet/interface/DataFormats.h"
 #include "L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h"
 
 #include <TProfile.h>
@@ -30,7 +30,6 @@
 
 using namespace std;
 using namespace edm;
-using namespace trackerTFP;
 using namespace tt;
 
 namespace trklet {
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerTM.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerTM.cc
@@ -14,7 +14,7 @@
 
 #include "SimTracker/TrackTriggerAssociation/interface/StubAssociation.h"
 #include "L1Trigger/TrackTrigger/interface/Setup.h"
-#include "L1Trigger/TrackerTFP/interface/DataFormats.h"
+#include "L1Trigger/TrackFindingTracklet/interface/DataFormats.h"
 #include "L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h"
 
 #include <TProfile.h>
@@ -30,7 +30,6 @@
 
 using namespace std;
 using namespace edm;
-using namespace trackerTFP;
 using namespace tt;
 
 namespace trklet {
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerTracklet.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerTracklet.cc
@@ -14,7 +14,7 @@
 
 #include "SimTracker/TrackTriggerAssociation/interface/StubAssociation.h"
 #include "L1Trigger/TrackTrigger/interface/Setup.h"
-#include "L1Trigger/TrackerTFP/interface/DataFormats.h"
+#include "L1Trigger/TrackFindingTracklet/interface/DataFormats.h"
 #include "L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h"
 
 #include <TProfile.h>
@@ -30,7 +30,6 @@
 
 using namespace std;
 using namespace edm;
-using namespace trackerTFP;
 using namespace tt;
 
 namespace trklet {
diff --git a/L1Trigger/TrackTrigger/interface/Setup.h b/L1Trigger/TrackTrigger/interface/Setup.h
@@ -222,7 +222,7 @@ namespace tt {
     // returns bit accurate hybrid stub radius for given TTStubRef and h/w bit word
     double stubR(const TTBV& hw, const TTStubRef& ttStubRef) const;
     // returns bit accurate position of a stub from a given tfp region [0-8]
-    GlobalPoint stubPos(bool hybrid, const tt::FrameStub& frame, int region) const;
+    GlobalPoint stubPos(const tt::FrameStub& frame, int region) const;
     // empty trackerDTC EDProduct
     TTDTC ttDTC() const { return TTDTC(numRegions_, numOverlappingRegions_, numDTCsPerRegion_); }
     // stub layer id (barrel: 1 - 6, endcap: 11 - 15)
diff --git a/L1Trigger/TrackTrigger/src/Setup.cc b/L1Trigger/TrackTrigger/src/Setup.cc
@@ -638,12 +638,12 @@ namespace tt {
   }
 
   // returns bit accurate position of a stub from a given tfp region [0-8]
-  GlobalPoint Setup::stubPos(bool hybrid, const FrameStub& frame, int region) const {
+  GlobalPoint Setup::stubPos(const FrameStub& frame, int region) const {
     GlobalPoint p;
     if (frame.first.isNull())
       return p;
     TTBV bv(frame.second);
-    if (hybrid) {
+    if (useHybrid_) {
       const bool barrel = this->barrel(frame.first);
       const int layerId = this->indexLayerId(frame.first);
       const GlobalPoint gp = this->stubPos(frame.first);
diff --git a/L1Trigger/TrackerDTC/test/Analyzer.cc b/L1Trigger/TrackerDTC/test/Analyzer.cc
@@ -94,8 +94,6 @@ namespace trackerDTC {
     const Setup* setup_;
     // enables analyze of TPs
     bool useMCTruth_;
-    // specifies used TT algorithm
-    bool hybrid_;
     //
     int nEvents_ = 0;
 
@@ -118,8 +116,7 @@ namespace trackerDTC {
     stringstream log_;
   };
 
-  Analyzer::Analyzer(const ParameterSet& iConfig)
-      : useMCTruth_(iConfig.getParameter<bool>("UseMCTruth")), hybrid_(iConfig.getParameter<bool>("UseHybrid")) {
+  Analyzer::Analyzer(const ParameterSet& iConfig) : useMCTruth_(iConfig.getParameter<bool>("UseMCTruth")) {
     usesResource("TFileService");
     // book in- and output ED products
     const auto& inputTagAccepted = iConfig.getParameter<InputTag>("InputTagAccepted");
@@ -315,7 +312,7 @@ namespace trackerDTC {
       if (frame.first.isNull())
         continue;
       sum++;
-      const GlobalPoint& pos = setup_->stubPos(hybrid_, frame, region);
+      const GlobalPoint& pos = setup_->stubPos(frame, region);
       const GlobalPoint& ttPos = setup_->stubPos(frame.first);
       const vector<double> resolutions = {
           ttPos.perp() - pos.perp(), deltaPhi(ttPos.phi() - pos.phi()), ttPos.z() - pos.z()};
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerLayerEncoding.cc b/L1Trigger/TrackerTFP/plugins/ProducerLayerEncoding.cc
@@ -3,7 +3,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"
-#include "DataFormats/Provenance/interface/ParameterSetID.h"
 #include "L1Trigger/TrackerTFP/interface/LayerEncoding.h"
 
 #include <memory>
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc b/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc
@@ -20,7 +20,6 @@
 using namespace std;
 using namespace edm;
 using namespace tt;
-using namespace trackerTFP;
 
 namespace trackerTFP {
 
@@ -33,7 +32,6 @@ namespace trackerTFP {
   public:
     explicit ProducerTQ(const ParameterSet&);
     ~ProducerTQ() override {}
-    void beginRun(const Run&, const EventSetup&) override;
     void produce(Event&, const EventSetup&) override;
 
   private:
@@ -54,10 +52,6 @@ namespace trackerTFP {
     ESGetToken<DataFormats, DataFormatsRcd> esGetTokenDataFormats_;
     // TrackQuality token
     ESGetToken<TrackQuality, DataFormatsRcd> esGetTokenTrackQuality_;
-    // number of processing regions
-    int numRegions_;
-    // number of kf layers
-    int numLayers_;
   };
 
   ProducerTQ::ProducerTQ(const ParameterSet& iConfig) {
@@ -75,31 +69,26 @@ namespace trackerTFP {
     esGetTokenTrackQuality_ = esConsumes();
   }
 
-  void ProducerTQ::beginRun(const Run& iRun, const EventSetup& iSetup) {
+  void ProducerTQ::produce(Event& iEvent, const EventSetup& iSetup) {
     // helper class to store configurations
     const Setup* setup = &iSetup.getData(esGetTokenSetup_);
-    numRegions_ = setup->numRegions();
-    numLayers_ = setup->numLayers();
-  }
-
-  void ProducerTQ::produce(Event& iEvent, const EventSetup& iSetup) {
     // helper class to determine Track Quality
     const TrackQuality* trackQuality = &iSetup.getData(esGetTokenTrackQuality_);
     auto valid = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNull() ? 0 : 1); };
     // empty TQ product
-    StreamsTrack outputTracks(numRegions_);
-    Streams outputTracksAdd(numRegions_);
-    StreamsStub outputStubs(numRegions_ * numLayers_);
+    StreamsTrack outputTracks(setup->numRegions());
+    Streams outputTracksAdd(setup->numRegions());
+    StreamsStub outputStubs(setup->numRegions() * setup->numLayers());
     // read in KF Product and produce TQ product
     Handle<StreamsStub> handleStubs;
     iEvent.getByToken<StreamsStub>(edGetTokenStubs_, handleStubs);
     const StreamsStub& streamsStubs = *handleStubs.product();
     Handle<StreamsTrack> handleTracks;
     iEvent.getByToken<StreamsTrack>(edGetTokenTracks_, handleTracks);
     const StreamsTrack& streamsTracks = *handleTracks.product();
-    for (int region = 0; region < numRegions_; region++) {
+    for (int region = 0; region < setup->numRegions(); region++) {
       // calculate track quality
-      const int offsetLayer = region * numLayers_;
+      const int offsetLayer = region * setup->numLayers();
       const StreamTrack& streamTrack = streamsTracks[region];
       const int nTracks = accumulate(streamTrack.begin(), streamTrack.end(), 0, valid);
       vector<Track> tracks;
@@ -113,28 +102,28 @@ namespace trackerTFP {
           continue;
         }
         StreamStub streamStub;
-        streamStub.reserve(numLayers_);
-        for (int layer = 0; layer < numLayers_; layer++)
+        streamStub.reserve(setup->numLayers());
+        for (int layer = 0; layer < setup->numLayers(); layer++)
           streamStub.push_back(streamsStubs[offsetLayer + layer][frame]);
         tracks.emplace_back(frameTrack, streamStub, trackQuality);
         stream.push_back(&tracks.back());
       }
       // fill TQ product
       outputTracks[region].reserve(stream.size());
       outputTracksAdd[region].reserve(stream.size());
-      for (int layer = 0; layer < numLayers_; layer++)
+      for (int layer = 0; layer < setup->numLayers(); layer++)
         outputStubs[offsetLayer + layer].reserve(stream.size());
       for (Track* track : stream) {
         if (!track) {
           outputTracks[region].emplace_back(FrameTrack());
           outputTracksAdd[region].emplace_back(Frame());
-          for (int layer = 0; layer < numLayers_; layer++)
+          for (int layer = 0; layer < setup->numLayers(); layer++)
             outputStubs[offsetLayer + layer].emplace_back(FrameStub());
           continue;
         }
         outputTracks[region].emplace_back(track->frameTrack_);
         outputTracksAdd[region].emplace_back(track->frame_);
-        for (int layer = 0; layer < numLayers_; layer++)
+        for (int layer = 0; layer < setup->numLayers(); layer++)
           outputStubs[offsetLayer + layer].emplace_back(track->streamStub_[layer]);
       }
     }
