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.

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

CTPPS: TotemTimingDigi, totemTimingRawToDigi and mapping for the new Timing detector in Vertical RPs #22796

Merged
merged 29 commits into from Apr 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
93deb3d
Starting new unpacker
nminafra Mar 20, 2018
49718b4
Starting new unpacker 2
nminafra Mar 20, 2018
b862bce
Tested up to RawToDigi, dynamic mapping still todo
nminafra Mar 24, 2018
24bac29
Added hwId to plane,channel mapping
nminafra Mar 26, 2018
2db4bff
cleanup
nminafra Mar 26, 2018
5f30575
cleanup
nminafra Mar 26, 2018
3316f9b
Cleanup and bugfixing
nminafra Mar 27, 2018
d9b185e
Add PLLInfo
nminafra Mar 27, 2018
a057106
Plane and Channel ID reduced to 4+4 bits
nminafra Mar 27, 2018
303ac72
Ready for PR
nminafra Mar 28, 2018
d8896f8
improved code readability, bugfixing
nminafra Mar 28, 2018
07cd919
Stripped the TOTEM timing DQM subpart from the CTPPS DQM
forthommel Mar 29, 2018
de2e642
Further cleanup
forthommel Mar 29, 2018
669041d
Cleanup
forthommel Mar 29, 2018
afbebc3
Typographic changes
forthommel Apr 4, 2018
99db213
Removed unnecessary couts/printf, some replaced with LogDebug/LogWarn…
forthommel Apr 4, 2018
4e465f9
More CMS conventions used
forthommel Apr 4, 2018
62a8e90
Retrieving a const-qualified frame word
forthommel Apr 4, 2018
98db768
Retrieving a const-qualified frame
forthommel Apr 4, 2018
f7568f5
Subscribing the digis to the CTPPS event content
forthommel Apr 4, 2018
e0f30ef
Forgot two const-qualifiers
forthommel Apr 4, 2018
1fccb1e
Fallback test
forthommel Apr 4, 2018
c3e7c28
CMS naming conventions
forthommel Apr 4, 2018
95d467a
More CMS naming conventions
forthommel Apr 4, 2018
6582b9d
Forgot two else-if
forthommel Apr 4, 2018
db6bbdd
Removed pragmas
nminafra Apr 7, 2018
58e50eb
Added pllInfo to TotemTimingEventInfo
nminafra Apr 7, 2018
c009844
Fixed printing bug
nminafra Apr 7, 2018
b3f48e5
Fixed grayCounter bug
nminafra Apr 7, 2018
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
13 changes: 13 additions & 0 deletions CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h
Expand Up @@ -43,7 +43,20 @@ class TotemDAQMapping
public:
std::map<TotemFramePosition, TotemVFATInfo> VFATMapping;

/// Hw Id mapping for Totem Timing (dynamical mapping in Sampic)
struct TotemTimingPlaneChannelPair
{
int plane;
int channel;

TotemTimingPlaneChannelPair(const int& plane=-1, const int& channel=-1) : plane(plane), channel(channel) {};
};
std::map<uint8_t, TotemTimingPlaneChannelPair> totemTimingChannelMap;

void insert(const TotemFramePosition &fp, const TotemVFATInfo &vi);

/// Given the hardware ID, returns the corresponding Plane, Channel pair (TotemTimingPlaneChannelPair)
const TotemTimingPlaneChannelPair getTimingChannel( const uint8_t hwId ) const;
};

#endif