Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HcalDQM: Update for Run3 based on recent commissioning runs #36232

Merged
merged 1 commit into from Nov 25, 2021
Merged

HcalDQM: Update for Run3 based on recent commissioning runs #36232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions DQM/HcalCommon/interface/Utilities.h
View file
Open in desktop
Expand Up @@ -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;
}
Expand Down
5 changes: 5 additions & 0 deletions DQM/HcalCommon/interface/ValueQuantity.h
View file
Open in desktop
Expand Up @@ -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<ValueQuantityType, std::string> name_value = {
{fN, "N"},
Expand Down Expand Up @@ -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<ValueQuantityType, double> min_value = {
{fN, -0.05},
Expand Down Expand Up @@ -192,6 +194,7 @@ namespace hcaldqm {
{fCapidMinusBXmod4, -0.5},
{fBX_36, -0.5},
{fADC_256_4, -0.5},
{fEtlog2, 0.},
};
const std::map<ValueQuantityType, double> max_value = {
{fN, 1000},
Expand Down Expand Up @@ -254,6 +257,7 @@ namespace hcaldqm {
{fCapidMinusBXmod4, 3.5},
{fBX_36, 3564. - 0.5},
{fADC_256_4, 255},
{fEtlog2, 9.},
};
const std::map<ValueQuantityType, int> nbins_value = {
{fN, 200},
Expand Down Expand Up @@ -315,6 +319,7 @@ namespace hcaldqm {
{fCapidMinusBXmod4, 4},
{fBX_36, 99},
{fADC_256_4, 64},
{fEtlog2, 9},
};
class ValueQuantity : public Quantity {
public:
Expand Down
72 changes: 0 additions & 72 deletions DQM/HcalTasks/interface/DigiComparisonTask.h
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions DQM/HcalTasks/interface/DigiTask.h
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions DQM/HcalTasks/interface/LEDTask.h
View file
Open in desktop
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions DQM/HcalTasks/interface/LaserTask.h
View file
Open in desktop
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions DQM/HcalTasks/interface/PedestalTask.h
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalTasks/interface/RawRunSummary.h
View file
Open in desktop
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions DQM/HcalTasks/interface/RawTask.h
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions DQM/HcalTasks/interface/RecHitTask.h
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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;
Expand Down