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

Fit CSC comparator digis #18875

Merged
merged 18 commits into from Jun 26, 2017
Merged

Fit CSC comparator digis #18875

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a7171eb
make const
May 22, 2017
c9ee1c6
csc comparator fractional strip
May 22, 2017
43d52a1
csc comparator fit class
May 22, 2017
3360d32
csc stub fractional strip
May 22, 2017
7e40d03
csc comparator fit class
May 22, 2017
8c53875
make compile
May 22, 2017
33fe4a1
csc comparator fit class
May 22, 2017
e099598
Suggestion by Kevin Pedro
May 30, 2017
11f9661
do not use TF1 and TGraphErrors
Jun 8, 2017
414c741
Suggestion by Vladimir Ivantchenko
Jun 16, 2017
36bad4a
Suggestion by Vladimir Ivantchenko
Jun 16, 2017
6f5019c
Suggestions by David Lange
Jun 20, 2017
0fc43e6
cleanup
Jun 20, 2017
dfc9e67
use cstdint
Jun 20, 2017
eaf58ae
update include statements
Jun 20, 2017
e8ff3b9
update include statements
Jun 20, 2017
6399f2f
fix pat0
Jun 21, 2017
89af168
Merge branch 'master' into from-CMSSW_9_2_X_2017-05-21-2300-csc-compa…
Jun 22, 2017
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 DataFormats/CSCDigi/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonDetId"/>
<use name="boost"/>

<export>
<lib name="1"/>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCALCTDigi.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
* \author N. Terentiev, CMU
*/

#include <boost/cstdint.hpp>
#include <cstdint>
#include <iosfwd>

class CSCALCTDigi {
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCALCTDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCALCTDigi> CSCALCTDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCALCTStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCALCTStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCALCTStatusDigi> CSCALCTStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCCFEBStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCCFEBStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -6,9 +6,9 @@
* \author N. Terentiev, CMU
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCCFEBStatusDigi> CSCCFEBStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCCLCTDigi.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
* \author N. Terentiev, CMU
*/

#include <boost/cstdint.hpp>
#include <cstdint>
#include <iosfwd>

class CSCCLCTDigi {
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCCLCTDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCCLCTDigi> CSCCLCTDigiCollection;

Expand Down
5 changes: 4 additions & 1 deletion DataFormats/CSCDigi/interface/CSCComparatorDigi.h
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
*/
#include <iosfwd>
#include <vector>
#include <stdint.h>
#include <cstdint>

class CSCComparatorDigi{

Expand Down Expand Up @@ -46,6 +46,9 @@ class CSCComparatorDigi{
/// Get the associated halfstrip number for this comparator digi. Counts from 0.
int getHalfStrip() const;

/// Return the fractional half-strip. Counts from 0.25
float getFractionalStrip() const;

/** Return vector of the bin numbers for which time bins are ON.
* e.g. if bits 0 and 13 fired, then this vector will contain the values 0 and 13
*/
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
* \author Michael Schmitt, Northwestern
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCComparatorDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCComparatorDigi> CSCComparatorDigiCollection;

Expand Down
5 changes: 4 additions & 1 deletion DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
* \author L. Gray, UF
*/

#include <boost/cstdint.hpp>
#include <cstdint>
#include <iosfwd>

class CSCCorrelatedLCTDigi
Expand Down Expand Up @@ -42,6 +42,9 @@ class CSCCorrelatedLCTDigi
/// return the key halfstrip from 0,159
int getStrip() const { return strip; }

/// return the fractional strip. counts from 0.25
float getFractionalStrip() const;

/// return pattern
int getPattern() const { return pattern; }

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId,CSCCorrelatedLCTDigi> CSCCorrelatedLCTDigiCollection;

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -6,9 +6,9 @@
* \author N. Terentiev, CMU
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCDCCFormatStatusDigi> CSCDCCFormatStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCDCCStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCDCCStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCDCCStatusDigi> CSCDCCStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCDDUStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCDDUStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCDDUStatusDigi> CSCDDUStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCDMBStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCDMBStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
* Alex Tumanov 5/16/07
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCDMBStatusDigi> CSCDMBStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCRPCDigi.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
* \author N. Terentiev, CMU
*/

#include <boost/cstdint.hpp>
#include <cstdint>
#include <iosfwd>

class CSCRPCDigi{
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCRPCDigiCollection.h
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCRPCDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCRPCDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCRPCDigi> CSCRPCDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCStripDigi.h
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCStripDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCStripDigiCollection.h
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
* \author Michael Schmitt, Northwestern
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCStripDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCStripDigi> CSCStripDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCTMBStatusDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCTMBStatusDigiCollection.h
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCTMBStatusDigi> CSCTMBStatusDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/interface/CSCWireDigi.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@

#include <vector>
#include <iosfwd>
#include <stdint.h>
#include <cstdint>

class CSCWireDigi{

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/CSCDigi/interface/CSCWireDigiCollection.h
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
*
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <DataFormats/CSCDigi/interface/CSCWireDigi.h>
#include <DataFormats/MuonData/interface/MuonDigiCollection.h>
#include "DataFormats/MuonDetId/interface/CSCDetId.h"
#include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
#include "DataFormats/MuonData/interface/MuonDigiCollection.h"

typedef MuonDigiCollection<CSCDetId, CSCWireDigi> CSCWireDigiCollection;

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/src/CSCALCTDigi.cc
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* \author N. Terentiev, CMU
*/

#include <DataFormats/CSCDigi/interface/CSCALCTDigi.h>
#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include <iomanip>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/src/CSCALCTStatusDigi.cc
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@

#include <ostream>
#include <cstring>
#include <stdint.h>
#include <cstdint>

CSCALCTStatusDigi::CSCALCTStatusDigi(const uint16_t * header, const uint16_t * trailer)
{
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@
*
* \author N.Terentiev, CMU
*/
#include <DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h>
#include "DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include <iostream>
#include <stdint.h>
#include <cstdint>

/// Shift and select
int CSCCFEBStatusDigi::ShiftSel(int nmb,int nshift,int nsel) const {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/src/CSCCLCTDigi.cc
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* \author N. Terentiev, CMU
*/

#include <DataFormats/CSCDigi/interface/CSCCLCTDigi.h>
#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include <iomanip>
#include <iostream>
Expand Down
7 changes: 6 additions & 1 deletion DataFormats/CSCDigi/src/CSCComparatorDigi.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
*
* \author M.Schmitt, Northwestern
*/
#include <DataFormats/CSCDigi/interface/CSCComparatorDigi.h>
#include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include <iostream>
#include <algorithm>
Expand Down Expand Up @@ -74,6 +74,11 @@ int CSCComparatorDigi::getHalfStrip() const {
return (getStrip() - 1) * 2 + getComparator();
}

// Return the fractional half-strip
float CSCComparatorDigi::getFractionalStrip() const {
return getStrip() + getComparator() * 0.5f - 0.75f;
}

std::vector<int> CSCComparatorDigi::getTimeBinsOn() const {
std::vector<int> tbins;
uint16_t tbit = timeBinWord_;
Expand Down
5 changes: 5 additions & 0 deletions DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc
View file
Open in desktop
Expand Up @@ -55,6 +55,11 @@ void CSCCorrelatedLCTDigi::clear() {
cscID = 0;
}

/// return the fractional strip
float CSCCorrelatedLCTDigi::getFractionalStrip() const{
return 0.5f * (getStrip() + 1) - 0.25f;
}

/// Comparison
bool CSCCorrelatedLCTDigi::operator==(const CSCCorrelatedLCTDigi &rhs) const {
return ((trknmb == rhs.trknmb) && (quality == rhs.quality) &&
Expand Down