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

HCALDQM: Update DigiTask for 2018 HE (10_1_X backport) #22972

Merged
merged 16 commits into from May 2, 2018
Merged

HCALDQM: Update DigiTask for 2018 HE (10_1_X backport) #22972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b594aec
Move digi size reference to python and update for 2018
DryRun Mar 12, 2018
945cb41
Move digi size reference to python and update for 2018
DryRun Mar 12, 2018
9e27fc7
Fix 2018 modifier
DryRun Mar 12, 2018
5138d91
Digi sized unsigned int
DryRun Mar 12, 2018
85b9abe
Try sharing refDigiSize between DigiTask and HcalOnlineHarvesting
DryRun Mar 12, 2018
7d53989
Try sharing refDigiSize between DigiTask and HcalOnlineHarvesting
DryRun Mar 12, 2018
58c92b1
Try sharing refDigiSize between DigiTask and HcalOnlineHarvesting
DryRun Mar 12, 2018
0d87ba1
Digi size reference for offline harvesting too
DryRun Mar 13, 2018
c02a24b
Fix order of subdets in comment
DryRun Mar 14, 2018
33d916e
Rename HEP17 to just HE for 2018
DryRun Mar 21, 2018
64d3f5d
Integrate QIE11Task into DigiTask, and fill all plots for HE
DryRun Mar 21, 2018
4aa7b34
Bug fix
DryRun Mar 21, 2018
f8aeac9
HBHEDigiCollection: only use HB digis now
DryRun Mar 23, 2018
50dbd82
Laser task fix: increase z axis for laser signal in fC
DryRun Mar 23, 2018
c3cdccb
Require HE for QIE11 digis
DryRun Mar 27, 2018
e07aec5
Reduce TDCTime axis bin 250 -> 100, or 1ns to 2.5ns granularity
DryRun Apr 5, 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
1 change: 0 additions & 1 deletion DQM/HcalCommon/interface/Constants.h
View file
Open in desktop
Expand Up @@ -180,7 +180,6 @@ namespace hcaldqm
int const HF = 4;
int const SUBDET_NUM = 4;
int const TPSUBDET_NUM = 2;
int const DIGISIZE[SUBDET_NUM] = {10, 10, 10, 3};
std::string const SUBDET_NAME[SUBDET_NUM]={"HB", "HE", "HO", "HF"};
std::string const SUBDETPM_NAME[2*SUBDET_NUM] = { "HBM", "HBP",
"HEM", "HEP", "HOM", "HOP", "HFM", "HFP"};
Expand Down
12 changes: 6 additions & 6 deletions DQM/HcalCommon/interface/ValueQuantity.h
View file
Open in desktop
Expand Up @@ -77,10 +77,10 @@ namespace hcaldqm
{ffC_1000,"fC (QIE8)"},
{ffC_3000,"fC (QIE8)"},
{ffC_10000,"fC (QIE8)"},
{fQIE8fC_1000_50,"fC (QIE8)"},
{fQIE10fC_2000,"fC (QIE10/11)"},
{fQIE10fC_10000,"fC (QIE10/11)"},
{fQIE10fC_400000,"fC (QIE10/11)"},
{fQIE8fC_1000_50,"fC"},
{fQIE10fC_2000,"fC"},
{fQIE10fC_10000,"fC"},
{fQIE10fC_400000,"fC"},
{ffC_generic_10000,"fC (QIE8/10/11)"},
{ffC_generic_400000,"fC (QIE8/10/11)"},
{fTiming_TS,"Timing"},
Expand Down Expand Up @@ -112,7 +112,7 @@ namespace hcaldqm
{fTime_ns_250,"Time (ns)"},
{fDualAnodeAsymmetry, "(q_{1}-q_{2})/(q_{1}+q_{2})"},
{fTimingRatio, "q_{SOI+1}/q_{SOI}"},
{fQIE10fC_100000Coarse,"fC (QIE10/11)"},
{fQIE10fC_100000Coarse,"fC"},
{fBadTDC, "TDC"},
};
const std::map<ValueQuantityType, double> min_value = {
Expand Down Expand Up @@ -261,7 +261,7 @@ namespace hcaldqm
{fQIE10fC_2000,100},
{fQIE10fC_10000,500},
{fQIE8fC_1000_50,50},
{fTime_ns_250,250},
{fTime_ns_250,100},
{fADC_256,256},
{ffC_generic_10000,10000},
{ffC_generic_400000,10000},
Expand Down
3 changes: 3 additions & 0 deletions DQM/HcalTasks/interface/DigiRunSummary.h
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@

#include "DQM/HcalCommon/interface/DQClient.h"
#include "DQM/HcalCommon/interface/ElectronicsMap.h"
#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"

namespace hcaldqm
{
Expand Down Expand Up @@ -38,6 +39,8 @@ namespace hcaldqm
ContainerXXX<uint32_t> _xDead, _xDigiSize, _xUniHF,
_xUni, _xNChs, _xNChsNominal;

std::map<HcalSubdetector, uint32_t> _refDigiSize;

// flag enum
enum DigiLSFlag
{
Expand Down
38 changes: 20 additions & 18 deletions DQM/HcalTasks/interface/DigiTask.h
View file
Open in desktop
Expand Up @@ -44,15 +44,15 @@ class DigiTask : public hcaldqm::DQTask
void _resetMonitors(hcaldqm::UpdateFreq) override;

edm::InputTag _tagHBHE;
edm::InputTag _tagHEP17;
edm::InputTag _tagHE;
edm::InputTag _tagHO;
edm::InputTag _tagHF;
edm::EDGetTokenT<HBHEDigiCollection> _tokHBHE;
edm::EDGetTokenT<QIE11DigiCollection> _tokHEP17;
edm::EDGetTokenT<QIE11DigiCollection> _tokHE;
edm::EDGetTokenT<HODigiCollection> _tokHO;
edm::EDGetTokenT<QIE10DigiCollection> _tokHF;

double _cutSumQ_HBHE, _cutSumQ_HEP17, _cutSumQ_HO, _cutSumQ_HF;
double _cutSumQ_HBHE, _cutSumQ_HE, _cutSumQ_HO, _cutSumQ_HF;
double _thresh_unihf;

// flag vector
Expand All @@ -69,6 +69,8 @@ class DigiTask : public hcaldqm::DQTask
// hashes/FED vectors
std::vector<uint32_t> _vhashFEDs;

std::map<HcalSubdetector, int> _refDigiSize;

// emap
hcaldqm::electronicsmap::ElectronicsMap _ehashmap; // online only
hcaldqm::electronicsmap::ElectronicsMap _dhashmap;
Expand All @@ -77,8 +79,8 @@ class DigiTask : public hcaldqm::DQTask
hcaldqm::filter::HashFilter _filter_VME;
hcaldqm::filter::HashFilter _filter_uTCA;
hcaldqm::filter::HashFilter _filter_FEDHF;
hcaldqm::filter::HashFilter _filter_HF;
hcaldqm::filter::HashFilter _filter_notHF;
hcaldqm::filter::HashFilter _filter_QIE1011;
hcaldqm::filter::HashFilter _filter_QIE8;
hcaldqm::filter::HashFilter _filter_HEP17;

/* hcaldqm::Containers */
Expand All @@ -91,17 +93,17 @@ class DigiTask : public hcaldqm::DQTask
hcaldqm::ContainerProf1D _cSumQvsBX_SubdetPM; // online only!

// ADC, fC for HF (QIE10 has different ADC/fC)
hcaldqm::Container1D _cADC_SubdetPM_HF;
hcaldqm::Container1D _cfC_SubdetPM_HF;
hcaldqm::Container1D _cSumQ_SubdetPM_HF;
hcaldqm::ContainerProf1D _cSumQvsLS_SubdetPM_HF;
hcaldqm::ContainerProf1D _cSumQvsBX_SubdetPM_HF; // online only!
hcaldqm::Container1D _cADC_SubdetPM_QIE1011;
hcaldqm::Container1D _cfC_SubdetPM_QIE1011;
hcaldqm::Container1D _cSumQ_SubdetPM_QIE1011;
hcaldqm::ContainerProf1D _cSumQvsLS_SubdetPM_QIE1011;
hcaldqm::ContainerProf1D _cSumQvsBX_SubdetPM_QIE1011; // online only!


// Shape - just filling - not summary!
hcaldqm::Container1D _cShapeCut_FED;
hcaldqm::Container2D _cADCvsTS_SubdetPM;
hcaldqm::Container2D _cADCvsTS_SubdetPM_HF;
hcaldqm::Container2D _cADCvsTS_SubdetPM_QIE1011;

// Timing
// just filling - no summary!
Expand Down Expand Up @@ -141,7 +143,7 @@ class DigiTask : public hcaldqm::DQTask
hcaldqm::Container2D _cOccupancyCut_depth;
hcaldqm::Container1D _cOccupancyCutvsiphi_SubdetPM; // online only
hcaldqm::Container1D _cOccupancyCutvsieta_Subdet; // online only
hcaldqm::Container2D _cOccupancyCutvsSlotvsLS_HFPM; // online only
//hcaldqm::Container2D _cOccupancyCutvsSlotvsLS_HFPM; // online only
hcaldqm::Container2D _cOccupancyCutvsiphivsLS_SubdetPM; // online only

// Occupancy w/o and w/ a Cut vs BX and vs LS
Expand All @@ -165,14 +167,14 @@ class DigiTask : public hcaldqm::DQTask
hcaldqm::Container1D _cLETDCTime_SubdetPM;

// Bad TDC histograms
hcaldqm::Container1D _cBadTDCValues_SubdetPM_HF;
hcaldqm::Container1D _cBadTDCvsBX_SubdetPM_HF;
hcaldqm::Container1D _cBadTDCvsLS_SubdetPM_HF;
hcaldqm::Container1D _cBadTDCValues_SubdetPM;
hcaldqm::Container1D _cBadTDCvsBX_SubdetPM;
hcaldqm::Container1D _cBadTDCvsLS_SubdetPM;
hcaldqm::Container2D _cBadTDCCount_depth;

hcaldqm::Container1D _cBadTDCValues_SubdetPM_HEP17;
hcaldqm::Container1D _cBadTDCvsBX_SubdetPM_HEP17;
hcaldqm::Container1D _cBadTDCvsLS_SubdetPM_HEP17;
hcaldqm::Container1D _cBadTDCValues;
hcaldqm::Container1D _cBadTDCvsBX;
hcaldqm::Container1D _cBadTDCvsLS;

// #events counters
MonitorElement *meNumEvents1LS; // to transfer the #events to harvesting
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/LEDTask.h
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ class LEDTask : public hcaldqm::DQTask

// tags and tokens
edm::InputTag _tagHBHE;
edm::InputTag _tagHEP17;
edm::InputTag _tagHE;
edm::InputTag _tagHO;
edm::InputTag _tagHF;
edm::InputTag _tagTrigger;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/LaserTask.h
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ class LaserTask : public hcaldqm::DQTask

// tags and tokens
edm::InputTag _tagHBHE;
edm::InputTag _tagHEP17;
edm::InputTag _tagHE;
edm::InputTag _tagHO;
edm::InputTag _tagHF;
edm::InputTag _taguMN;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/PedestalTask.h
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ class PedestalTask : public hcaldqm::DQTask

// tags and tokens
edm::InputTag _tagHBHE;
edm::InputTag _tagHEP17;
edm::InputTag _tagHE;
edm::InputTag _tagHO;
edm::InputTag _tagHF;
edm::InputTag _tagTrigger;
Expand Down