Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce boost dependency in L1Trigger/TrackFindingTMTT #30617

Merged
merged 1 commit into from Jul 24, 2020
Merged

Reduce boost dependency in L1Trigger/TrackFindingTMTT #30617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion L1Trigger/TrackFindingTMTT/BuildFile.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
<use name="SimTracker/TrackTriggerAssociation"/>
<use name="DataFormats/JetReco"/>
<use name="L1Trigger/TrackTrigger"/>
<use name="boost"/>
<use name="roothistmatrix"/>
<export>
<lib name="1"/>
Expand Down
24 changes: 20 additions & 4 deletions L1Trigger/TrackFindingTMTT/interface/HTbase.h
View file
Open in desktop
@@ -1,20 +1,36 @@

#ifndef L1Trigger_TrackFindingTMTT_HTbase_h
#define L1Trigger_TrackFindingTMTT_HTbase_h

#include "L1Trigger/TrackFindingTMTT/interface/HTcell.h"
#include "L1Trigger/TrackFindingTMTT/interface/L1track2D.h"

#include <boost/numeric/ublas/matrix.hpp>

#include <vector>
#include <list>
#include <utility>
#include <memory>

using boost::numeric::ublas::matrix;
namespace tmtt {
template <typename T>
class matrix {
public:
//for a mxn matrix - row major
matrix(unsigned int m, unsigned int n) : _n{n}, _m{m} { _matrix.resize(m * n); }
const T& operator()(unsigned int i, unsigned int j) const { return _matrix.at(i * _n + j); }
T& operator()(unsigned int i, unsigned int j) {
if (i >= _m || j >= _n)
throw std::out_of_range("matrix access out of bounds");

return _matrix[i * _n + j];
}

private:
std::vector<T> _matrix;
unsigned int _n, _m;
};
} // namespace tmtt

//=== Base class for Hough Transform array for a single (eta,phi) sector.

namespace tmtt {

class Settings;
Expand Down
3 changes: 0 additions & 3 deletions L1Trigger/TrackFindingTMTT/interface/Histos.h
View file
Open in desktop
Expand Up @@ -7,9 +7,6 @@
#include "L1Trigger/TrackFindingTMTT/interface/L1track3D.h"
#include "L1Trigger/TrackFindingTMTT/interface/TrackerModule.h"

#include <boost/numeric/ublas/matrix.hpp>
using boost::numeric::ublas::matrix;

#include <vector>
#include <map>
#include <list>
Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackFindingTMTT/interface/MiniHTstage.h
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
#include "L1Trigger/TrackFindingTMTT/interface/HTrphi.h"
#include "L1Trigger/TrackFindingTMTT/interface/MuxHToutputs.h"

using boost::numeric::ublas::matrix;
#include <memory>

namespace tmtt {
Expand Down
3 changes: 0 additions & 3 deletions L1Trigger/TrackFindingTMTT/interface/MuxHToutputs.h
View file
Open in desktop
Expand Up @@ -3,12 +3,9 @@

#include "L1Trigger/TrackFindingTMTT/interface/HTrphi.h"

#include "boost/numeric/ublas/matrix.hpp"
#include <vector>
#include <memory>

using boost::numeric::ublas::matrix;

//==================================================================================================
/**
* Multiplex the tracks found by several HT onto a single output optical link.
Expand Down
3 changes: 0 additions & 3 deletions L1Trigger/TrackFindingTMTT/plugins/TMTrackProducer.cc
View file
Open in desktop
Expand Up @@ -15,8 +15,6 @@
#include "FWCore/MessageService/interface/MessageLogger.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include <boost/numeric/ublas/matrix.hpp>

#include <iostream>
#include <vector>
#include <list>
Expand All @@ -25,7 +23,6 @@
#include <mutex>

using namespace std;
using boost::numeric::ublas::matrix;

namespace tmtt {

Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackFindingTMTT/src/Histos.cc
View file
Open in desktop
Expand Up @@ -636,7 +636,6 @@ namespace tmtt {
//=== Count stubs per event assigned to track candidates in the Tracker

unsigned int nStubsOnTracks = 0;
matrix nStubsOnTracksInSec(numPhiSectors_, numEtaRegions_, 0);
vector<unsigned int> nStubsOnTracksInNonant(numPhiNonants, 0);

for (const L1track3D& t : tracks) {
Expand Down