Merge pull request #38827 from mteroerd/HGPCL_GUI_BACKPORT

Modify HG PCL Alignment movement histograms for use in the DQM GUI (Backport of #38815 )
cms-sw · Jul 23, 2022 · e63cf26 · e63cf26
2 parents 3a69825 + 896eadd
commit e63cf26
Showing 1 changed file with 57 additions and 17 deletions.
diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc
@@ -73,34 +73,34 @@ void MillePedeDQMModule ::bookHistograms(DQMStore::IBooker& booker) {
     for (const auto& layer : layerVec) {
       h_xPos_HG[layer.first] = booker.book1D("Xpos_HG_" + layer.first,
                                              "Alignment fit #DeltaX for " + layer.first + ";;#mum",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
       h_xRot_HG[layer.first] = booker.book1D("Xrot_HG_" + layer.first,
                                              "Alignment fit #Delta#theta_{X} for " + layer.first + ";;#murad",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
       h_yPos_HG[layer.first] = booker.book1D("Ypos_HG_" + layer.first,
                                              "Alignment fit #DeltaY for " + layer.first + ";;#mum",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
       h_yRot_HG[layer.first] = booker.book1D("Yrot_HG_" + layer.first,
                                              "Alignment fit #Delta#theta_{Y} for " + layer.first + ";;#murad",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
       h_zPos_HG[layer.first] = booker.book1D("Zpos_HG_" + layer.first,
                                              "Alignment fit #DeltaZ for " + layer.first + ";;#mum",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
       h_zRot_HG[layer.first] = booker.book1D("Zrot_HG_" + layer.first,
                                              "Alignment fit #Delta#theta_{Z} for " + layer.first + ";;#murad",
-                                             layer.second,
+                                             layer.second + 5,
                                              0.,
-                                             layer.second);
+                                             layer.second + 5);
     }
 
     statusResults =
@@ -196,10 +196,10 @@ void MillePedeDQMModule ::fillStatusHistoHG(MonitorElement* statusHisto) {
   TH2F* histo_status = statusHisto->getTH2F();
   auto& theResults = mpReader_->getResultsHG();
   histo_status->GetXaxis()->SetBinLabel(1, "#DeltaX");
-  histo_status->GetXaxis()->SetBinLabel(2, "#Delta#theta_{X}");
-  histo_status->GetXaxis()->SetBinLabel(3, "#DeltaY");
-  histo_status->GetXaxis()->SetBinLabel(4, "#Delta#theta_{Y}");
-  histo_status->GetXaxis()->SetBinLabel(5, "#DeltaZ");
+  histo_status->GetXaxis()->SetBinLabel(2, "#DeltaY");
+  histo_status->GetXaxis()->SetBinLabel(3, "#DeltaZ");
+  histo_status->GetXaxis()->SetBinLabel(4, "#Delta#theta_{X}");
+  histo_status->GetXaxis()->SetBinLabel(5, "#Delta#theta_{Y}");
   histo_status->GetXaxis()->SetBinLabel(6, "#Delta#theta_{Z}");
 
   int i = 0;
@@ -409,16 +409,56 @@ void MillePedeDQMModule ::fillExpertHisto_HG(std::map<std::string, MonitorElemen
                                              const std::array<double, SIZE_HG_STRUCTS>& obs,
                                              const std::array<double, SIZE_HG_STRUCTS>& obsErr) {
   int currentStart = 0;
+  int bin = 0;
+  double max_ = 0;
 
   for (const auto& layer : layerVec) {
     TH1F* histo_0 = histo_map[layer.first]->getTH1F();
 
+    max_ = -1;
     for (int i = currentStart; i < (currentStart + layer.second); ++i) {
       // first obs.size() bins for observed movements
-      int bin = i - currentStart + 1;
+      bin = i - currentStart + 1;
+
+      // fill observed values
       histo_0->SetBinContent(bin, obs[i]);
       histo_0->SetBinError(bin, obsErr[i]);
+
+      if (std::abs(obs[i]) > max_) {
+        max_ = std::abs(obs[i]);
+      }
+    }
+
+    // five extra bins at the end, one empty, one with threshold, one with sigCut, one with maxMoveCut, one with MaxErrorCut
+    histo_0->SetBinContent(bin + 1, 0);
+    histo_0->SetBinError(bin + 1, 0);
+
+    int detIndex;
+    if (layer.first.find("Disk") != std::string::npos) {
+      // 7 is the detId for panels, see getIndexFromString
+      detIndex = 7;
+      histo_0->GetXaxis()->SetTitle("Panel");
+    } else {
+      // 6 is the detId for ladders, see getIndexFromString
+      detIndex = 6;
+      histo_0->GetXaxis()->SetTitle("Ladder");
     }
+
+    histo_0->SetBinContent(bin + 2, cut[detIndex]);
+    histo_0->SetBinError(bin + 2, 0);
+    histo_0->SetBinContent(bin + 3, sigCut[detIndex]);
+    histo_0->SetBinError(bin + 3, 0);
+    histo_0->SetBinContent(bin + 4, maxMoveCut[detIndex]);
+    histo_0->SetBinError(bin + 4, 0);
+    histo_0->SetBinContent(bin + 5, maxErrorCut[detIndex]);
+    histo_0->SetBinError(bin + 5, 0);
+
+    // always scale so the cutoff is visible
+    max_ = std::max(cut[detIndex] * 1.2, max_);
+
+    histo_0->SetMinimum(-(max_)*1.2);
+    histo_0->SetMaximum(max_ * 1.2);
+
     currentStart += layer.second;
   }
 }