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

Merge ShallowGainCalibration logic in SiStripGainsPCLWorker and a minor bugfix #33523

Merged
merged 5 commits into from May 4, 2021
Merged

Merge ShallowGainCalibration logic in SiStripGainsPCLWorker and a minor bugfix #33523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edfbf92
remove ShallowEventRun from strip gains PCL worker sequence
pieterdavid Mar 31, 2021
fb51bd9
Strips G2 PCL without shallow tracks, first take (compiling)
pieterdavid Apr 1, 2021
7769b40
overlapping as in master branch
pieterdavid Apr 12, 2021
bdb19a4
Fix 'overlapping'
pieterdavid Apr 26, 2021
760741a
Count actually used clusters
pieterdavid Apr 26, 2021
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
38 changes: 4 additions & 34 deletions CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
// A. Di Mattia (PCL multi stream processing and monitoring)
// M. Delcourt (monitoring)
// M. Musich (migration to thread-safe DQMStore access)
// P. David (merge ShallowGainCalibration with SiStripGainsPCLWorker)
//
// Created: Wed, 12 Apr 2017 14:46:48 GMT
//
Expand Down Expand Up @@ -111,45 +112,14 @@ class SiStripGainsPCLWorker : public DQMGlobalEDAnalyzer<APVGain::APVGainHistogr
std::string m_calibrationMode; /*!< Type of statistics for the calibration */
std::vector<std::string> VChargeHisto; /*!< Charge monitor plots to be output */

//Data members for processing

edm::EDGetTokenT<std::vector<bool> > TrigTech_token_;
edm::EDGetTokenT<std::vector<double> > trackchi2ndof_token_;
edm::EDGetTokenT<std::vector<float> > trackp_token_;
edm::EDGetTokenT<std::vector<float> > trackpt_token_;
edm::EDGetTokenT<std::vector<double> > tracketa_token_;
edm::EDGetTokenT<std::vector<double> > trackphi_token_;
edm::EDGetTokenT<std::vector<unsigned int> > trackhitsvalid_token_;
edm::EDGetTokenT<std::vector<int> > trackalgo_token_;
edm::EDGetTokenT<std::vector<int> > trackindex_token_;
edm::EDGetTokenT<std::vector<unsigned int> > rawid_token_;
edm::EDGetTokenT<std::vector<double> > localdirx_token_;
edm::EDGetTokenT<std::vector<double> > localdiry_token_;
edm::EDGetTokenT<std::vector<double> > localdirz_token_;
edm::EDGetTokenT<std::vector<unsigned short> > firststrip_token_;
edm::EDGetTokenT<std::vector<unsigned short> > nstrips_token_;
edm::EDGetTokenT<std::vector<bool> > saturation_token_;
edm::EDGetTokenT<std::vector<bool> > overlapping_token_;
edm::EDGetTokenT<std::vector<bool> > farfromedge_token_;
edm::EDGetTokenT<std::vector<unsigned int> > charge_token_;
edm::EDGetTokenT<std::vector<double> > path_token_;
edm::EDGetTokenT<std::vector<double> > chargeoverpath_token_;
edm::EDGetTokenT<std::vector<unsigned char> > amplitude_token_;
edm::EDGetTokenT<std::vector<double> > gainused_token_;
edm::EDGetTokenT<std::vector<double> > gainusedTick_token_;
edm::EDGetTokenT<edm::View<reco::Track>> m_tracks_token;
edm::EDGetTokenT<TrajTrackAssociationCollection> m_association_token;

edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomTokenBR_, tkGeomToken_;
edm::ESGetToken<SiStripGain, SiStripGainRcd> gainToken_;
edm::ESGetToken<SiStripQuality, SiStripQualityRcd> qualityToken_;

std::string EventPrefix_; //("");
std::string EventSuffix_; //("");
std::string TrackPrefix_; //("track");
std::string TrackSuffix_; //("");
std::string CalibPrefix_; //("GainCalibration");
std::string CalibSuffix_; //("");

// maps histograms index to topology
std::map<unsigned int, APVloc> theTopologyMap;
};
Expand Down
14 changes: 1 addition & 13 deletions CalibTracker/SiStripChannelGain/python/SiStripGainsPCLWorker_cfi.py
View file
Open in desktop
Expand Up @@ -12,17 +12,5 @@
DQMdir = cms.untracked.string('AlCaReco/SiStripGains'),
calibrationMode = cms.untracked.string('StdBunch'),
ChargeHisto = cms.untracked.vstring('TIB','TIB_layer_1','TOB','TOB_layer_1','TIDminus','TIDplus','TECminus','TECplus','TEC_thin','TEC_thick'),
gain = cms.untracked.PSet(label = cms.untracked.string('shallowGainCalibration'),
prefix = cms.untracked.string("GainCalibration"),
suffix = cms.untracked.string('')
),
evtinfo = cms.untracked.PSet(label = cms.untracked.string('shallowEventRun'),
prefix = cms.untracked.string(""),
suffix = cms.untracked.string('')
),
tracks = cms.untracked.PSet(label = cms.untracked.string('shallowTracks'),
prefix = cms.untracked.string("track"),
suffix = cms.untracked.string('')
)
tracks=cms.InputTag("generalTracks",""),
)