From 3280399f565d649ed8adb5bb55ffde0214fa6292 Mon Sep 17 00:00:00 2001 From: Long Date: Wed, 24 Nov 2021 14:03:44 +0100 Subject: [PATCH] Removing VME, change TP plots, change average TS time --- DQM/HcalCommon/interface/Utilities.h | 5 +- DQM/HcalCommon/interface/ValueQuantity.h | 5 + DQM/HcalTasks/interface/DigiComparisonTask.h | 72 ----- DQM/HcalTasks/interface/DigiTask.h | 8 +- DQM/HcalTasks/interface/LEDTask.h | 5 - DQM/HcalTasks/interface/LaserTask.h | 5 - DQM/HcalTasks/interface/PedestalTask.h | 14 - DQM/HcalTasks/interface/RawRunSummary.h | 4 +- DQM/HcalTasks/interface/RawTask.h | 4 - DQM/HcalTasks/interface/RecHitTask.h | 6 - DQM/HcalTasks/interface/TPComparisonTask.h | 82 ------ DQM/HcalTasks/interface/TPTask.h | 4 +- DQM/HcalTasks/plugins/DigiComparisonTask.cc | 218 --------------- DQM/HcalTasks/plugins/DigiTask.cc | 140 +++------- DQM/HcalTasks/plugins/LEDTask.cc | 55 +--- DQM/HcalTasks/plugins/LaserTask.cc | 55 +--- DQM/HcalTasks/plugins/PedestalTask.cc | 162 +---------- DQM/HcalTasks/plugins/RawTask.cc | 46 +--- DQM/HcalTasks/plugins/RecHitTask.cc | 93 +------ DQM/HcalTasks/plugins/TPComparisonTask.cc | 252 ------------------ DQM/HcalTasks/plugins/TPTask.cc | 63 ++++- DQM/HcalTasks/python/DigiComparisonTask.py | 14 - DQM/HcalTasks/python/TPComparisonTask.py | 17 -- DQM/HcalTasks/src/RawRunSummary.cc | 44 +-- .../hcalreco_dqm_sourceclient-live_cfg.py | 1 - 25 files changed, 123 insertions(+), 1251 deletions(-) delete mode 100644 DQM/HcalTasks/interface/DigiComparisonTask.h delete mode 100644 DQM/HcalTasks/interface/TPComparisonTask.h delete mode 100644 DQM/HcalTasks/plugins/DigiComparisonTask.cc delete mode 100644 DQM/HcalTasks/plugins/TPComparisonTask.cc delete mode 100644 DQM/HcalTasks/python/DigiComparisonTask.py delete mode 100644 DQM/HcalTasks/python/TPComparisonTask.py diff --git a/DQM/HcalCommon/interface/Utilities.h b/DQM/HcalCommon/interface/Utilities.h index ee58f9adf50ce..5b02cfa58913c 100644 --- a/DQM/HcalCommon/interface/Utilities.h +++ b/DQM/HcalCommon/interface/Utilities.h @@ -46,11 +46,12 @@ namespace hcaldqm { const HcalDetId did, const Digi &digi, unsigned int i_start, - unsigned int i_end) { + unsigned int i_end, + bool dopedsubtr = true) { double sumQ = 0; double sumQT = 0; for (unsigned int i = i_start; i <= i_end; ++i) { - double q = adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i); + double q = dopedsubtr ? adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i) : calo_samples[i]; sumQ += q; sumQT += (i + 1) * q; } diff --git a/DQM/HcalCommon/interface/ValueQuantity.h b/DQM/HcalCommon/interface/ValueQuantity.h index d97199f60ba75..f93807595852b 100644 --- a/DQM/HcalCommon/interface/ValueQuantity.h +++ b/DQM/HcalCommon/interface/ValueQuantity.h @@ -68,6 +68,7 @@ namespace hcaldqm { fCapidMinusBXmod4, fBX_36, fADC_256_4, // ADC from 0-255, with 4 ADC granularity + fEtlog2, // scale log2(ET+1) }; const std::map name_value = { {fN, "N"}, @@ -130,6 +131,7 @@ namespace hcaldqm { {fCapidMinusBXmod4, "(CapId - BX) % 4"}, {fBX_36, "BX"}, {fADC_256_4, "ADC"}, + {fEtlog2, "log_{2}(Et+1)"}, }; const std::map min_value = { {fN, -0.05}, @@ -192,6 +194,7 @@ namespace hcaldqm { {fCapidMinusBXmod4, -0.5}, {fBX_36, -0.5}, {fADC_256_4, -0.5}, + {fEtlog2, 0.}, }; const std::map max_value = { {fN, 1000}, @@ -254,6 +257,7 @@ namespace hcaldqm { {fCapidMinusBXmod4, 3.5}, {fBX_36, 3564. - 0.5}, {fADC_256_4, 255}, + {fEtlog2, 9.}, }; const std::map nbins_value = { {fN, 200}, @@ -315,6 +319,7 @@ namespace hcaldqm { {fCapidMinusBXmod4, 4}, {fBX_36, 99}, {fADC_256_4, 64}, + {fEtlog2, 9}, }; class ValueQuantity : public Quantity { public: diff --git a/DQM/HcalTasks/interface/DigiComparisonTask.h b/DQM/HcalTasks/interface/DigiComparisonTask.h deleted file mode 100644 index 1d48e66881a5d..0000000000000 --- a/DQM/HcalTasks/interface/DigiComparisonTask.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef DigiComparisonTask_h -#define DigiComparisonTask_h - -/** - * file: DigiComparisonTask.h - * Author: Viktor Khristenko - * Date: 08.12.2015 - */ - -#include "DQM/HcalCommon/interface/DQTask.h" -#include "DQM/HcalCommon/interface/Utilities.h" -#include "DQM/HcalCommon/interface/Container1D.h" -#include "DQM/HcalCommon/interface/Container2D.h" -#include "DQM/HcalCommon/interface/ContainerProf1D.h" -#include "DQM/HcalCommon/interface/ContainerProf2D.h" -#include "DQM/HcalCommon/interface/ElectronicsMap.h" -#include "DQM/HcalCommon/interface/HashFilter.h" - -class DigiComparisonTask : public hcaldqm::DQTask { -public: - DigiComparisonTask(edm::ParameterSet const&); - ~DigiComparisonTask() override {} - - void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - -protected: - // funcs - void _process(edm::Event const&, edm::EventSetup const&) override; - void _resetMonitors(hcaldqm::UpdateFreq) override; - - // Tags and corresponding Tokens - edm::InputTag _tagHBHE1; - edm::InputTag _tagHBHE2; - edm::EDGetTokenT _tokHBHE1; - edm::EDGetTokenT _tokHBHE2; - edm::ESGetToken hcalDbServiceToken_; - - // emap+hashmap - hcaldqm::electronicsmap::ElectronicsMap _ehashmapuTCA; - hcaldqm::electronicsmap::ElectronicsMap _ehashmapVME; - - // hashes/FED vectors - std::vector _vhashFEDs; - - // Filters - hcaldqm::filter::HashFilter _filter_VME; - hcaldqm::filter::HashFilter _filter_uTCA; - - /** - * Containers - */ - - // ADC - hcaldqm::Container2D _cADC_Subdet[10]; - hcaldqm::Container2D _cADCall_Subdet; - - // Mismatched - hcaldqm::Container2D _cMsm_FEDVME; - hcaldqm::Container2D _cMsm_FEDuTCA; - hcaldqm::Container2D _cMsm_depth; - - // Missing Completely - hcaldqm::Container1D _cADCMsnuTCA_Subdet; - hcaldqm::Container1D _cADCMsnVME_Subdet; - hcaldqm::Container2D _cMsnVME_depth; - hcaldqm::Container2D _cMsnuTCA_depth; - hcaldqm::Container2D _cMsn_FEDVME; - hcaldqm::Container2D _cMsn_FEDuTCA; -}; - -#endif diff --git a/DQM/HcalTasks/interface/DigiTask.h b/DQM/HcalTasks/interface/DigiTask.h index f9cb553bcc196..e13f532ee5a15 100644 --- a/DQM/HcalTasks/interface/DigiTask.h +++ b/DQM/HcalTasks/interface/DigiTask.h @@ -97,9 +97,8 @@ class DigiTask : public hcaldqm::DQTask { // Timing // just filling - no summary! hcaldqm::Container1D _cTimingCut_SubdetPM; - hcaldqm::ContainerProf2D _cTimingCut_FEDVME; + hcaldqm::Container1D _cTimingCutHTH_SubdetPM; hcaldqm::ContainerProf2D _cTimingCut_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingCut_ElectronicsVME; hcaldqm::ContainerProf2D _cTimingCut_ElectronicsuTCA; hcaldqm::ContainerProf1D _cTimingCutvsLS_FED; hcaldqm::ContainerProf1D _cTimingCutvsLS_SubdetPM; @@ -112,9 +111,7 @@ class DigiTask : public hcaldqm::DQTask { // Occupancy w/o a Cut - whatever is sitting in the Digi Collection // used to determine Missing Digis => used for Summary! - hcaldqm::Container2D _cOccupancy_FEDVME; hcaldqm::Container2D _cOccupancy_FEDuTCA; - hcaldqm::Container2D _cOccupancy_ElectronicsVME; hcaldqm::Container2D _cOccupancy_ElectronicsuTCA; hcaldqm::Container2D _cOccupancy_Crate; hcaldqm::Container2D _cOccupancy_CrateSlot; @@ -125,9 +122,7 @@ class DigiTask : public hcaldqm::DQTask { // Occupancy w/ a Cut // used to determine if occupancy is symmetric or not. => // used for Summary - hcaldqm::Container2D _cOccupancyCut_FEDVME; hcaldqm::Container2D _cOccupancyCut_FEDuTCA; - hcaldqm::Container2D _cOccupancyCut_ElectronicsVME; hcaldqm::Container2D _cOccupancyCut_ElectronicsuTCA; hcaldqm::Container2D _cOccupancyCut_depth; hcaldqm::Container1D _cOccupancyCutvsiphi_SubdetPM; // online only @@ -172,7 +167,6 @@ class DigiTask : public hcaldqm::DQTask { // (Capid - BX) % 4 hcaldqm::Container1D _cCapidMinusBXmod4_SubdetPM; hcaldqm::ContainerSingle2D _cCapidMinusBXmod4_CrateSlotuTCA[4]; // CrateSlot 2D histograms for each (capid-BX)%4 - hcaldqm::ContainerSingle2D _cCapidMinusBXmod4_CrateSlotVME[4]; // CrateSlot 2D histograms for each (capid-BX)%4 hcaldqm::ContainerSingle2D _cCapid_BadvsFEDvsLS; hcaldqm::ContainerSingle2D _cCapid_BadvsFEDvsLSmod60; // Same as _cCapid_BadvsFEDvsLS, but only for last 50 LSes (for sound alarm turning off when problem goes away) diff --git a/DQM/HcalTasks/interface/LEDTask.h b/DQM/HcalTasks/interface/LEDTask.h index 88563ca5a232d..737c85e5d0085 100644 --- a/DQM/HcalTasks/interface/LEDTask.h +++ b/DQM/HcalTasks/interface/LEDTask.h @@ -85,18 +85,13 @@ class LEDTask : public hcaldqm::DQTask { hcaldqm::ContainerProf2D _cTimingMean_depth; hcaldqm::ContainerProf2D _cTimingRMS_depth; - hcaldqm::ContainerProf2D _cSignalMean_FEDVME; hcaldqm::ContainerProf2D _cSignalMean_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingMean_FEDVME; hcaldqm::ContainerProf2D _cTimingMean_FEDuTCA; - hcaldqm::ContainerProf2D _cSignalRMS_FEDVME; hcaldqm::ContainerProf2D _cSignalRMS_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingRMS_FEDVME; hcaldqm::ContainerProf2D _cTimingRMS_FEDuTCA; // Bad Quality and Missing Channels hcaldqm::Container2D _cMissing_depth; - hcaldqm::Container2D _cMissing_FEDVME; hcaldqm::Container2D _cMissing_FEDuTCA; // For hcalcalib online LED diff --git a/DQM/HcalTasks/interface/LaserTask.h b/DQM/HcalTasks/interface/LaserTask.h index 695e0325a7fd9..41734552165d5 100644 --- a/DQM/HcalTasks/interface/LaserTask.h +++ b/DQM/HcalTasks/interface/LaserTask.h @@ -113,18 +113,13 @@ class LaserTask : public hcaldqm::DQTask { hcaldqm::ContainerProf2D _cTimingMean_depth; hcaldqm::ContainerProf2D _cTimingRMS_depth; - hcaldqm::ContainerProf2D _cSignalMean_FEDVME; hcaldqm::ContainerProf2D _cSignalMean_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingMean_FEDVME; hcaldqm::ContainerProf2D _cTimingMean_FEDuTCA; - hcaldqm::ContainerProf2D _cSignalRMS_FEDVME; hcaldqm::ContainerProf2D _cSignalRMS_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingRMS_FEDVME; hcaldqm::ContainerProf2D _cTimingRMS_FEDuTCA; // Bad Quality and Missing Channels hcaldqm::Container2D _cMissing_depth; - hcaldqm::Container2D _cMissing_FEDVME; hcaldqm::Container2D _cMissing_FEDuTCA; // Things for LASERMON diff --git a/DQM/HcalTasks/interface/PedestalTask.h b/DQM/HcalTasks/interface/PedestalTask.h index 95bc93e584658..3ff7b74dcc83e 100644 --- a/DQM/HcalTasks/interface/PedestalTask.h +++ b/DQM/HcalTasks/interface/PedestalTask.h @@ -89,16 +89,12 @@ class PedestalTask : public hcaldqm::DQTask { // 2D actual values hcaldqm::ContainerProf2D _cMean1LS_depth; // 1LS hcaldqm::ContainerProf2D _cRMS1LS_depth; // 1lS - hcaldqm::ContainerProf2D _cMean1LS_FEDVME; // 1ls hcaldqm::ContainerProf2D _cMean1LS_FEDuTCA; // 1ls - hcaldqm::ContainerProf2D _cRMS1LS_FEDVME; // 1ls hcaldqm::ContainerProf2D _cRMS1LS_FEDuTCA; // 1ls hcaldqm::ContainerProf2D _cMeanTotal_depth; hcaldqm::ContainerProf2D _cRMSTotal_depth; - hcaldqm::ContainerProf2D _cMeanTotal_FEDVME; hcaldqm::ContainerProf2D _cMeanTotal_FEDuTCA; - hcaldqm::ContainerProf2D _cRMSTotal_FEDVME; hcaldqm::ContainerProf2D _cRMSTotal_FEDuTCA; // Comparison with DB Conditions @@ -108,16 +104,12 @@ class PedestalTask : public hcaldqm::DQTask { hcaldqm::Container1D _cRMSDBRefTotal_Subdet; hcaldqm::ContainerProf2D _cMeanDBRef1LS_depth; hcaldqm::ContainerProf2D _cRMSDBRef1LS_depth; - hcaldqm::ContainerProf2D _cMeanDBRef1LS_FEDVME; hcaldqm::ContainerProf2D _cMeanDBRef1LS_FEDuTCA; - hcaldqm::ContainerProf2D _cRMSDBRef1LS_FEDVME; hcaldqm::ContainerProf2D _cRMSDBRef1LS_FEDuTCA; hcaldqm::ContainerProf2D _cMeanDBRefTotal_depth; hcaldqm::ContainerProf2D _cRMSDBRefTotal_depth; - hcaldqm::ContainerProf2D _cMeanDBRefTotal_FEDVME; hcaldqm::ContainerProf2D _cMeanDBRefTotal_FEDuTCA; - hcaldqm::ContainerProf2D _cRMSDBRefTotal_FEDVME; hcaldqm::ContainerProf2D _cRMSDBRefTotal_FEDuTCA; // vs LS @@ -131,25 +123,19 @@ class PedestalTask : public hcaldqm::DQTask { // map of missing channels hcaldqm::Container2D _cMissing1LS_depth; - hcaldqm::Container2D _cMissing1LS_FEDVME; hcaldqm::Container2D _cMissing1LS_FEDuTCA; hcaldqm::Container2D _cMissingTotal_depth; - hcaldqm::Container2D _cMissingTotal_FEDVME; hcaldqm::Container2D _cMissingTotal_FEDuTCA; // Mean/RMS Bad Maps hcaldqm::Container2D _cMeanBad1LS_depth; hcaldqm::Container2D _cRMSBad1LS_depth; - hcaldqm::Container2D _cMeanBad1LS_FEDVME; hcaldqm::Container2D _cRMSBad1LS_FEDuTCA; - hcaldqm::Container2D _cRMSBad1LS_FEDVME; hcaldqm::Container2D _cMeanBad1LS_FEDuTCA; hcaldqm::Container2D _cMeanBadTotal_depth; hcaldqm::Container2D _cRMSBadTotal_depth; - hcaldqm::Container2D _cMeanBadTotal_FEDVME; hcaldqm::Container2D _cRMSBadTotal_FEDuTCA; - hcaldqm::Container2D _cRMSBadTotal_FEDVME; hcaldqm::Container2D _cMeanBadTotal_FEDuTCA; hcaldqm::Container1D _cADC_SubdetPM; diff --git a/DQM/HcalTasks/interface/RawRunSummary.h b/DQM/HcalTasks/interface/RawRunSummary.h index 4ee0a44f700c2..c17c81c53a5a6 100644 --- a/DQM/HcalTasks/interface/RawRunSummary.h +++ b/DQM/HcalTasks/interface/RawRunSummary.h @@ -29,8 +29,8 @@ namespace hcaldqm { filter::HashFilter _filter_VME, _filter_uTCA; // Containers to store info for the whole run - Container2D _cEvnMsm_ElectronicsVME, _cEvnMsm_ElectronicsuTCA; - Container2D _cBcnMsm_ElectronicsVME, _cBcnMsm_ElectronicsuTCA; + Container2D _cEvnMsm_ElectronicsuTCA; + Container2D _cBcnMsm_ElectronicsuTCA; Container2D _cBadQuality_depth; bool _booked; diff --git a/DQM/HcalTasks/interface/RawTask.h b/DQM/HcalTasks/interface/RawTask.h index 1553f4794caf6..99b35969afdf6 100644 --- a/DQM/HcalTasks/interface/RawTask.h +++ b/DQM/HcalTasks/interface/RawTask.h @@ -62,7 +62,6 @@ class RawTask : public hcaldqm::DQTask { hcaldqm::filter::HashFilter _filter_FEDsuTCA; // Bad Quality - hcaldqm::Container2D _cBadQuality_FEDVME; hcaldqm::Container2D _cBadQuality_FEDuTCA; hcaldqm::Container2D _cBadQuality_depth; hcaldqm::Container2D _cBadQualityLS_depth; // online only @@ -71,9 +70,6 @@ class RawTask : public hcaldqm::DQTask { hcaldqm::ContainerProf1D _cDataSizevsLS_FED; // online only // Mismatches - hcaldqm::Container2D _cEvnMsm_ElectronicsVME; - hcaldqm::Container2D _cBcnMsm_ElectronicsVME; - hcaldqm::Container2D _cOrnMsm_ElectronicsVME; hcaldqm::Container2D _cEvnMsm_ElectronicsuTCA; hcaldqm::Container2D _cBcnMsm_ElectronicsuTCA; hcaldqm::Container2D _cOrnMsm_ElectronicsuTCA; diff --git a/DQM/HcalTasks/interface/RecHitTask.h b/DQM/HcalTasks/interface/RecHitTask.h index f1a1d4e9f38d3..20aa3af2dc914 100644 --- a/DQM/HcalTasks/interface/RecHitTask.h +++ b/DQM/HcalTasks/interface/RecHitTask.h @@ -82,9 +82,7 @@ class RecHitTask : public hcaldqm::DQTask { // Timing. HBHE Partition is used for TCDS shift monitoring hcaldqm::Container1D _cTimingCut_SubdetPM; hcaldqm::Container1D _cTimingCut_HBHEPartition; - hcaldqm::ContainerProf2D _cTimingCut_FEDVME; hcaldqm::ContainerProf2D _cTimingCut_FEDuTCA; - hcaldqm::ContainerProf2D _cTimingCut_ElectronicsVME; hcaldqm::ContainerProf2D _cTimingCut_ElectronicsuTCA; hcaldqm::ContainerProf2D _cTimingCut_depth; hcaldqm::ContainerProf1D _cTimingCutvsLS_FED; @@ -95,18 +93,14 @@ class RecHitTask : public hcaldqm::DQTask { // Occupancy w/o a cut. Used for checking missing channels hcaldqm::Container2D _cOccupancy_depth; - hcaldqm::Container2D _cOccupancy_FEDVME; hcaldqm::Container2D _cOccupancy_FEDuTCA; - hcaldqm::Container2D _cOccupancy_ElectronicsVME; hcaldqm::Container2D _cOccupancy_ElectronicsuTCA; hcaldqm::ContainerProf1D _cOccupancyvsLS_Subdet; hcaldqm::Container1D _cOccupancyvsiphi_SubdetPM; // online only hcaldqm::Container1D _cOccupancyvsieta_Subdet; // online only // Occupancy w/ a Cut. - hcaldqm::Container2D _cOccupancyCut_FEDVME; hcaldqm::Container2D _cOccupancyCut_FEDuTCA; - hcaldqm::Container2D _cOccupancyCut_ElectronicsVME; hcaldqm::Container2D _cOccupancyCut_ElectronicsuTCA; hcaldqm::ContainerProf1D _cOccupancyCutvsLS_Subdet; // online only hcaldqm::Container2D _cOccupancyCut_depth; diff --git a/DQM/HcalTasks/interface/TPComparisonTask.h b/DQM/HcalTasks/interface/TPComparisonTask.h deleted file mode 100644 index 1f69d9772a976..0000000000000 --- a/DQM/HcalTasks/interface/TPComparisonTask.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef TPComparisonTask_h -#define TPComparisonTask_h - -/** - * file: TPComparisonTask.h - * Author: Viktor Khristenko - * Date: 08.12.2015 - */ - -#include "DQM/HcalCommon/interface/DQTask.h" -#include "DQM/HcalCommon/interface/Utilities.h" -#include "DQM/HcalCommon/interface/Container1D.h" -#include "DQM/HcalCommon/interface/Container2D.h" -#include "DQM/HcalCommon/interface/ContainerProf1D.h" -#include "DQM/HcalCommon/interface/ContainerProf2D.h" -#include "DQM/HcalCommon/interface/ContainerSingle2D.h" -#include "DQM/HcalCommon/interface/HashFilter.h" -#include "DQM/HcalCommon/interface/ElectronicsMap.h" - -class TPComparisonTask : public hcaldqm::DQTask { -public: - TPComparisonTask(edm::ParameterSet const&); - ~TPComparisonTask() override {} - - void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - -protected: - // funcs - void _process(edm::Event const&, edm::EventSetup const&) override; - void _resetMonitors(hcaldqm::UpdateFreq) override; - - // Tags and corresponding Tokens - edm::InputTag _tag1; - edm::InputTag _tag2; - edm::EDGetTokenT _tok1; - edm::EDGetTokenT _tok2; - edm::ESGetToken hcalDbServiceToken_; - - // tmp flags - bool _skip1x1; - - // emap - hcaldqm::electronicsmap::ElectronicsMap _ehashmapuTCA; - hcaldqm::electronicsmap::ElectronicsMap _ehashmapVME; - - // hahses/FED vectors - std::vector _vhashFEDs; - - // Filters - hcaldqm::filter::HashFilter _filter_VME; - hcaldqm::filter::HashFilter _filter_uTCA; - - /** - * hcaldqm::Containers - */ - - // Et - hcaldqm::Container2D _cEt_TTSubdet[4]; - hcaldqm::Container2D _cEtall_TTSubdet; - - // FG - hcaldqm::Container2D _cFG_TTSubdet[4]; - - // Missing - hcaldqm::Container2D _cMsn_FEDVME; - hcaldqm::Container2D _cMsn_FEDuTCA; - hcaldqm::ContainerSingle2D _cMsnVME; - hcaldqm::ContainerSingle2D _cMsnuTCA; - - // mismatches - hcaldqm::Container2D _cEtMsm_FEDVME; - hcaldqm::Container2D _cEtMsm_FEDuTCA; - hcaldqm::Container2D _cFGMsm_FEDVME; - hcaldqm::Container2D _cFGMsm_FEDuTCA; - - // depth like - hcaldqm::ContainerSingle2D _cEtMsm; - hcaldqm::ContainerSingle2D _cFGMsm; -}; - -#endif diff --git a/DQM/HcalTasks/interface/TPTask.h b/DQM/HcalTasks/interface/TPTask.h index 9a93267883caa..c2fea7d5d7c81 100644 --- a/DQM/HcalTasks/interface/TPTask.h +++ b/DQM/HcalTasks/interface/TPTask.h @@ -70,11 +70,12 @@ class TPTask : public hcaldqm::DQTask { hcaldqm::Container1D _cEtEmul_TTSubdet; hcaldqm::Container2D _cEtCorr_TTSubdet; hcaldqm::Container2D _cSOIEtCorr_TTSubdet; + hcaldqm::Container2D _cSOIEtCorrEmulL1_TTSubdet; hcaldqm::Container2D _cEtCorr2x3_TTSubdet; // online only hcaldqm::Container2D _cFGCorr_TTSubdet[hcaldqm::constants::NUM_FGBITS]; hcaldqm::ContainerProf1D _cEtCutDatavsLS_TTSubdet; // online only! hcaldqm::ContainerProf1D _cEtCutEmulvsLS_TTSubdet; // online only! - hcaldqm::ContainerProf1D _cEtCutDatavsBX_TTSubdet; // online only! + hcaldqm::Container2D _cEtCutDatavsBX_TTSubdet; // online only! hcaldqm::ContainerProf1D _cEtCutEmulvsBX_TTSubdet; // online only! hcaldqm::ContainerProf2D _cEtData_ElectronicsuTCA; @@ -163,6 +164,7 @@ class TPTask : public hcaldqm::DQTask { hcaldqm::ContainerSingle1D _cOccupancy_HF_ieta, _cOccupancyNoTDC_HF_ieta; // Container storing matched sent-received TPs + std::vector > _vEmulTPDigis_SentRec; std::vector > _vTPDigis_SentRec; }; diff --git a/DQM/HcalTasks/plugins/DigiComparisonTask.cc b/DQM/HcalTasks/plugins/DigiComparisonTask.cc deleted file mode 100644 index 4306eb96089d5..0000000000000 --- a/DQM/HcalTasks/plugins/DigiComparisonTask.cc +++ /dev/null @@ -1,218 +0,0 @@ - -#include "DQM/HcalTasks/interface/DigiComparisonTask.h" - -using namespace hcaldqm; -using namespace hcaldqm::constants; - -DigiComparisonTask::DigiComparisonTask(edm::ParameterSet const& ps) - : DQTask(ps), hcalDbServiceToken_(esConsumes()) { - // tags and tokens - _tagHBHE1 = ps.getUntrackedParameter("tagHBHE1", edm::InputTag("hcalDigis")); - _tagHBHE2 = ps.getUntrackedParameter("tagHBHE2", edm::InputTag("vmeDigis")); - _tokHBHE1 = consumes(_tagHBHE1); - _tokHBHE2 = consumes(_tagHBHE2); -} -/* virtual */ void DigiComparisonTask::bookHistograms(DQMStore::IBooker& ib, - edm::Run const& r, - edm::EventSetup const& es) { - DQTask::bookHistograms(ib, r, es); - - // GET WHAT YOU NEED - edm::ESHandle dbs = es.getHandle(hcalDbServiceToken_); - _emap = dbs->getHcalMapping(); - if (_ptype != fOffline) { // hidefed2crate - std::vector vFEDs = utilities::getFEDList(_emap); - std::vector vFEDsVME = utilities::getFEDVMEList(_emap); - std::vector vFEDsuTCA = utilities::getFEDuTCAList(_emap); - } - std::vector vhashVME; - std::vector vhashuTCA; - vhashVME.push_back( - HcalElectronicsId(constants::FIBERCH_MIN, constants::FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN).rawId()); - vhashuTCA.push_back(HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId()); - _filter_VME.initialize(filter::fFilter, hashfunctions::fElectronics, vhashVME); - _filter_uTCA.initialize(filter::fFilter, hashfunctions::fElectronics, vhashuTCA); - - // INITIALIZE - for (unsigned int i = 0; i < 10; i++) { - _cADC_Subdet[i].initialize(_name, - "ADC", - hashfunctions::fSubdet, - new quantity::ValueQuantity(quantity::fADCCorr_128), - new quantity::ValueQuantity(quantity::fADCCorr_128), - new quantity::ValueQuantity(quantity::fN, true), - 0); - } - _cADCall_Subdet.initialize(_name, - "ADC", - hashfunctions::fSubdet, - new quantity::ValueQuantity(quantity::fADCCorr_128), - new quantity::ValueQuantity(quantity::fADCCorr_128), - new quantity::ValueQuantity(quantity::fN, true), - 0); - _cADCMsnuTCA_Subdet.initialize(_name, - "ADCMsnuTCA", - hashfunctions::fSubdet, - new quantity::ValueQuantity(quantity::fADC_128), - new quantity::ValueQuantity(quantity::fN, true), - 0); - _cADCMsnVME_Subdet.initialize(_name, - "ADCMsnVME", - hashfunctions::fSubdet, - new quantity::ValueQuantity(quantity::fADC_128), - new quantity::ValueQuantity(quantity::fN, true), - 0); - _cMsm_depth.initialize(_name, - "Mismatched", - hashfunctions::fdepth, - new quantity::DetectorQuantity(quantity::fieta), - new quantity::DetectorQuantity(quantity::fiphi), - new quantity::ValueQuantity(quantity::fN), - 0); - if (_ptype != fOffline) { // hidefed2crate - _cMsm_FEDVME.initialize(_name, - "Mismatched", - hashfunctions::fFED, - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ElectronicsQuantity(quantity::fFiberVMEFiberCh), - new quantity::ValueQuantity(quantity::fN), - 0); - _cMsm_FEDuTCA.initialize(_name, - "Mismatched", - hashfunctions::fFED, - new quantity::ElectronicsQuantity(quantity::fSlotuTCA), - new quantity::ElectronicsQuantity(quantity::fFiberuTCAFiberCh), - new quantity::ValueQuantity(quantity::fN), - 0); - } - _cMsnVME_depth.initialize(_name, - "Missing", - hashfunctions::fdepth, - new quantity::DetectorQuantity(quantity::fieta), - new quantity::DetectorQuantity(quantity::fiphi), - new quantity::ValueQuantity(quantity::fN), - 0); - _cMsnuTCA_depth.initialize(_name, - "Missing", - hashfunctions::fdepth, - new quantity::DetectorQuantity(quantity::fieta), - new quantity::DetectorQuantity(quantity::fiphi), - new quantity::ValueQuantity(quantity::fN), - 0); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDVME.initialize(_name, - "Missing", - hashfunctions::fFED, - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ElectronicsQuantity(quantity::fFiberVMEFiberCh), - new quantity::ValueQuantity(quantity::fN), - 0); - _cMsn_FEDuTCA.initialize(_name, - "Missing", - hashfunctions::fFED, - new quantity::ElectronicsQuantity(quantity::fSlotuTCA), - new quantity::ElectronicsQuantity(quantity::fFiberuTCAFiberCh), - new quantity::ValueQuantity(quantity::fN), - 0); - } - - // BOOK - char aux[20]; - for (unsigned int i = 0; i < 10; i++) { - sprintf(aux, "TS%d", i); - _cADC_Subdet[i].book(ib, _emap, _subsystem, aux); - } - _cADCall_Subdet.book(ib, _emap, _subsystem); - _cADCMsnVME_Subdet.book(ib, _emap, _subsystem); - _cADCMsnuTCA_Subdet.book(ib, _emap, _subsystem); - _cMsm_depth.book(ib, _emap, _subsystem); - _cMsnVME_depth.book(ib, _emap, _subsystem, std::string("VME")); - _cMsnuTCA_depth.book(ib, _emap, _subsystem, std::string("uTCA")); - if (_ptype != fOffline) { // hidefed2crate - _cMsm_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cMsn_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cMsm_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMsn_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - } - - _ehashmapuTCA.initialize(_emap, hcaldqm::electronicsmap::fD2EHashMap, _filter_VME); - _ehashmapVME.initialize(_emap, hcaldqm::electronicsmap::fD2EHashMap, _filter_uTCA); -} - -/* virtual */ void DigiComparisonTask::_resetMonitors(hcaldqm::UpdateFreq uf) { DQTask::_resetMonitors(uf); } - -/* virtual */ void DigiComparisonTask::_process(edm::Event const& e, edm::EventSetup const& es) { - edm::Handle chbhe1; - edm::Handle chbhe2; - - if (!e.getByToken(_tokHBHE1, chbhe1)) - _logger.dqmthrow("Collection HBHEDigiCollection isn't available" + _tagHBHE1.label() + " " + _tagHBHE1.instance()); - if (!e.getByToken(_tokHBHE2, chbhe2)) - _logger.dqmthrow("Collection HBHEDigiCollection isn't available" + _tagHBHE2.label() + " " + _tagHBHE2.instance()); - - // assume that coll1 is primary(uTCA) and coll2 is secondary(VME) - // uTCA is X and VME is Y axis - for (HBHEDigiCollection::const_iterator it1 = chbhe1->begin(); it1 != chbhe1->end(); ++it1) { - // iterate thru the utca collection - // get the same detid digi from vme collection - // if missing - fill vme missing - // else correlate - HcalDetId did = it1->id(); - HcalElectronicsId eid1 = it1->elecId(); - HBHEDigiCollection::const_iterator it2 = chbhe2->find(did); - - // get the eid for vme by did - HcalElectronicsId eid2 = HcalElectronicsId(_ehashmapVME.lookup(did)); - if (it2 == chbhe2->end()) { - // fill the depth plot - _cMsnVME_depth.fill(did); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDVME.fill(eid2); - } - for (int i = 0; i < it1->size(); i++) { - _cADCMsnVME_Subdet.fill(did, it1->sample(i).adc()); - _cADCall_Subdet.fill(did, it1->sample(i).adc(), -2); - _cADC_Subdet[i].fill(did, it1->sample(i).adc(), -2); - } - } else - for (int i = 0; i < it1->size(); i++) { - _cADCall_Subdet.fill(did, double(it1->sample(i).adc()), double(it2->sample(i).adc())); - _cADC_Subdet[i].fill(did, double(it1->sample(i).adc()), double(it2->sample(i).adc())); - if (it1->sample(i).adc() != it2->sample(i).adc()) { - // fill depth, uTCA and VME as well for which guys - // mismatches happen - _cMsm_depth.fill(did); - if (_ptype != fOffline) { // hidefed2crate - _cMsm_FEDVME.fill(eid2); - _cMsm_FEDuTCA.fill(eid1); - } - } - } - } - for (HBHEDigiCollection::const_iterator it2 = chbhe2->begin(); it2 != chbhe2->end(); ++it2) { - // itearte thru VME - // find utca digi by detid - // check if present or missing - HcalDetId did = it2->id(); - HBHEDigiCollection::const_iterator it1 = chbhe1->find(did); - if (it1 == chbhe1->end()) { - HcalElectronicsId eid1 = HcalElectronicsId(_ehashmapuTCA.lookup(did)); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDuTCA.fill(eid1); - } - for (int i = 0; i < it2->size(); i++) { - _cADCMsnuTCA_Subdet.fill(did, it2->sample(i).adc()); - _cADCall_Subdet.fill(did, -2, it2->sample(i).adc()); - _cADC_Subdet[i].fill(did, -2, it2->sample(i).adc()); - } - } - } -} - -/* virtual */ void DigiComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, - edm::EventSetup const& es) { - // in the end always - DQTask::globalEndLuminosityBlock(lb, es); -} - -DEFINE_FWK_MODULE(DigiComparisonTask); diff --git a/DQM/HcalTasks/plugins/DigiTask.cc b/DQM/HcalTasks/plugins/DigiTask.cc index 988124f088fb0..3782c185b91f3 100644 --- a/DQM/HcalTasks/plugins/DigiTask.cc +++ b/DQM/HcalTasks/plugins/DigiTask.cc @@ -187,6 +187,12 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); + _cTimingCutHTH_SubdetPM.initialize(_name, + "TimingHighCut", + hcaldqm::hashfunctions::fSubdetPM, + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), + 0); _cTimingCut_depth.initialize(_name, "TimingCut", hcaldqm::hashfunctions::fdepth, @@ -438,12 +444,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new quantity::ElectronicsQuantity(quantity::fSlotuTCA), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); - _cCapidMinusBXmod4_CrateSlotVME[i].initialize(_name, - "CapID", - new quantity::ElectronicsQuantity(quantity::fCrateVME), - new quantity::ElectronicsQuantity(quantity::fSlotVME), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), - 0); } if (_ptype != fOffline) { // hidefed2crate @@ -494,13 +494,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_10000), 0); - _cTimingCut_FEDVME.initialize(_name, - "TimingCut", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingCut_FEDuTCA.initialize(_name, "TimingCut", hcaldqm::hashfunctions::fFED, @@ -508,13 +501,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), 0); - _cTimingCut_ElectronicsVME.initialize(_name, - "TimingCut", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingCut_ElectronicsuTCA.initialize(_name, "TimingCut", hcaldqm::hashfunctions::fElectronics, @@ -529,13 +515,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), 0); - _cOccupancy_FEDVME.initialize(_name, - "Occupancy", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancy_FEDuTCA.initialize(_name, "Occupancy", hcaldqm::hashfunctions::fFED, @@ -543,13 +522,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancy_ElectronicsVME.initialize(_name, - "Occupancy", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancy_ElectronicsuTCA.initialize(_name, "Occupancy", hcaldqm::hashfunctions::fElectronics, @@ -558,13 +530,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancyCut_FEDVME.initialize(_name, - "OccupancyCut", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancyCut_FEDuTCA.initialize(_name, "OccupancyCut", hcaldqm::hashfunctions::fFED, @@ -572,13 +537,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancyCut_ElectronicsVME.initialize(_name, - "OccupancyCut", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancyCut_ElectronicsuTCA.initialize(_name, "OccupancyCut", hcaldqm::hashfunctions::fElectronics, @@ -662,18 +620,12 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (_ptype != fOffline) { // hidefed2crate _cShapeCut_FED.book(ib, _emap, _subsystem); - _cTimingCut_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingCut_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingCut_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingCut_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cTimingCutvsLS_FED.book(ib, _emap, _subsystem); - _cOccupancy_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancy_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cOccupancy_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancy_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cOccupancyCut_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancyCut_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cOccupancyCut_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancyCut_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cDigiSize_FED.book(ib, _emap, _subsystem); } @@ -683,6 +635,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) } _cTimingCut_SubdetPM.book(ib, _emap, _subsystem); + _cTimingCutHTH_SubdetPM.book(ib, _emap, _subsystem); _cTimingCut_depth.book(ib, _emap, _subsystem); _cTimingCutvsLS_SubdetPM.book(ib, _emap, _subsystem); @@ -712,9 +665,6 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) char aux[kSize]; snprintf(aux, kSize, "%d_uTCA", i); _cCapidMinusBXmod4_CrateSlotuTCA[i].book(ib, _subsystem, aux); - - snprintf(aux, kSize, "%d_VME", i); - _cCapidMinusBXmod4_CrateSlotVME[i].book(ib, _subsystem, aux); } if (_ptype != fLocal) { @@ -950,10 +900,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); } - if (eid.isVMEid()) { - _cCapidMinusBXmod4_CrateSlotVME[this_capidmbx].fill(eid); - - } else { + if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); } } @@ -976,10 +923,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cDigiSize_Crate.fill(eid, digi.samples()); if (_ptype != fOffline) { // hidefed2crate _cDigiSize_FED.fill(eid, digi.samples()); - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); /* @@ -1032,9 +976,14 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (sumQ > _cutSumQ_HBHE) { //double timing = hcaldqm::utilities::aveTS_v10(digi, 2.5, 0,digi.samples()-1); + // without pedestal substraction, request from https://gitlab.cern.ch/cmshcal/docs/-/issues/106 double timing = - hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, digi, 0, digi.samples() - 1); + hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, digi, 0, digi.samples() - 1, false); _cTimingCut_SubdetPM.fill(did, timing); + // with pedestal substraction for energetic hits + if (sumQ > 100. * _cutSumQ_HBHE) + _cTimingCutHTH_SubdetPM.fill( + did, hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, digi, 0, digi.samples() - 1)); _cTimingCut_depth.fill(did, timing); _cOccupancyCut_depth.fill(did); _cTimingCutvsLS_SubdetPM.fill(did, _currentLS, timing); @@ -1052,12 +1001,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS); } if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cTimingCut_FEDuTCA.fill(eid, timing); _cTimingCut_ElectronicsuTCA.fill(eid, timing); _cOccupancyCut_FEDuTCA.fill(eid); @@ -1149,10 +1093,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); } - if (eid.isVMEid()) { - _cCapidMinusBXmod4_CrateSlotVME[this_capidmbx].fill(eid); - - } else { + if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); } } @@ -1172,14 +1113,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cDigiSize_Crate.fill(eid, it->size()); if (_ptype != fOffline) { // hidefed2crate _cDigiSize_FED.fill(eid, it->size()); - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - /* - if (!it->validate(0, it->size())) - _cCapIdRots_FEDVME.fill(eid, 1); - */ - } else { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); /* @@ -1200,11 +1134,16 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (sumQ > _cutSumQ_HO) { //double timing = hcaldqm::utilities::aveTS(*it, 8.5, 0,it->size()-1); - double timing = hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, *it, 0, it->size() - 1); + // without pedestal substraction, request from https://gitlab.cern.ch/cmshcal/docs/-/issues/106 + double timing = hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, *it, 0, it->size() - 1, false); _cSumQ_depth.fill(did, sumQ); _cSumQvsLS_SubdetPM.fill(did, _currentLS, sumQ); _cOccupancyCut_depth.fill(did); _cTimingCut_SubdetPM.fill(did, timing); + // with pedestal substraction for energetic hits + if (sumQ > 100. * _cutSumQ_HO) + _cTimingCutHTH_SubdetPM.fill( + did, hcaldqm::utilities::aveTSDB(_dbService, digi_fC, did, *it, 0, it->size() - 1)); _cTimingCut_depth.fill(did, timing); _cTimingCutvsLS_SubdetPM.fill(did, _currentLS, timing); if (_ptype != fOffline) { // hidefed2crate @@ -1219,12 +1158,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cOccupancyCutvsiphivsLS_SubdetPM.fill(did, _currentLS); } if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cTimingCut_FEDuTCA.fill(eid, timing); _cTimingCut_ElectronicsuTCA.fill(eid, timing); _cOccupancyCut_FEDuTCA.fill(eid); @@ -1324,10 +1258,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); } - if (eid.isVMEid()) { - _cCapidMinusBXmod4_CrateSlotVME[this_capidmbx].fill(eid); - - } else { + if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); } } @@ -1351,13 +1282,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cDigiSize_Crate.fill(eid, digi.samples()); if (_ptype != fOffline) { // hidefed2crate _cDigiSize_FED.fill(eid, digi.samples()); - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - /* - if (!it->validate(0, it->size())) - _cCapIdRots_FEDVME.fill(eid, 1);*/ - } else { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); /* @@ -1404,7 +1329,9 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) //if (!_filter_QIE1011.filter(did)) { _cSumQvsLS_SubdetPM_QIE1011.fill(did, _currentLS, sumQ); //} - _cTimingCut_SubdetPM.fill(did, timing); + _cTimingCut_SubdetPM.fill(did, hcaldqm::utilities::aveTS_v10(digi, 0., 0, digi.samples() - 1)); + if (sumQ > 100. * _cutSumQ_HF) + _cTimingCutHTH_SubdetPM.fill(did, timing); _cTimingCut_depth.fill(did, timing); _cTimingCutvsLS_SubdetPM.fill(did, _currentLS, timing); if (_ptype == fOnline) { @@ -1427,12 +1354,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (_ptype == fOnline) _cQ2Q12CutvsLS_FEDHF.fill(eid, _currentLS, q2q12); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cTimingCut_FEDuTCA.fill(eid, timing); _cTimingCut_ElectronicsuTCA.fill(eid, timing); _cOccupancyCut_FEDuTCA.fill(eid); diff --git a/DQM/HcalTasks/plugins/LEDTask.cc b/DQM/HcalTasks/plugins/LEDTask.cc index 99ccb3859251e..789be95e200ab 100644 --- a/DQM/HcalTasks/plugins/LEDTask.cc +++ b/DQM/HcalTasks/plugins/LEDTask.cc @@ -104,13 +104,6 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) 0); if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.initialize(_name, - "SignalMean", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_generic_400000, true), - 0); _cSignalMean_FEDuTCA.initialize(_name, "SignalMean", hcaldqm::hashfunctions::fFED, @@ -118,13 +111,6 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_generic_400000, true), 0); - _cSignalRMS_FEDVME.initialize(_name, - "SignalRMS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_generic_10000, true), - 0); _cSignalRMS_FEDuTCA.initialize(_name, "SignalRMS", hcaldqm::hashfunctions::fFED, @@ -132,13 +118,6 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_generic_10000, true), 0); - _cTimingMean_FEDVME.initialize(_name, - "TimingMean", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingMean_FEDuTCA.initialize(_name, "TimingMean", hcaldqm::hashfunctions::fFED, @@ -146,13 +125,6 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), 0); - _cTimingRMS_FEDVME.initialize(_name, - "TimingRMS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingRMS_FEDuTCA.initialize(_name, "TimingRMS", hcaldqm::hashfunctions::fFED, @@ -206,13 +178,6 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); if (_ptype != fOffline) { // hidefed2crate - _cMissing_FEDVME.initialize(_name, - "Missing", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMissing_FEDuTCA.initialize(_name, "Missing", hcaldqm::hashfunctions::fFED, @@ -295,16 +260,11 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) _cMissing_depth.book(ib, _emap, _subsystem); if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cSignalMean_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cSignalRMS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cSignalRMS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingMean_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingMean_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingRMS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingRMS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); _cShapeCut_FEDSlot.book(ib, _emap, _subsystem); - _cMissing_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMissing_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); } if (_ptype == fOnline || _ptype == fLocal) { @@ -345,13 +305,9 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) _cTimingRMS_depth.reset(); if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.reset(); _cSignalMean_FEDuTCA.reset(); - _cSignalRMS_FEDVME.reset(); _cSignalRMS_FEDuTCA.reset(); - _cTimingMean_FEDVME.reset(); _cTimingMean_FEDuTCA.reset(); - _cTimingRMS_FEDVME.reset(); _cTimingRMS_FEDuTCA.reset(); } @@ -371,9 +327,7 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) if (n == 0) { _cMissing_depth.fill(did); if (_ptype == fLocal) { // hidefed2crate - if (eid.isVMEid()) - _cMissing_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cMissing_FEDuTCA.fill(eid); } continue; @@ -387,12 +341,7 @@ LEDTask::LEDTask(edm::ParameterSet const& ps) _cTimingRMS_Subdet.fill(did, rtim); _cTimingRMS_depth.fill(did, rtim); if (_ptype == fLocal) { // hidefed2crate - if (eid.isVMEid()) { - _cSignalMean_FEDVME.fill(eid, msig); - _cSignalRMS_FEDVME.fill(eid, rsig); - _cTimingMean_FEDVME.fill(eid, mtim); - _cTimingRMS_FEDVME.fill(eid, rtim); - } else { + if (!eid.isVMEid()) { _cSignalMean_FEDuTCA.fill(eid, msig); _cSignalRMS_FEDuTCA.fill(eid, rsig); _cTimingMean_FEDuTCA.fill(eid, mtim); diff --git a/DQM/HcalTasks/plugins/LaserTask.cc b/DQM/HcalTasks/plugins/LaserTask.cc index 46ee7c920e6da..6f60cdef9be7a 100644 --- a/DQM/HcalTasks/plugins/LaserTask.cc +++ b/DQM/HcalTasks/plugins/LaserTask.cc @@ -106,13 +106,6 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) 0); if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.initialize(_name, - "SignalMean", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fQIE10fC_100000Coarse), - 0); _cSignalMean_FEDuTCA.initialize(_name, "SignalMean", hcaldqm::hashfunctions::fFED, @@ -120,13 +113,6 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fQIE10fC_100000Coarse), 0); - _cSignalRMS_FEDVME.initialize(_name, - "SignalRMS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_3000), - 0); _cSignalRMS_FEDuTCA.initialize(_name, "SignalRMS", hcaldqm::hashfunctions::fFED, @@ -134,13 +120,6 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::ffC_3000), 0); - _cTimingMean_FEDVME.initialize(_name, - "TimingMean", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingMean_FEDuTCA.initialize(_name, "TimingMean", hcaldqm::hashfunctions::fFED, @@ -148,13 +127,6 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), 0); - _cTimingRMS_FEDVME.initialize(_name, - "TimingRMS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), - 0); _cTimingRMS_FEDuTCA.initialize(_name, "TimingRMS", hcaldqm::hashfunctions::fFED, @@ -162,13 +134,6 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_TS200), 0); - _cMissing_FEDVME.initialize(_name, - "Missing", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMissing_FEDuTCA.initialize(_name, "Missing", hcaldqm::hashfunctions::fFED, @@ -381,15 +346,10 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) } if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cSignalMean_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cSignalRMS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cSignalRMS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingMean_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingMean_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingRMS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingRMS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMissing_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMissing_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); _cShapeCut_FEDSlot.book(ib, _emap, _subsystem); } @@ -440,13 +400,9 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) _cTimingRMS_depth.reset(); if (_ptype == fLocal) { // hidefed2crate - _cSignalMean_FEDVME.reset(); _cSignalMean_FEDuTCA.reset(); - _cSignalRMS_FEDVME.reset(); _cSignalRMS_FEDuTCA.reset(); - _cTimingMean_FEDVME.reset(); _cTimingMean_FEDuTCA.reset(); - _cTimingRMS_FEDVME.reset(); _cTimingRMS_FEDuTCA.reset(); } if (_ptype != fOffline) { @@ -464,9 +420,7 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) if (n == 0) { _cMissing_depth.fill(did); if (_ptype == fLocal) { // hidefed2crate - if (eid.isVMEid()) - _cMissing_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cMissing_FEDuTCA.fill(eid); } continue; @@ -488,12 +442,7 @@ LaserTask::LaserTask(edm::ParameterSet const& ps) _cTimingRMS_Subdet.fill(did, rtim); _cTimingRMS_depth.fill(did, rtim); if (_ptype == fLocal) { // hidefed2crate - if (eid.isVMEid()) { - _cSignalMean_FEDVME.fill(eid, msig); - _cSignalRMS_FEDVME.fill(eid, rsig); - _cTimingMean_FEDVME.fill(eid, mtim); - _cTimingRMS_FEDVME.fill(eid, rtim); - } else { + if (!eid.isVMEid()) { _cSignalMean_FEDuTCA.fill(eid, msig); _cSignalRMS_FEDuTCA.fill(eid, rsig); _cTimingMean_FEDuTCA.fill(eid, mtim); diff --git a/DQM/HcalTasks/plugins/PedestalTask.cc b/DQM/HcalTasks/plugins/PedestalTask.cc index 44edb89c8a497..80999a620117f 100644 --- a/DQM/HcalTasks/plugins/PedestalTask.cc +++ b/DQM/HcalTasks/plugins/PedestalTask.cc @@ -90,13 +90,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); if (_ptype != fOffline) { // hidefed2crate - _cMean1LS_FEDVME.initialize(_name, - "Mean1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_15), - 0); _cMean1LS_FEDuTCA.initialize(_name, "Mean1LS", hcaldqm::hashfunctions::fFED, @@ -104,13 +97,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_15), 0); - _cRMS1LS_FEDVME.initialize(_name, - "RMS1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cRMS1LS_FEDuTCA.initialize(_name, "RMS1LS", hcaldqm::hashfunctions::fFED, @@ -298,13 +284,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _xNMsn1LS.initialize(hcaldqm::hashfunctions::fFED); _xNBadMean1LS.initialize(hcaldqm::hashfunctions::fFED); _xNBadRMS1LS.initialize(hcaldqm::hashfunctions::fFED); - _cMeanTotal_FEDVME.initialize(_name, - "Mean", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_15), - 0); _cMeanTotal_FEDuTCA.initialize(_name, "Mean", hcaldqm::hashfunctions::fFED, @@ -312,13 +291,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_15), 0); - _cRMSTotal_FEDVME.initialize(_name, - "RMS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cRMSTotal_FEDuTCA.initialize(_name, "RMS", hcaldqm::hashfunctions::fFED, @@ -326,13 +298,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); - _cMeanDBRef1LS_FEDVME.initialize(_name, - "MeanDBRef1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cMeanDBRef1LS_FEDuTCA.initialize(_name, "MeanDBRef1LS", hcaldqm::hashfunctions::fFED, @@ -340,13 +305,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); - _cRMSDBRef1LS_FEDVME.initialize(_name, - "RMSDBRef1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cRMSDBRef1LS_FEDuTCA.initialize(_name, "RMSDBRef1LS", hcaldqm::hashfunctions::fFED, @@ -354,13 +312,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); - _cMeanDBRefTotal_FEDVME.initialize(_name, - "MeanDBRef", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cMeanDBRefTotal_FEDuTCA.initialize( _name, "MeanDBRef", @@ -369,13 +320,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); - _cRMSDBRefTotal_FEDVME.initialize(_name, - "RMSDBRef", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), - 0); _cRMSDBRefTotal_FEDuTCA.initialize(_name, "RMSDBRef", hcaldqm::hashfunctions::fFED, @@ -383,13 +327,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fADC_5), 0); - _cMissing1LS_FEDVME.initialize(_name, - "Missing1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMissing1LS_FEDuTCA.initialize(_name, "Missing1LS", hcaldqm::hashfunctions::fFED, @@ -397,13 +334,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cMeanBad1LS_FEDVME.initialize(_name, - "MeanBad1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMeanBad1LS_FEDuTCA.initialize(_name, "MeanBad1LS", hcaldqm::hashfunctions::fFED, @@ -411,13 +341,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cRMSBad1LS_FEDVME.initialize(_name, - "RMSBad1LS", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cRMSBad1LS_FEDuTCA.initialize(_name, "RMSBad1LS", hcaldqm::hashfunctions::fFED, @@ -425,13 +348,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cMissingTotal_FEDVME.initialize(_name, - "Missing", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMissingTotal_FEDuTCA.initialize(_name, "Missing", hcaldqm::hashfunctions::fFED, @@ -439,13 +355,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cMeanBadTotal_FEDVME.initialize(_name, - "MeanBad", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cMeanBadTotal_FEDuTCA.initialize(_name, "MeanBad", hcaldqm::hashfunctions::fFED, @@ -453,13 +362,6 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cRMSBadTotal_FEDVME.initialize(_name, - "RMSBad", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cRMSBadTotal_FEDuTCA.initialize(_name, "RMSBad", hcaldqm::hashfunctions::fFED, @@ -509,34 +411,20 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cRMSBadTotal_depth.book(ib, _emap, _subsystem); if (_ptype != fOffline) { // hidefed2crate - _cMean1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMean1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMS1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMS1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMeanDBRef1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMeanDBRef1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMSDBRef1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMSDBRef1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMissing1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMissing1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMSBad1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMSBad1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMeanBad1LS_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMeanBad1LS_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMeanTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMeanTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMSTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMSTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMeanDBRefTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMeanDBRefTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMSDBRefTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMSDBRefTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMissingTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMissingTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cRMSBadTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cRMSBadTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cMeanBadTotal_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cMeanBadTotal_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); } @@ -622,9 +510,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cMean1LS_depth.reset(); _cRMS1LS_depth.reset(); if (_ptype != fOffline) { // hidefed2crate - _cMean1LS_FEDVME.reset(); _cMean1LS_FEDuTCA.reset(); - _cRMS1LS_FEDVME.reset(); _cRMS1LS_FEDuTCA.reset(); } @@ -633,9 +519,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cMeanTotal_depth.reset(); _cRMSTotal_depth.reset(); if (_ptype != fOffline) { // hidefed2crate - _cMeanTotal_FEDVME.reset(); _cMeanTotal_FEDuTCA.reset(); - _cRMSTotal_FEDVME.reset(); _cRMSTotal_FEDuTCA.reset(); } @@ -651,14 +535,10 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cRMSDBRefTotal_depth.reset(); if (_ptype != fOffline) { // hidefed2crate - _cMeanDBRef1LS_FEDVME.reset(); _cMeanDBRef1LS_FEDuTCA.reset(); - _cRMSDBRef1LS_FEDVME.reset(); _cRMSDBRef1LS_FEDuTCA.reset(); - _cMeanDBRefTotal_FEDVME.reset(); _cMeanDBRefTotal_FEDuTCA.reset(); - _cRMSDBRefTotal_FEDVME.reset(); _cRMSDBRefTotal_FEDuTCA.reset(); } @@ -673,18 +553,12 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) // Missing or Bad if (_ptype != fOffline) { // hidefed2crate - _cMissing1LS_FEDVME.reset(); _cMissing1LS_FEDuTCA.reset(); - _cMeanBad1LS_FEDVME.reset(); _cMeanBad1LS_FEDuTCA.reset(); - _cRMSBad1LS_FEDVME.reset(); _cRMSBad1LS_FEDuTCA.reset(); - _cMissingTotal_FEDVME.reset(); _cMissingTotal_FEDuTCA.reset(); - _cMeanBadTotal_FEDVME.reset(); _cMeanBadTotal_FEDuTCA.reset(); - _cRMSBadTotal_FEDVME.reset(); _cRMSBadTotal_FEDuTCA.reset(); // reset some XXX containers @@ -735,7 +609,8 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cMissing1LS_depth.fill(did); _cMissingvsLS_Subdet.fill(did, _currentLS); if (_ptype != fOffline) { // hidefed2crate - eid.isVMEid() ? _cMissing1LS_FEDVME.fill(eid) : _cMissing1LS_FEDuTCA.fill(eid); + if (!eid.isVMEid()) + _cMissing1LS_FEDuTCA.fill(eid); _xNMsn1LS.get(eid)++; } // ALSO CHECK @@ -743,7 +618,8 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) if (nTotal == 0) { _cMissingTotal_depth.fill(did); if (_ptype != fOffline) { // hidefed2crate - eid.isVMEid() ? _cMissingTotal_FEDVME.fill(eid) : _cMissingTotal_FEDuTCA.fill(eid); + if (!eid.isVMEid()) + _cMissingTotal_FEDuTCA.fill(eid); } } continue; @@ -794,12 +670,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) #endif // FOR THIS LS if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cMean1LS_FEDVME.fill(eid, sum1LS); - _cRMS1LS_FEDVME.fill(eid, rms1LS); - _cMeanDBRef1LS_FEDVME.fill(eid, diffm1LS); - _cRMSDBRef1LS_FEDVME.fill(eid, diffr1LS); - } else { + if (!eid.isVMEid()) { _cMean1LS_FEDuTCA.fill(eid, sum1LS); _cRMS1LS_FEDuTCA.fill(eid, rms1LS); _cMeanDBRef1LS_FEDuTCA.fill(eid, diffm1LS); @@ -807,12 +678,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) } // FOR THE WHOLE RUN - if (eid.isVMEid()) { - _cMeanTotal_FEDVME.fill(eid, sumTotal); - _cRMSTotal_FEDVME.fill(eid, rmsTotal); - _cMeanDBRefTotal_FEDVME.fill(eid, diffmTotal); - _cRMSDBRefTotal_FEDVME.fill(eid, diffrTotal); - } else { + if (!eid.isVMEid()) { _cMeanTotal_FEDuTCA.fill(eid, sumTotal); _cRMSTotal_FEDuTCA.fill(eid, rmsTotal); _cMeanDBRefTotal_FEDuTCA.fill(eid, diffmTotal); @@ -826,9 +692,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cMeanBad1LS_depth.fill(did); _cNBadMeanvsLS_Subdet.fill(did, _currentLS); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) - _cMeanBad1LS_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cMeanBad1LS_FEDuTCA.fill(eid); _xNBadMean1LS.get(eid)++; } @@ -837,9 +701,7 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) _cRMSBad1LS_depth.fill(did); _cNBadRMSvsLS_Subdet.fill(did, _currentLS); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) - _cRMSBad1LS_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cRMSBad1LS_FEDuTCA.fill(eid); _xNBadRMS1LS.get(eid)++; } @@ -849,18 +711,14 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) if (fabs(diffmTotal) > _thresh_mean) { _cMeanBadTotal_depth.fill(did); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) - _cMeanBadTotal_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cMeanBadTotal_FEDuTCA.fill(eid); } } if (fabs(diffrTotal) > _thresh_rms) { _cRMSBadTotal_depth.fill(did); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) - _cRMSBadTotal_FEDVME.fill(eid); - else + if (!eid.isVMEid()) _cRMSBadTotal_FEDuTCA.fill(eid); } } diff --git a/DQM/HcalTasks/plugins/RawTask.cc b/DQM/HcalTasks/plugins/RawTask.cc index 887ecf08c8008..1206a6a5166e3 100644 --- a/DQM/HcalTasks/plugins/RawTask.cc +++ b/DQM/HcalTasks/plugins/RawTask.cc @@ -81,27 +81,6 @@ RawTask::RawTask(edm::ParameterSet const& ps) _filter_FEDsuTCA.initialize(filter::fPreserver, hcaldqm::hashfunctions::fFED, vhashFEDsuTCA); // INITIALIZE FIRST - _cEvnMsm_ElectronicsVME.initialize(_name, - "EvnMsm", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cBcnMsm_ElectronicsVME.initialize(_name, - "BcnMsm", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cOrnMsm_ElectronicsVME.initialize(_name, - "OrnMsm", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cEvnMsm_ElectronicsuTCA.initialize(_name, "EvnMsm", hcaldqm::hashfunctions::fElectronics, @@ -125,18 +104,11 @@ RawTask::RawTask(edm::ParameterSet const& ps) 0); // Bad Quality - _cBadQuality_FEDVME.initialize(_name, - "BadQuality", - hcaldqm::hashfunctions::fCrate, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cBadQuality_FEDuTCA.initialize(_name, "BadQuality", hcaldqm::hashfunctions::fCrate, new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSlotuTCA), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), + new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCA), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); @@ -171,14 +143,10 @@ RawTask::RawTask(edm::ParameterSet const& ps) // BOOK HISTOGRAMS if (_ptype != fOffline) { - _cEvnMsm_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cBcnMsm_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cOrnMsm_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cEvnMsm_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cBcnMsm_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cOrnMsm_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cBadQuality_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cBadQuality_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); } if (_ptype == fOffline) { @@ -276,11 +244,7 @@ RawTask::RawTask(edm::ParameterSet const& ps) if (_ptype == fOnline) _xBadQLS.get(eid)++; if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - if (_filter_FEDsVME.filter(eid)) - continue; - _cBadQuality_FEDVME.fill(eid); - } else { + if (!eid.isVMEid()) { if (_filter_FEDsuTCA.filter(eid)) continue; _cBadQuality_FEDuTCA.fill(eid); @@ -337,20 +301,14 @@ RawTask::RawTask(edm::ParameterSet const& ps) bool qbcn = (htr_bcn != bcn); bool qorn = (htr_orn != orn); if (qevn) { - _cEvnMsm_ElectronicsVME.fill(eid); - if (_ptype == fOnline && is <= constants::SPIGOT_MAX) _xEvnMsmLS.get(eid)++; } if (qorn) { - _cOrnMsm_ElectronicsVME.fill(eid); - if (_ptype == fOnline && is <= constants::SPIGOT_MAX) _xOrnMsmLS.get(eid)++; } if (qbcn) { - _cBcnMsm_ElectronicsVME.fill(eid); - if (_ptype == fOnline && is <= constants::SPIGOT_MAX) _xBcnMsmLS.get(eid)++; } diff --git a/DQM/HcalTasks/plugins/RecHitTask.cc b/DQM/HcalTasks/plugins/RecHitTask.cc index cda33cd8c21d3..a5bfcc3315199 100644 --- a/DQM/HcalTasks/plugins/RecHitTask.cc +++ b/DQM/HcalTasks/plugins/RecHitTask.cc @@ -252,13 +252,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) _vhashFEDs.push_back(HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId()); } - _cTimingCut_FEDVME.initialize(_name, - "TimingCut", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_ns), - 0); _cTimingCut_FEDuTCA.initialize(_name, "TimingCut", hcaldqm::hashfunctions::fFED, @@ -272,13 +265,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) new hcaldqm::quantity::LumiSection(_maxLS), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_ns), 0); - _cTimingCut_ElectronicsVME.initialize(_name, - "TimingCut", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_ns), - 0); _cTimingCut_ElectronicsuTCA.initialize(_name, "TimingCut", hcaldqm::hashfunctions::fElectronics, @@ -287,13 +273,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fTiming_ns), 0); - _cOccupancy_FEDVME.initialize(_name, - "Occupancy", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancy_FEDuTCA.initialize(_name, "Occupancy", hcaldqm::hashfunctions::fFED, @@ -301,13 +280,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancy_ElectronicsVME.initialize(_name, - "Occupancy", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancy_ElectronicsuTCA.initialize(_name, "Occupancy", hcaldqm::hashfunctions::fElectronics, @@ -316,13 +288,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancyCut_FEDVME.initialize(_name, - "OccupancyCut", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberVMEFiberCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancyCut_FEDuTCA.initialize(_name, "OccupancyCut", hcaldqm::hashfunctions::fFED, @@ -330,13 +295,6 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCAFiberCh), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), 0); - _cOccupancyCut_ElectronicsVME.initialize(_name, - "OccupancyCut", - hcaldqm::hashfunctions::fElectronics, - new hcaldqm::quantity::FEDQuantity(vFEDsVME), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); _cOccupancyCut_ElectronicsuTCA.initialize(_name, "OccupancyCut", hcaldqm::hashfunctions::fElectronics, @@ -378,9 +336,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) _cTimingCut_SubdetPM.book(ib, _emap, _subsystem); _cTimingvsEnergy_SubdetPM.book(ib, _emap, _subsystem); if (_ptype != fOffline) { // hidefed2crate - _cTimingCut_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingCut_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cTimingCut_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cTimingCut_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); } _cTimingCut_HBHEPartition.book(ib, _emap, _subsystem); @@ -393,17 +349,13 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) // Occupancy _cOccupancy_depth.book(ib, _emap, _subsystem); if (_ptype != fOffline) { // hidefed2crate - _cOccupancy_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancy_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cOccupancy_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancy_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); } _cOccupancyvsLS_Subdet.book(ib, _emap, _subsystem); _cOccupancyCut_depth.book(ib, _emap, _subsystem); if (_ptype != fOffline) { // hidefed2crate - _cOccupancyCut_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancyCut_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cOccupancyCut_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cOccupancyCut_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); } @@ -550,10 +502,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) if (_ptype != fOffline) { // hidefed2crate // Also, for these electronics plots, require that the channel was found in the emap. if (rawid != 0) { - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - } else if (eid.isUTCAid()) { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); } @@ -598,21 +547,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) _cOccupancyCut_depth.fill(did); if (_ptype != fOffline) { // hidefed2crate if (rawid != 0) { - if (eid.isVMEid()) { - // ONLINE - if (_ptype == fOnline) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - } // ^^^ ONLINE - else { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - } - // ^^^ONLINE - - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else if (eid.isUTCAid()) { + if (eid.isUTCAid()) { if (_ptype == fOnline) { // time constraints are explicit! _cTimingCut_FEDuTCA.fill(eid, timing); @@ -681,10 +616,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) // ONLINE ONLY! if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); } @@ -715,12 +647,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) _cOccupancyCut_depth.fill(did); _cTimingCut_depth.fill(did, timing); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cTimingCut_FEDuTCA.fill(eid, timing); _cTimingCut_ElectronicsuTCA.fill(eid, timing); _cOccupancyCut_FEDuTCA.fill(eid); @@ -780,10 +707,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) // ONLINE ONLY! if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cOccupancy_FEDVME.fill(eid); - _cOccupancy_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cOccupancy_FEDuTCA.fill(eid); _cOccupancy_ElectronicsuTCA.fill(eid); } @@ -816,12 +740,7 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) _cOccupancyCut_depth.fill(did); _cTimingCut_depth.fill(did, timing); if (_ptype != fOffline) { // hidefed2crate - if (eid.isVMEid()) { - _cTimingCut_FEDVME.fill(eid, timing); - _cTimingCut_ElectronicsVME.fill(eid, timing); - _cOccupancyCut_FEDVME.fill(eid); - _cOccupancyCut_ElectronicsVME.fill(eid); - } else { + if (!eid.isVMEid()) { _cTimingCut_FEDuTCA.fill(eid, timing); _cTimingCut_ElectronicsuTCA.fill(eid, timing); _cOccupancyCut_FEDuTCA.fill(eid); diff --git a/DQM/HcalTasks/plugins/TPComparisonTask.cc b/DQM/HcalTasks/plugins/TPComparisonTask.cc deleted file mode 100644 index ca75677d4cf86..0000000000000 --- a/DQM/HcalTasks/plugins/TPComparisonTask.cc +++ /dev/null @@ -1,252 +0,0 @@ - -#include "DQM/HcalTasks/interface/TPComparisonTask.h" - -using namespace hcaldqm; -using namespace hcaldqm::constants; -TPComparisonTask::TPComparisonTask(edm::ParameterSet const& ps) - : DQTask(ps), hcalDbServiceToken_(esConsumes()) { - // tags and tokens - _tag1 = ps.getUntrackedParameter("tag1", edm::InputTag("hcalDigis")); - _tag2 = ps.getUntrackedParameter("tag2", edm::InputTag("vmeDigis")); - _tok1 = consumes(_tag1); - _tok2 = consumes(_tag2); - - // tmp flags - _skip1x1 = ps.getUntrackedParameter("skip1x1", true); -} - -/* virtual */ void TPComparisonTask::bookHistograms(DQMStore::IBooker& ib, - edm::Run const& r, - edm::EventSetup const& es) { - DQTask::bookHistograms(ib, r, es); - - // GET WHAT YOU NEED - edm::ESHandle dbs = es.getHandle(hcalDbServiceToken_); - _emap = dbs->getHcalMapping(); - if (_ptype != fOffline) { // hidefed2crate - std::vector vFEDs = hcaldqm::utilities::getFEDList(_emap); - std::vector vFEDsVME = hcaldqm::utilities::getFEDVMEList(_emap); - std::vector vFEDsuTCA = hcaldqm::utilities::getFEDuTCAList(_emap); - } - std::vector vhashVME; - std::vector vhashuTCA; - vhashVME.push_back( - HcalElectronicsId(constants::FIBERCH_MIN, constants::FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN).rawId()); - vhashuTCA.push_back(HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId()); - _filter_VME.initialize(filter::fFilter, hcaldqm::hashfunctions::fElectronics, vhashVME); - _filter_uTCA.initialize(filter::fFilter, hcaldqm::hashfunctions::fElectronics, vhashuTCA); - - // INTIALIZE CONTAINERS - for (unsigned int i = 0; i < 4; i++) { - _cEt_TTSubdet[i].initialize(_name, - "Et", - hcaldqm::hashfunctions::fTTSubdet, - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), - 0); - _cFG_TTSubdet[i].initialize(_name, - "FG", - hcaldqm::hashfunctions::fTTSubdet, - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fFG), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fFG), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), - 0); - } - _cEtall_TTSubdet.initialize(_name, - "Et", - hcaldqm::hashfunctions::fTTSubdet, - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), - 0); - - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDVME.initialize(_name, - "Missing", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSLBSLBCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cMsn_FEDuTCA.initialize(_name, - "Missing", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSlotuTCA), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCATPFiberChuTCATP), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cEtMsm_FEDVME.initialize(_name, - "EtMsm", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSLBSLBCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cEtMsm_FEDuTCA.initialize(_name, - "EtMsm", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSlotuTCA), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCATPFiberChuTCATP), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cFGMsm_FEDVME.initialize(_name, - "FGMsm", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSpigot), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSLBSLBCh), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cFGMsm_FEDuTCA.initialize(_name, - "FGMsm", - hcaldqm::hashfunctions::fFED, - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fSlotuTCA), - new hcaldqm::quantity::ElectronicsQuantity(hcaldqm::quantity::fFiberuTCATPFiberChuTCATP), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - } - - _cMsnuTCA.initialize(_name, - "Missing", - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTieta), - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTiphi), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cMsnVME.initialize(_name, - "Missing", - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTieta), - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTiphi), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cEtMsm.initialize(_name, - "EtMsm", - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTieta), - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTiphi), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - _cFGMsm.initialize(_name, - "FGMsm", - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTieta), - new hcaldqm::quantity::TrigTowerQuantity(hcaldqm::quantity::fTTiphi), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), - 0); - - char aux[20]; - for (unsigned int i = 0; i < 4; i++) { - sprintf(aux, "TS%d", i); - _cEt_TTSubdet[i].book(ib, _emap, _subsystem, aux); - _cFG_TTSubdet[i].book(ib, _emap, _subsystem, aux); - } - _cEtall_TTSubdet.book(ib, _emap, _subsystem); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cEtMsm_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cFGMsm_FEDVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cMsn_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cEtMsm_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - _cFGMsm_FEDuTCA.book(ib, _emap, _filter_VME, _subsystem); - } - - _cMsnuTCA.book(ib, _subsystem, std::string("uTCA")); - _cMsnVME.book(ib, _subsystem, std::string("VME")); - _cEtMsm.book(ib, _subsystem); - _cFGMsm.book(ib, _subsystem); - - _ehashmapuTCA.initialize(_emap, hcaldqm::electronicsmap::fT2EHashMap, _filter_VME); - _ehashmapVME.initialize(_emap, hcaldqm::electronicsmap::fT2EHashMap, _filter_uTCA); - // _ehashmap.print(); - // _cMsn_depth.book(ib); - // _cEtMsm_depth.book(ib); - // _cFGMsm_depth.book(ib); -} - -/* virtual */ void TPComparisonTask::_resetMonitors(hcaldqm::UpdateFreq uf) { DQTask::_resetMonitors(uf); } - -/* virtual */ void TPComparisonTask::_process(edm::Event const& e, edm::EventSetup const& es) { - edm::Handle coll1; - edm::Handle coll2; - - if (!e.getByToken(_tok1, coll1)) - _logger.dqmthrow("Collection HcalTrigPrimDigiCollection isn't available" + _tag1.label() + " " + _tag1.instance()); - if (!e.getByToken(_tok2, coll2)) - _logger.dqmthrow("Collection HcalTrigPrimDigiCollection isn't available" + _tag2.label() + " " + _tag2.instance()); - - // assume always coll1 is primary (uTCA) and coll2 is secondary(VME) - for (HcalTrigPrimDigiCollection::const_iterator it1 = coll1->begin(); it1 != coll1->end(); ++it1) { - // iterate thru utca collection - // get the same detid digi from vme collection - // if missing - fill vme missing - // else correlate - // tmp - if (_skip1x1) - if (it1->id().version() > 0) - continue; - // \tmp - - HcalTrigTowerDetId tid = it1->id(); - HcalTrigPrimDigiCollection::const_iterator it2 = coll2->find(HcalTrigTowerDetId(tid.ieta(), tid.iphi(), 0)); - HcalElectronicsId eid1 = HcalElectronicsId(_ehashmapuTCA.lookup(tid)); - HcalElectronicsId eid2 = HcalElectronicsId(_ehashmapVME.lookup(tid)); - - if (it2 == coll2->end()) { - // missing from VME collection - _cMsnVME.fill(tid); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDVME.fill(eid2); - } - for (int i = 0; i < it1->size(); i++) { - _cEtall_TTSubdet.fill(tid, it1->sample(i).compressedEt(), -2); - _cEt_TTSubdet[i].fill(tid, it1->sample(i).compressedEt(), -2); - } - } else - for (int i = 0; i < it1->size(); i++) { - _cEtall_TTSubdet.fill(tid, it1->sample(i).compressedEt(), it2->sample(i).compressedEt()); - _cEt_TTSubdet[i].fill(tid, it1->sample(i).compressedEt(), it2->sample(i).compressedEt()); - _cFG_TTSubdet[i].fill(tid, it1->sample(i).fineGrain(), it2->sample(i).fineGrain()); - if (it1->sample(i).compressedEt() != it2->sample(i).compressedEt()) { - if (_ptype != fOffline) { // hidefed2crate - _cEtMsm_FEDuTCA.fill(eid1); - _cEtMsm_FEDVME.fill(eid2); - } - _cEtMsm.fill(tid); - } - if (it1->sample(i).fineGrain() != it2->sample(i).fineGrain()) { - if (_ptype != fOffline) { // hidefed2crate - _cFGMsm_FEDuTCA.fill(eid1); - _cFGMsm_FEDVME.fill(eid2); - } - _cFGMsm.fill(tid); - } - } - } - for (HcalTrigPrimDigiCollection::const_iterator it2 = coll2->begin(); it2 != coll2->end(); ++it2) { - // itearte thru VME - // find utca tp digi by detid - // check if present of missing - HcalTrigTowerDetId tid = it2->id(); - if (_skip1x1) - if (tid.version() > 0) - continue; - - HcalTrigPrimDigiCollection::const_iterator it1 = coll1->find(HcalTrigTowerDetId(tid.ieta(), tid.iphi(), 0)); - if (it1 == coll1->end()) { - HcalElectronicsId eid1 = HcalElectronicsId(_ehashmapuTCA.lookup(tid)); - if (_ptype != fOffline) { // hidefed2crate - _cMsn_FEDuTCA.fill(eid1); - } - _cMsnuTCA.fill(tid); - for (int i = 0; i < it2->size(); i++) { - _cEtall_TTSubdet.fill(tid, -2, it2->sample(i).compressedEt()); - _cEt_TTSubdet[i].fill(tid, -2, it2->sample(i).compressedEt()); - } - } - } -} - -/* virtual */ void TPComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, - edm::EventSetup const& es) { - // in the end always - DQTask::globalEndLuminosityBlock(lb, es); -} - -DEFINE_FWK_MODULE(TPComparisonTask); diff --git a/DQM/HcalTasks/plugins/TPTask.cc b/DQM/HcalTasks/plugins/TPTask.cc index 9513773eb958b..e52d4330d640c 100644 --- a/DQM/HcalTasks/plugins/TPTask.cc +++ b/DQM/HcalTasks/plugins/TPTask.cc @@ -75,12 +75,19 @@ TPTask::TPTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); _cSOIEtCorr_TTSubdet.initialize(_name, - "EtCorr", + "EtCorr_EmulvsData", hcaldqm::hashfunctions::fTTSubdetFW, new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); + _cSOIEtCorrEmulL1_TTSubdet.initialize(_name, + "EtCorr_EmulvsL1", + hcaldqm::hashfunctions::fTTSubdetFW, + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), + 0); for (uint8_t iii = 0; iii < constants::NUM_FGBITS; iii++) { _cFGCorr_TTSubdet[iii].initialize(_name, "FGCorr", @@ -254,7 +261,8 @@ TPTask::TPTask(edm::ParameterSet const& ps) "EtCutDatavsBX", hcaldqm::hashfunctions::fTTSubdet, new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fBX), - new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtCorr_256), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fEtlog2), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); _cEtCutEmulvsBX_TTSubdet.initialize(_name, "EtCutEmulvsBX", @@ -553,6 +561,7 @@ TPTask::TPTask(edm::ParameterSet const& ps) _cEtEmul_TTSubdet.book(ib, _emap, _subsystem); _cEtCorr_TTSubdet.book(ib, _emap, _subsystem); _cSOIEtCorr_TTSubdet.book(ib, _emap, _subsystem); + _cSOIEtCorrEmulL1_TTSubdet.book(ib, _emap, _subsystem); if (_ptype != fOffline) { // hidefed2crate _cEtData_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cEtEmul_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); @@ -776,7 +785,7 @@ TPTask::TPTask(edm::ParameterSet const& ps) // ONLINE ONLY! if (_ptype == fOnline) { _cEtCutDatavsLS_TTSubdet.fill(tid, _currentLS, soiEt_d); - _cEtCutDatavsBX_TTSubdet.fill(tid, bx, soiEt_d); + _cEtCutDatavsBX_TTSubdet.fill(tid, bx, log2(soiEt_d + 1.)); _xDataTotal.get(eid)++; } // ^^^ONLINE ONLY! @@ -1055,6 +1064,39 @@ TPTask::TPTask(edm::ParameterSet const& ps) // Compare the sent ("uHTR") and received (L1T "layer1") TPs // This algorithm is copied from DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc // ...but it turns out to be extremely useful for detecting uHTR problems + + _vEmulTPDigis_SentRec.clear(); + ComparisonHelper::zip(cemul->begin(), + cemul->end(), + cdataL1Rec->begin(), + cdataL1Rec->end(), + std::inserter(_vEmulTPDigis_SentRec, _vEmulTPDigis_SentRec.begin()), + HcalTrigPrimDigiCollection::key_compare()); + + // comparison between emulation TP and L1 TP + for (const auto& tpPair : _vEmulTPDigis_SentRec) { + const auto& sentTp = tpPair.first; + const auto& recdTp = tpPair.second; + const int ieta = sentTp.id().ieta(); + if (abs(ieta) > 28 && sentTp.id().version() != 1) + continue; + + const bool towerMasked = recdTp.sample(0).raw() & (1 << 13); + const bool linkError = recdTp.sample(0).raw() & (1 << 15); + if (towerMasked || linkError) + continue; + + HcalTrigTowerDetId tid = sentTp.id(); + uint32_t rawid = _ehashmap.lookup(tid); + if (rawid == 0) { + continue; + } + HcalElectronicsId const& eid(rawid); + + _cSOIEtCorrEmulL1_TTSubdet.fill(tid, eid, recdTp.SOI_compressedEt(), sentTp.SOI_compressedEt()); + } + + // comparison between sent data TP and L1 TP _vTPDigis_SentRec.clear(); ComparisonHelper::zip(cdata->begin(), cdata->end(), @@ -1079,6 +1121,14 @@ TPTask::TPTask(edm::ParameterSet const& ps) // Do not compare if known to be bad continue; } + + HcalTrigTowerDetId tid = sentTp.id(); + uint32_t rawid = _ehashmap.lookup(tid); + if (rawid == 0) { + continue; + } + HcalElectronicsId const& eid(rawid); + const bool HetAgreement = sentTp.SOI_compressedEt() == recdTp.SOI_compressedEt(); const bool Hfb1Agreement = sentTp.SOI_fineGrain() == recdTp.SOI_fineGrain(); // Ignore minBias (FB2) bit if we receieve 0 ET, which means it is likely zero-suppressed on HCal readout side @@ -1086,13 +1136,6 @@ TPTask::TPTask(edm::ParameterSet const& ps) (abs(ieta) < 29) ? true : (recdTp.SOI_compressedEt() == 0 || (sentTp.SOI_fineGrain(1) == recdTp.SOI_fineGrain(1))); if (!(HetAgreement && Hfb1Agreement && Hfb2Agreement)) { - HcalTrigTowerDetId tid = sentTp.id(); - uint32_t rawid = _ehashmap.lookup(tid); - if (rawid == 0) { - continue; - } - HcalElectronicsId const& eid(rawid); - _cEtMsm_uHTR_L1T_depthlike.fill(tid); _cEtMsm_uHTR_L1T_LS.fill(_currentLS); _xSentRecL1Msm.get(eid)++; diff --git a/DQM/HcalTasks/python/DigiComparisonTask.py b/DQM/HcalTasks/python/DigiComparisonTask.py deleted file mode 100644 index 79271e8c3018f..0000000000000 --- a/DQM/HcalTasks/python/DigiComparisonTask.py +++ /dev/null @@ -1,14 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer -digiComparisonTask = DQMEDAnalyzer( - "DigiComparisonTask", - - name = cms.untracked.string("DigiComparisonTask"), - debug = cms.untracked.int32(0), - runkeyVal = cms.untracked.int32(0), - runkeyName = cms.untracked.string("pp_run"), - - tagHBHE1 = cms.untracked.InputTag("hcalDigis"), - tagHBHE2 = cms.untracked.InputTag("uHBHEDigis") -) diff --git a/DQM/HcalTasks/python/TPComparisonTask.py b/DQM/HcalTasks/python/TPComparisonTask.py deleted file mode 100644 index aea22e7afaf48..0000000000000 --- a/DQM/HcalTasks/python/TPComparisonTask.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer -tpComparisonTask = DQMEDAnalyzer( - "TPComparisonTask", - - name = cms.untracked.string("TPComparisonTask"), - debug = cms.untracked.int32(0), - runkeyVal = cms.untracked.int32(0), - runkeyName = cms.untracked.string("pp_run"), - - tag1 = cms.untracked.InputTag("hcalDigis"), - tag2 = cms.untracked.InputTag("uHBHEDigis"), - - # tmp - _skip1x1 = cms.untracked.bool(True) -) diff --git a/DQM/HcalTasks/src/RawRunSummary.cc b/DQM/HcalTasks/src/RawRunSummary.cc index 8c446a8b24eb9..b3d25596416d8 100644 --- a/DQM/HcalTasks/src/RawRunSummary.cc +++ b/DQM/HcalTasks/src/RawRunSummary.cc @@ -25,20 +25,6 @@ namespace hcaldqm { _vhashuTCA); // filter out uTCA // INTIALIZE CONTAINERS ACTING AS HOLDERS OF RUN INFORAMTION - _cEvnMsm_ElectronicsVME.initialize(_name, - "EvnMsm", - hashfunctions::fElectronics, - new quantity::FEDQuantity(_vFEDsVME), - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ValueQuantity(quantity::fN), - 0); - _cBcnMsm_ElectronicsVME.initialize(_name, - "BcnMsm", - hashfunctions::fElectronics, - new quantity::FEDQuantity(_vFEDsVME), - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ValueQuantity(quantity::fN), - 0); _cEvnMsm_ElectronicsuTCA.initialize(_name, "EvnMsm", hashfunctions::fElectronics, @@ -97,23 +83,9 @@ namespace hcaldqm { _xBadQ.reset(); // INITIALIZE LUMI BASED HISTOGRAMS - Container2D cEvnMsm_ElectronicsVME, cEvnMsm_ElectronicsuTCA; - Container2D cBcnMsm_ElectronicsVME, cBcnMsm_ElectronicsuTCA; + Container2D cEvnMsm_ElectronicsuTCA; + Container2D cBcnMsm_ElectronicsuTCA; Container2D cBadQuality_depth; - cEvnMsm_ElectronicsVME.initialize(_taskname, - "EvnMsm", - hashfunctions::fElectronics, - new quantity::FEDQuantity(_vFEDsVME), - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ValueQuantity(quantity::fN), - 0); - cBcnMsm_ElectronicsVME.initialize(_taskname, - "BcnMsm", - hashfunctions::fElectronics, - new quantity::FEDQuantity(_vFEDsVME), - new quantity::ElectronicsQuantity(quantity::fSpigot), - new quantity::ValueQuantity(quantity::fN), - 0); cEvnMsm_ElectronicsuTCA.initialize(_taskname, "EvnMsm", hashfunctions::fElectronics, @@ -137,8 +109,6 @@ namespace hcaldqm { 0); // LOAD LUMI BASED HISTOGRAMS - cEvnMsm_ElectronicsVME.load(ig, _emap, _filter_uTCA, _subsystem); - cBcnMsm_ElectronicsVME.load(ig, _emap, _filter_uTCA, _subsystem); cEvnMsm_ElectronicsuTCA.load(ig, _emap, _filter_VME, _subsystem); cBcnMsm_ElectronicsuTCA.load(ig, _emap, _filter_VME, _subsystem); cBadQuality_depth.load(ig, _emap, _subsystem); @@ -147,8 +117,6 @@ namespace hcaldqm { // BOOK for the very first time if (!_booked) { - _cEvnMsm_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); - _cBcnMsm_ElectronicsVME.book(ib, _emap, _filter_uTCA, _subsystem); _cEvnMsm_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cBcnMsm_ElectronicsuTCA.book(ib, _emap, _filter_VME, _subsystem); _cBadQuality_depth.book(ib, _emap, _subsystem); @@ -166,13 +134,7 @@ namespace hcaldqm { _xBadQ.get(eid) += cBadQuality_depth.getBinContent(did); _cBadQuality_depth.fill(did, cBadQuality_depth.getBinContent(did)); - if (eid.isVMEid()) { - _xEvn.get(eid) += cEvnMsm_ElectronicsVME.getBinContent(eid); - _xBcn.get(eid) += cBcnMsm_ElectronicsVME.getBinContent(eid); - - _cEvnMsm_ElectronicsVME.fill(eid, cEvnMsm_ElectronicsVME.getBinContent(eid)); - _cBcnMsm_ElectronicsVME.fill(eid, cBcnMsm_ElectronicsVME.getBinContent(eid)); - } else { + if (!eid.isVMEid()) { _xEvn.get(eid) += cEvnMsm_ElectronicsuTCA.getBinContent(eid); _xBcn.get(eid) += cBcnMsm_ElectronicsuTCA.getBinContent(eid); diff --git a/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py index a0367c856fc72..aff9deaa17d77 100644 --- a/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py @@ -118,7 +118,6 @@ #------------------------------------- process.load('DQM.HcalTasks.RecHitTask') process.load('DQM.HcalTasks.HcalOnlineHarvesting') -process.load('DQM.HcalTasks.DigiComparisonTask') #------------------------------------- # To force using uTCA