BenjaminRS 1

Author: tschuh

L1Trigger/TrackFindingTMTT/python/TMTrackProducer_Defaults_cfi.py

@@ -358,7 +358,7 @@
      #--- Options for Kalman filter track fitters ---
      #
      # Larger number has more debug printout. "1" is useful for understanding why tracks are lost, best combined with TrackFitCheat=True.
-     KalmanDebugLevel        = cms.uint32(2),
+     KalmanDebugLevel        = cms.uint32(0),
      # Fit will reject fitted tracks unless it can assign at least this number of stubs to them.
      KalmanMinNumStubs       = cms.uint32(4),
      # Fit will attempt to add up to this nummber of stubs to each fitted tracks, but won't bother adding more.

L1Trigger/TrackFindingTMTT/src/Settings.cc

@@ -39,7 +39,6 @@ namespace tmtt {
 
         // Kalman filter track fit cfg
         kalmanDebugLevel_(0),
-        //kalmanDebugLevel_(2),  // Good for debugging
         kalmanMinNumStubs_(4),
         kalmanMaxNumStubs_(6),
         kalmanAddBeamConstr_(false),  // Apply post-fit beam-spot constraint to 5-param fit

L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h

@@ -38,7 +38,7 @@ namespace trklet {
     };
     ChannelAssignment() {}
     ChannelAssignment(const Config& iConfig, const tt::Setup* setup);
-    ~ChannelAssignment() {}
+    ~ChannelAssignment() = default;
     // helper class to store configurations
     const tt::Setup* setup() const { return setup_; }
     // returns channelId of given TTTrackRef from TrackBuilder

L1Trigger/TrackFindingTracklet/interface/DataFormats.h

@@ -45,7 +45,7 @@ namespace trklet {
     DataFormat(bool twos, int width, double base, double range)
         : twos_(twos), width_(width), base_(base), range_(range) {}
     DataFormat() {}
-    virtual ~DataFormat() {}
+    ~DataFormat() = default;
     // converts int to bitvector
     TTBV ttBV(int i) const { return TTBV(i, width_, twos_); }
     // converts double to bitvector
@@ -77,7 +77,7 @@ namespace trklet {
     // converts floating point value to binary integer value
     int toUnsigned(double d) const { return this->integer(d) + std::pow(2, width_) / 2; }
     // biggest representable floating point value
-    //double limit() const { return (range_ - base_) / (twos_ ? 2. : 1.); }
+    double limit() const { return (range_ - base_) / (twos_ ? 2. : 1.); }
     // returns false if data format would oferflow for this double value
     bool inRange(double d, bool digi = true) const {
       const double range = digi ? base_ * pow(2, width_) : range_;
@@ -302,7 +302,7 @@ namespace trklet {
       dataFormats_->convertStub(p_, data_, frame_.second);
     }
     Stub() {}
-    ~Stub() {}
+    virtual ~Stub() = default;
     // true if frame valid, false if gap in data stream
     explicit operator bool() const { return frame_.first.isNonnull(); }
     // access to DataFormats
@@ -331,7 +331,7 @@ namespace trklet {
     // construct StubTM from TTStubRef
     StubTM(const TTStubRef& ttStubRef, const DataFormats* df, int stubId, double r, double phi, double z)
         : Stub(ttStubRef, df, Process::tm, stubId, r, phi, z) {}
-    ~StubTM() {}
+    ~StubTM() override = default;
     // stub Id
     int stubId() const { return std::get<0>(data_); }
     // stub radius wrt chosenRofPhi
@@ -350,7 +350,7 @@ namespace trklet {
     // construct StubDR from StubTM
     StubDR(const StubTM& stub, double r, double phi, double z, double dPhi, double dZ)
         : Stub(stub, r, phi, z, dPhi, dZ) {}
-    ~StubDR() {}
+    ~StubDR() override = default;
     // stub radius wrt chosenRofPhi
     double r() const { return std::get<0>(data_); }
     // stub phi wrt phi sector centre
@@ -371,7 +371,7 @@ namespace trklet {
     // construct StubKF from StubDR
     StubKF(const StubDR& stub, double r, double phi, double z, double dPhi, double dZ)
         : Stub(stub, r, phi, z, dPhi, dZ) {}
-    ~StubKF() {}
+    ~StubKF() override = default;
     // stub radius wrt chosenRofPhi
     double r() const { return std::get<0>(data_); };
     // stub phi residual wrt track parameter
@@ -404,7 +404,7 @@ namespace trklet {
       dataFormats_->convertTrack(p_, data_, frame_.second);
     }
     Track() {}
-    ~Track() {}
+    virtual ~Track() = default;
     // true if frame valid, false if gap in data stream
     explicit operator bool() const { return frame_.first.isNonnull(); }
     // access to DataFormats
@@ -433,7 +433,7 @@ namespace trklet {
     // construct TrackTM from TTTrack
     TrackTM(const TTTrackRef& tTTrackRef, const DataFormats* df, double inv2R, double phiT, double zT)
         : Track(tTTrackRef, df, Process::tm, inv2R, phiT, zT) {}
-    ~TrackTM() {}
+    ~TrackTM() override = default;
     // track inv2R
     double inv2R() const { return std::get<0>(data_); }
     // track phi at radius chosenRofPhi wrt pprocessing centre
@@ -449,7 +449,7 @@ namespace trklet {
     TrackDR(const tt::FrameTrack& ft, const DataFormats* df) : Track(ft, df, Process::dr) {}
     // construct TrackDR from TrackTM
     TrackDR(const TrackTM& track) : Track(track, track.inv2R(), track.phiT(), track.zT()) {}
-    ~TrackDR() {}
+    ~TrackDR() override = default;
     // track qOver pt
     double inv2R() const { return std::get<0>(data_); }
     // track phi at radius chosenRofPhi wrt processing nonant centre
@@ -467,7 +467,7 @@ namespace trklet {
     TrackKF(const TrackDR& track, double inv2R, double phiT, double cot, double zT)
         : Track(track, inv2R, phiT, cot, zT) {}
     TrackKF() {}
-    ~TrackKF() {}
+    ~TrackKF() override = default;
     // track inv2R
     double inv2R() const { return std::get<0>(data_); }
     // track phi at radius 0 wrt processing nonant centre

L1Trigger/TrackFindingTracklet/interface/DuplicateRemoval.h

@@ -25,7 +25,7 @@ namespace trklet {
                      const DataFormats* dataFormats,
                      const ChannelAssignment* channelAssignment,
                      int region);
-    ~DuplicateRemoval() {}
+    ~DuplicateRemoval() = default;
     // read in and organize input tracks and stubs
     void consume(const tt::StreamsTrack& streamsTrack, const tt::StreamsStub& streamsStub);
     // fill output products

L1Trigger/TrackFindingTracklet/interface/KalmanFilter.h

@@ -49,7 +49,7 @@ namespace trklet {
                  tmtt::KFParamsComb* tmtt,
                  int region,
                  tt::TTTracks& ttTracks);
-    ~KalmanFilter() {}
+    ~KalmanFilter() = default;
     // read in and organize input tracks and stubs
     void consume(const tt::StreamsTrack& streamsTrack, const tt::StreamsStub& streamsStub);
     // fill output products

L1Trigger/TrackFindingTracklet/interface/KalmanFilterFormats.h

@@ -146,7 +146,7 @@ namespace trklet {
   class DataFormatKF {
   public:
     DataFormatKF(const VariableKF& v, bool twos, bool enableIntegerEmulation, int width, double base, double range);
-    virtual ~DataFormatKF() {}
+    ~DataFormatKF() = default;
     double digi(double val) const {
       return enableIntegerEmulation_ ? (std::floor(val / base_ + 1.e-11) + .5) * base_ : val;
     }
@@ -177,7 +177,7 @@ namespace trklet {
   class KalmanFilterFormats {
   public:
     KalmanFilterFormats();
-    ~KalmanFilterFormats() {}
+    ~KalmanFilterFormats() = default;
     DataFormatKF& format(VariableKF v) { return formats_[+v]; }
     const tt::Setup* setup() const { return dataFormats_->setup(); }
     const DataFormats* dataFormats() const { return dataFormats_; }

L1Trigger/TrackFindingTracklet/interface/State.h

@@ -30,7 +30,7 @@ namespace trklet {
     State(State* state, const std::vector<double>& doubles);
     // combinatoric and seed building state constructor
     State(State* state, State* parent, int layer);
-    ~State() {}
+    ~State() = default;
     //
     State* comb(std::deque<State>& states, int layer);
     //

L1Trigger/TrackFindingTracklet/interface/TrackFindingProcessor.h

@@ -23,7 +23,7 @@ namespace trklet {
     TrackFindingProcessor(const tt::Setup* setup_,
                           const DataFormats* dataFormats,
                           const trackerTFP::TrackQuality* trackQuality);
-    ~TrackFindingProcessor() {}
+    ~TrackFindingProcessor() = default;
 
     // produce TTTracks
     void produce(const tt::StreamsTrack& inputs,

L1Trigger/TrackFindingTracklet/interface/TrackMultiplexer.h

@@ -24,7 +24,7 @@ namespace trklet {
                      const ChannelAssignment* channelAssignment,
                      const Settings* settings,
                      int region);
-    ~TrackMultiplexer() {}
+    ~TrackMultiplexer() = default;
     // read in and organize input tracks and stubs
     void consume(const tt::StreamsTrack& streamsTrack, const tt::StreamsStub& streamsStub);
     // fill output products