Skip to content

Commit

Permalink
Merge pull request #33353 from dildick/from-CMSSW_11_3_X_2021-04-06-1…
Browse files Browse the repository at this point in the history 
…100-put-csc-validation-plot-titles-back

Put CSC validation plot titles back in CSCDigiTask
  • Loading branch information
@cmsbuild
cmsbuild committed Apr 8, 2021
2 parents 514cb5f + 772712f commit 3fa58f1
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 18 deletions.
6 changes: 4 additions & 2 deletions Validation/MuonCSCDigis/src/CSCALCTDigiValidation.cc
View file
Expand Up @@ -21,8 +21,10 @@ void CSCALCTDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
for (int i = 1; i <= 10; ++i) {
const std::string t1("CSCALCTDigiTime_" + CSCDetId::chamberName(i));
const std::string t2("CSCALCTDigisPerChamber_" + CSCDetId::chamberName(i));
theTimeBinPlots[i - 1] = iBooker.book1D(t1, t1 + ";Wire Time Bin; Entries", 16, 0, 16);
theNDigisPerChamberPlots[i - 1] = iBooker.book1D(t2, t2 + ";Number of ALCTs per chamber;Entries", 4, 0, 4);
theTimeBinPlots[i - 1] =
iBooker.book1D(t1, "Wire Time Bin " + CSCDetId::chamberName(i) + ";Wire Time Bin; Entries", 16, 0, 16);
theNDigisPerChamberPlots[i - 1] = iBooker.book1D(
t2, "Number of ALCTs per chamber " + CSCDetId::chamberName(i) + ";Number of ALCTs per chamber;Entries", 4, 0, 4);
}
}

Expand Down
6 changes: 4 additions & 2 deletions Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.cc
View file
Expand Up @@ -21,8 +21,10 @@ void CSCCLCTDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
for (int i = 1; i <= 10; ++i) {
const std::string t1("CSCCLCTDigiTime_" + CSCDetId::chamberName(i));
const std::string t2("CSCCLCTDigisPerChamber_" + CSCDetId::chamberName(i));
theTimeBinPlots[i - 1] = iBooker.book1D(t1, t1 + ";Comparator Time Bin; Entries", 16, 0, 16);
theNDigisPerChamberPlots[i - 1] = iBooker.book1D(t2, t2 + ";Number of CLCTs per chamber;Entries", 4, 0, 4);
theTimeBinPlots[i - 1] = iBooker.book1D(
t1, "Comparator Time Bin " + CSCDetId::chamberName(i) + ";Comparator Time Bin; Entries", 16, 0, 16);
theNDigisPerChamberPlots[i - 1] = iBooker.book1D(
t2, "Number of CLCTs per chamber " + CSCDetId::chamberName(i) + ";Number of CLCTs per chamber;Entries", 4, 0, 4);
}
}

Expand Down
27 changes: 21 additions & 6 deletions Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.cc
View file
Expand Up @@ -17,18 +17,33 @@ CSCComparatorDigiValidation::CSCComparatorDigiValidation(const edm::ParameterSet
CSCComparatorDigiValidation::~CSCComparatorDigiValidation() {}

void CSCComparatorDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
theNDigisPerEventPlot =
iBooker.book1D("CSCComparatorDigisPerEvent", ";CSC Comparator Digis per event;Entries", 100, 0, 100);
theNDigisPerEventPlot = iBooker.book1D("CSCComparatorDigisPerEvent",
"CSC Comparator Digis per event;CSC Comparator Digis per event;Entries",
100,
0,
100);
// 10 chamber types, if you consider ME1/a and ME1/b separate
for (int i = 1; i <= 10; ++i) {
const std::string t1("CSCComparatorDigiTime_" + CSCDetId::chamberName(i));
const std::string t2("CSCComparatorDigisPerLayer_" + CSCDetId::chamberName(i));
const std::string t3("CSCComparatorStripAmplitude_" + CSCDetId::chamberName(i));
const std::string t4("CSCComparator3StripAmplitude_" + CSCDetId::chamberName(i));
theTimeBinPlots[i - 1] = iBooker.book1D(t1, t1 + ";Comparator Time Bin; Entries", 16, 0, 16);
theNDigisPerLayerPlots[i - 1] = iBooker.book1D(t2, t2 + ";Number of Comparator Digis; Entries", 100, 0, 20);
theStripDigiPlots[i - 1] = iBooker.book1D(t3, t3 + ";Comparator Amplitude; Entries", 100, 0, 1000);
the3StripPlots[i - 1] = iBooker.book1D(t4, t4 + ";Comparator-triplet Amplitude; Entries", 100, 0, 1000);
theTimeBinPlots[i - 1] = iBooker.book1D(
t1, "Comparator Time Bin " + CSCDetId::chamberName(i) + " ;Comparator Time Bin; Entries", 16, 0, 16);
theNDigisPerLayerPlots[i - 1] = iBooker.book1D(
t2,
"Number of Comparator Digis " + CSCDetId::chamberName(i) + " ;Number of Comparator Digis; Entries",
100,
0,
20);
theStripDigiPlots[i - 1] = iBooker.book1D(
t3, "Comparator Amplitude " + CSCDetId::chamberName(i) + " ;Comparator Amplitude; Entries", 100, 0, 1000);
the3StripPlots[i - 1] = iBooker.book1D(
t4,
"Comparator-triplet Amplitude " + CSCDetId::chamberName(i) + " ;Comparator-triplet Amplitude; Entries",
100,
0,
1000);
}
}

Expand Down
21 changes: 17 additions & 4 deletions Validation/MuonCSCDigis/src/CSCStripDigiValidation.cc
View file
Expand Up @@ -20,19 +20,32 @@ CSCStripDigiValidation::~CSCStripDigiValidation() {}

void CSCStripDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
thePedestalPlot = iBooker.book1D("CSCPedestal", "CSC Pedestal;ADC Counts;Entries", 400, 550, 650);
theAmplitudePlot = iBooker.book1D("CSCStripAmplitude", ";CSC Strip Amplitude;Entries", 200, 0, 2000);
theAmplitudePlot = iBooker.book1D("CSCStripAmplitude", "CSC Strip Amplitude;Strip Amplitude;Entries", 200, 0, 2000);
theRatio4to5Plot = iBooker.book1D("CSCStrip4to5", "CSC Strip Ratio tbin 4 to tbin 5;Strip Ratio;Entries", 100, 0, 1);
theRatio6to5Plot =
iBooker.book1D("CSCStrip6to5", "CSC Strip Ratio tbin 6 to tbin 5;Strip Ratio;Entries", 120, 0, 1.2);
theNDigisPerLayerPlot =
iBooker.book1D("CSCStripDigisPerLayer", ";Number of CSC Strip Digis per layer;Entries", 48, 0, 48);
iBooker.book1D("CSCStripDigisPerLayer",
"Number of CSC Strip Digis per layer;Number of CSC Strip Digis per layer;Entries",
48,
0,
48);
theNDigisPerEventPlot =
iBooker.book1D("CSCStripDigisPerEvent", ";Number of CSC Strip Digis per event;Entries", 100, 0, 500);
iBooker.book1D("CSCStripDigisPerEvent",
"Number of CSC Strip Digis per event;Number of CSC Strip Digis per event;Entries",
100,
0,
500);

if (doSim_) {
for (int i = 1; i <= 10; ++i) {
const std::string t1("CSCStripPosResolution_" + CSCDetId::chamberName(i));
theResolutionPlots[i - 1] = iBooker.book1D(t1, t1 + ";Strip X Position Resolution; Entries", 100, -5, 5);
theResolutionPlots[i - 1] = iBooker.book1D(
t1,
"Strip X Position Resolution " + CSCDetId::chamberName(i) + ";Strip X Position Resolution; Entries",
100,
-5,
5);
}
}
}
Expand Down
16 changes: 12 additions & 4 deletions Validation/MuonCSCDigis/src/CSCWireDigiValidation.cc
View file
Expand Up @@ -16,14 +16,22 @@ CSCWireDigiValidation::CSCWireDigiValidation(const edm::ParameterSet &ps, edm::C
CSCWireDigiValidation::~CSCWireDigiValidation() {}

void CSCWireDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
theNDigisPerEventPlot = iBooker.book1D("CSCWireDigisPerEvent", ";CSC Wire Digis per event;Entries", 100, 0, 100);
theNDigisPerEventPlot =
iBooker.book1D("CSCWireDigisPerEvent", "CSC Wire Digis per event;CSC Wire Digis per event;Entries", 100, 0, 100);
for (int i = 1; i <= 10; ++i) {
const std::string t1("CSCWireDigiTime_" + CSCDetId::chamberName(i));
const std::string t2("CSCWireDigisPerLayer_" + CSCDetId::chamberName(i));
const std::string t3("CSCWireDigiResolution_" + CSCDetId::chamberName(i));
theTimeBinPlots[i - 1] = iBooker.book1D(t1, t1 + ";Wire Time Bin; Entries", 16, 0, 16);
theNDigisPerLayerPlots[i - 1] = iBooker.book1D(t2, t2 + ";Number of Wire Digis; Entries", 100, 0, 20);
theResolutionPlots[i - 1] = iBooker.book1D(t3, t3 + ";Wire Y Position Resolution; Entries", 100, -10, 10);
theTimeBinPlots[i - 1] =
iBooker.book1D(t1, "Wire Time Bin " + CSCDetId::chamberName(i) + ";Wire Time Bin; Entries", 16, 0, 16);
theNDigisPerLayerPlots[i - 1] = iBooker.book1D(
t2, "Number of Wire Digis " + CSCDetId::chamberName(i) + ";Number of Wire Digis; Entries", 100, 0, 20);
theResolutionPlots[i - 1] = iBooker.book1D(
t3,
"Wire Y Position Resolution " + CSCDetId::chamberName(i) + ";Wire Y Position Resolution; Entries",
100,
-10,
10);
}
}

Expand Down

0 comments on commit 3fa58f1

Please sign in to comment.