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

Restore HCAL DQM to offline workflow #18353

Merged
merged 36 commits into from Apr 25, 2017
Merged

Restore HCAL DQM to offline workflow #18353

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
83a8977
Changes for plan-1
DryRun Feb 27, 2017
63df26a
Changes for plan-1, move arrays to maps
DryRun Feb 27, 2017
4f7754e
HFDigiCollection --> QIE10DigiCollection for upgrade
DryRun Feb 27, 2017
36db0f7
HFDigiCollection --> QIE10DigiCollection for upgrade
DryRun Feb 28, 2017
6a6c2bf
ADC to 256 for QIE10/11
DryRun Feb 28, 2017
870a9a7
FIBER_uTCA_MIN1=0, not 1
DryRun Feb 28, 2017
a905c32
Update crate-FED mappings, laser moved from 36 to 38
DryRun Feb 28, 2017
06ce956
Add some brackets
DryRun Feb 28, 2017
6080311
Force to use offline GT 90X_dataRun2_HLT_v1
DryRun Feb 28, 2017
074d4c8
fixing proper initialization for qie11 and peroper config for hcal2
Mar 1, 2017
49c3e94
fixing fed_sqm_.... client
Mar 1, 2017
3bdeffd
making select the default GT
Mar 1, 2017
9211da9
upon request from hcal operations
Mar 7, 2017
6988833
Add QIE11 digis to DigiTask for some plots
DryRun Mar 9, 2017
f091013
Add QIE11 digis to DigiTask for some plots
DryRun Mar 9, 2017
df13071
Only attempt to fill e-channel plots for channels in the emap
DryRun Mar 9, 2017
a17a1f7
Remove QIE10Task and ZDCTask
DryRun Mar 9, 2017
26b4090
Fix crash due to HcalChannelQuality mismatch. Changing GeometryIdeal …
DryRun Mar 9, 2017
bcd528b
Add QIE10 TDC plot to DigiTask
DryRun Mar 9, 2017
a40ed7b
Merge hidefed2crate with other hcaldqm commits
DryRun Apr 4, 2017
3aa2e57
Fix hidefed2crate condition to not fOffline
DryRun Apr 5, 2017
f834d9a
Fix incorrect method for QIE10/11 digi size
DryRun Apr 5, 2017
d9a3ce8
Change HF nsample to 3 for 2017
DryRun Apr 5, 2017
6cd6428
Fix wrong nbins for fDigiSize
DryRun Apr 5, 2017
9e13d9f
Digi samples bugfix
DryRun Apr 6, 2017
1eebb22
Restore HCAL DQM to offline workflows
DryRun Apr 6, 2017
20b04b9
Missed a few containers for hidefed2crate
DryRun Apr 7, 2017
af60bb8
Missed a few containers for hidefed2crate
DryRun Apr 7, 2017
9423cc9
Add digi TimingCutvsLS_Subdet
DryRun Apr 10, 2017
70df6d0
Add digi TimingCutvsLS_Subdet
DryRun Apr 10, 2017
03e4090
Add digi and rechit TimingCutvsLS_SubdetPM
DryRun Apr 10, 2017
459baca
Working summary with crate instead of FED
DryRun Apr 12, 2017
3a13f72
Add CrateQuantity, change crate hashing to actually use crate for VME
DryRun Apr 13, 2017
e58709f
Finish moving FED to crate, polish up summary maps
DryRun Apr 13, 2017
bac262e
Remove some debug couts
DryRun Apr 13, 2017
c6bc9ce
Remove stray debug printing
DryRun Apr 20, 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
32 changes: 20 additions & 12 deletions DQM/HcalCommon/interface/Constants.h
View file
Open in desktop
Expand Up @@ -32,17 +32,25 @@ namespace hcaldqm
24, 0, 20, 0, 21, 0, 25, 0, 31, 0,
35, 0, 37, 0, 34, 0, 30, 0, 22,22,
29,29, 32,32, 0, 0, 0, 0, 0, 0,
0, 0, 36, 0, 0, 0, 0, 0, 0, 0,
0, 0, 38, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
uint16_t const CRATE2FED[50] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1102, 1104, 1118, 0, 1100, 1106, 0, 0, 0, 1120,
1116, 1108, 1122, 0, 1114, 1110, 1132, 1112, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
// 2017 values:
0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,
1102,1104,1118,0,1100,1106,0,0,0,1120,
1116,1108,1122,0,1114,1110,0,1112,1132,0,
0,0,0,0,0,0,0,0,0,0
// 2016 values:
//0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
//0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
//1102, 1104, 1118, 0, 1100, 1106, 0, 0, 0, 1120,
//1116, 1108, 1122, 0, 1114, 1110, 1132, 1112, 0, 0,
//0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};


// FEDs use the first 50 uTCA FED numbers only everywhere
int const FED_VME_MIN = FEDNumbering::MINHCALFEDID;
int const FED_VME_MAX = FEDNumbering::MAXHCALFEDID;
Expand Down Expand Up @@ -90,15 +98,15 @@ namespace hcaldqm
int const FIBER_VME_MIN = 1;
int const FIBER_VME_MAX = 8;
int const FIBER_VME_NUM = FIBER_VME_MAX-FIBER_VME_MIN+1;
int const FIBER_uTCA_MIN1 = 2;
int const FIBER_uTCA_MAX1 = 9;
int const FIBER_uTCA_MIN2 = 14;
int const FIBER_uTCA_MAX2 = 21;
int const FIBER_uTCA_MIN1 = 0;
int const FIBER_uTCA_MAX1 = 11;
int const FIBER_uTCA_MIN2 = 12;
int const FIBER_uTCA_MAX2 = 23;
int const FIBER_uTCA_NUM = FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1 +
FIBER_uTCA_MAX2-FIBER_uTCA_MIN2+1;

int const FIBERCH_MIN = 0;
int const FIBERCH_MAX = 2;
int const FIBERCH_MAX = 5;
int const FIBERCH_NUM = FIBERCH_MAX-FIBERCH_MIN+1;

// TP SLBs, Fibers
Expand Down Expand Up @@ -129,7 +137,7 @@ namespace hcaldqm
int const HF = 4;
int const SUBDET_NUM = 4;
int const TPSUBDET_NUM = 2;
int const DIGISIZE[SUBDET_NUM] = {10, 10, 10, 4};
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
4 changes: 4 additions & 0 deletions DQM/HcalCommon/interface/DQClient.h
View file
Open in desktop
Expand Up @@ -53,6 +53,10 @@ namespace hcaldqm
// emap
HcalElectronicsMap const* _emap;

// Crate and crate eid lists
std::vector<int> _vCrates;
std::vector<uint32_t> _vhashCrates;

// FED and FED Eids lists
std::vector<int> _vFEDs;
std::vector<uint32_t> _vhashFEDs;
Expand Down
4 changes: 4 additions & 0 deletions DQM/HcalCommon/interface/DQHarvester.h
View file
Open in desktop
Expand Up @@ -34,6 +34,10 @@ namespace hcaldqm
// some counters
int _totalLS;

// Crate and crate eid lists
std::vector<int> _vCrates;
std::vector<uint32_t> _vhashCrates;

// all FEDs
std::vector<int> _vFEDs;
std::vector<uint32_t> _vhashFEDs;
Expand Down