Skip to content

Dt extended data format #34025

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.

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

Merged
merged 26 commits into from
Jun 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
da86943
producer uses extended DF
NTrevisani Jun 1, 2021
06258e1
new and updated classes for extended DF
NTrevisani Jun 1, 2021
a01bb52
expanding metaprimitives for ext DF
NTrevisani Jun 1, 2021
4bcf84c
expanding MuonPath for ext DF
NTrevisani Jun 1, 2021
95048eb
MuonPathAnalyticAnalyzer uses ext DF
NTrevisani Jun 1, 2021
66e3d0d
AnalyzerInChamber uses ext DF and some updates
NTrevisani Jun 1, 2021
7fb9416
PseudoBayesGrouping considers patterns per chamber
NTrevisani Jun 1, 2021
25b3976
updating parameters in python files
NTrevisani Jun 1, 2021
147bf9d
MuonAssociator uses ext data format
NTrevisani Jun 1, 2021
21899cc
small fixes
NTrevisani Jun 1, 2021
52a85d9
small fixes
NTrevisani Jun 1, 2021
b4067d7
Hit filter, cfg for dubugging and some couts
NTrevisani Jun 2, 2021
2b0929d
fixing constructor
NTrevisani Jun 2, 2021
b96b381
removing hits time filter
NTrevisani Jun 2, 2021
1a2e299
fix
NTrevisani Jun 2, 2021
8535d1a
back to the proper version
NTrevisani Jun 2, 2021
690c1b4
running both grouping algorithms
NTrevisani Jun 2, 2021
3b0e05e
macros to compare groupings
NTrevisani Jun 2, 2021
9364e81
fixing shift_back for TDC
NTrevisani Jun 2, 2021
7548b68
fixing shift for correlated primitives
NTrevisani Jun 7, 2021
8a33170
removing cout and commented instructions. Adding cmssw-like coordinat…
NTrevisani Jun 7, 2021
cb6e061
removing cout and commented instructions
NTrevisani Jun 7, 2021
ed8de26
removing cout and commented instructions
NTrevisani Jun 7, 2021
fad3241
fix cmssw-like conversion factors
NTrevisani Jun 8, 2021
2e0802b
code checks and format
NTrevisani Jun 8, 2021
1475748
removing namespace from header file and std dataformat as default
NTrevisani Jun 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhContainer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//-------------------------------------------------
//
// Class L1Phase2MuDTExtPhContainer
//
// Description: trigger primtive data for the
// muon barrel Phase2 trigger
//
//
// Author List: Nicolo' Trevisani - Oviedo ICTEA
//
//
//--------------------------------------------------
#ifndef L1Phase2MuDTExtPhContainer_H
#define L1Phase2MuDTExtPhContainer_H

//------------------------------------
// Collaborating Class Declarations --
//------------------------------------
#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h"

//----------------------
// Base Class Headers --
//----------------------
#include <vector>

//---------------
// C++ Headers --
//---------------

//---------------------
//-- Class Interface --
//---------------------

class L1Phase2MuDTExtPhContainer {
public:
typedef std::vector<L1Phase2MuDTExtPhDigi> Segment_Container;
typedef Segment_Container::const_iterator Segment_iterator;

// Constructor
L1Phase2MuDTExtPhContainer();

void setContainer(const Segment_Container& inputSegments);

Segment_Container const* getContainer() const;

private:
Segment_Container m_segments;
};

#endif
86 changes: 86 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
//-------------------------------------------------
//
// Class L1Phase2MuDTExtPhDigi
//
// Description: trigger primtive data for the
// muon barrel Phase2 trigger
//
//
// Author List: Nicolo' Trevisani - Oviedo ICTEA
//
//
//--------------------------------------------------
#ifndef L1Phase2MuDTExtPhDigi_H
#define L1Phase2MuDTExtPhDigi_H

//------------------------------------
// Collaborating Class Declarations --
//------------------------------------

#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h"

//----------------------
// Base Class Headers --
//----------------------

//---------------
// C++ Headers --
//---------------

// ---------------------
// -- Class Interface --
// ---------------------

class L1Phase2MuDTExtPhDigi : public L1Phase2MuDTPhDigi {
public:
// Constructors
L1Phase2MuDTExtPhDigi();

L1Phase2MuDTExtPhDigi(int bx,
int wh,
int sc,
int st,
int sl,
int phi,
int phib,
int qual,
int idx,
int t0,
int chi2,
int x,
int tan,
int phi_cmssw,
int phib_cmssw,
int rpc = -10,
int wireId[8] = nullptr,
int tdc[8] = nullptr,
int lat[8] = nullptr);

L1Phase2MuDTExtPhDigi(const L1Phase2MuDTExtPhDigi &digi);

~L1Phase2MuDTExtPhDigi() override{};

// Operations
int xLocal() const;
int tanPsi() const;

int phiCMSSW() const;
int phiBendCMSSW() const;

int pathWireId(int) const;
int pathTDC(int) const;
int pathLat(int) const;

private:
int m_xLocal;
int m_tanPsi;

int m_phiCMSSW;
int m_phiBendCMSSW;

int m_pathWireId[8];
int m_pathTDC[8];
int m_pathLat[8];
};

#endif
51 changes: 51 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThContainer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//-------------------------------------------------
//
// Class L1Phase2MuDTExtThContainer
//
// Description: trigger primtive data for the
// muon barrel Phase2 trigger
//
//
// Author List: Nicolo' Trevisani - Oviedo ICTEA
//
//
//--------------------------------------------------

#ifndef L1Phase2MuDTExtThContainer_H
#define L1Phase2MuDTExtThContainer_H

//------------------------------------
// Collaborating Class Declarations --
//------------------------------------
#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h"

//----------------------
// Base Class Headers --
//----------------------
#include <vector>

//---------------
// C++ Headers --
//---------------

//---------------------
//-- Class Interface --
//---------------------

class L1Phase2MuDTExtThContainer {
public:
typedef std::vector<L1Phase2MuDTExtThDigi> Segment_Container;
typedef Segment_Container::const_iterator Segment_iterator;

// Constructor
L1Phase2MuDTExtThContainer();

void setContainer(const Segment_Container& inputSegments);

Segment_Container const* getContainer() const;

private:
Segment_Container m_segments;
};

#endif
82 changes: 82 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
//-------------------------------------------------
//
// Class L1Phase2MuDTExtThDigi
//
// Description: trigger primtive data for the
// muon barrel Phase2 trigger
//
//
// Author List: Nicolo' Trevisani - Oviedo
//
//
//--------------------------------------------------
#ifndef L1Phase2MuDTExtThDigi_H
#define L1Phase2MuDTExtThDigi_H

//------------------------------------
// Collaborating Class Declarations --
//------------------------------------

#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h"

//----------------------
// Base Class Headers --
//----------------------

//---------------
// C++ Headers --
//---------------

// ---------------------
// -- Class Interface --
// ---------------------

class L1Phase2MuDTExtThDigi : public L1Phase2MuDTThDigi {
public:
// Constructors
L1Phase2MuDTExtThDigi();

L1Phase2MuDTExtThDigi(int bx,
int wh,
int sc,
int st,
int z,
int k,
int qual,
int idx,
int t0,
int chi2,
int y,
int z_cmssw,
int k_cmssw,
int rpc = -10,
int wireId[4] = nullptr,
int tdc[4] = nullptr,
int lat[4] = nullptr);

L1Phase2MuDTExtThDigi(const L1Phase2MuDTExtThDigi &digi);

~L1Phase2MuDTExtThDigi() override{};

// Operations
int yLocal() const;

int zCMSSW() const;
int kCMSSW() const;

int pathWireId(int) const;
int pathTDC(int) const;
int pathLat(int) const;

private:
int m_yLocal;

int m_zCMSSW;
int m_kCMSSW;

int m_pathWireId[4];
int m_pathTDC[4];
int m_pathLat[4];
};

#endif
2 changes: 2 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class L1Phase2MuDTPhDigi {
L1Phase2MuDTPhDigi(
int bx, int wh, int sc, int st, int sl, int phi, int phib, int qual, int idx, int t0, int chi2, int rpc = -10);

virtual ~L1Phase2MuDTPhDigi(){};

// Operations
int bxNum() const;

Expand Down
2 changes: 2 additions & 0 deletions DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class L1Phase2MuDTThDigi {

L1Phase2MuDTThDigi(int bx, int wh, int sc, int st, int z, int k, int qual, int idx, int t0, int chi2, int rpc = -10);

virtual ~L1Phase2MuDTThDigi(){};

// Operations
int bxNum() const;

Expand Down
43 changes: 43 additions & 0 deletions DataFormats/L1DTTrackFinder/src/L1Phase2MuDTExtPhContainer.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//-------------------------------------------------
//
// Class L1Phase2MuDTExtPhContainer
//
// Description: trigger primtive data for the
// muon barrel Phase2 trigger
//
//
// Author List: Nicolo' Trevisani - Oviedo ICTEA
//
//
//--------------------------------------------------

//-----------------------
// This Class's Header --
//-----------------------
#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhContainer.h"

//-------------------------------
// Collaborating Class Headers --
//-------------------------------

//---------------
// C++ Headers --
//---------------

//-------------------
// Initializations --
//-------------------

//----------------
// Constructors --
//----------------
L1Phase2MuDTExtPhContainer::L1Phase2MuDTExtPhContainer() {}

//--------------
// Operations --
//--------------
void L1Phase2MuDTExtPhContainer::setContainer(const Segment_Container& inputSegments) { m_segments = inputSegments; }

L1Phase2MuDTExtPhContainer::Segment_Container const* L1Phase2MuDTExtPhContainer::getContainer() const {
return &m_segments;
}
Loading