Merge pull request #47909 from CTPPS/ab_15_1_0_pre2_2025_dqm

PPS DQM update for the beginning of 2025 data-taking

Author: cmsbuild

DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc

@@ -43,7 +43,6 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<s
 
 private:
   const unsigned int verbosity;
-  constexpr static int MAX_LUMIS = 6000;
   constexpr static int MAX_VBINS = 20;
 
   const edm::EDGetTokenT<CTPPSRecord> ctppsRecordToken;
@@ -105,7 +104,6 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<s
 using namespace std;
 using namespace edm;
 
-const int CTPPSCommonDQMSource::MAX_LUMIS;
 const int CTPPSCommonDQMSource::MAX_VBINS;
 
 //----------------------------------------------------------------------------------------------------
@@ -123,14 +121,8 @@ void CTPPSCommonDQMSource::GlobalPlots::Init(DQMStore::IBooker &ibooker) {
      2 -> warning
      3 -> ok
   */
-  RPState = ibooker.book2D("rpstate per LS",
-                           "RP State per Lumisection;Luminosity Section;",
-                           MAX_LUMIS,
-                           0,
-                           MAX_LUMIS,
-                           MAX_VBINS,
-                           0.,
-                           MAX_VBINS);
+  RPState = ibooker.book2D(
+      "rpstate per LS", "RP State per Lumisection;Luminosity Section;", 1000, 0, 1000, MAX_VBINS, 0., MAX_VBINS);
   {
     TH2F *hist = RPState->getTH2F();
     hist->SetCanExtend(TH1::kAllAxes);

DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc

@@ -65,19 +65,19 @@ class CTPPSPixelDQMSource : public DQMEDAnalyzer {
   static constexpr int ADCMax = 256;
   static constexpr int StationIDMAX = 4;  // possible range of ID
   static constexpr int RPotsIDMAX = 8;    // possible range of ID
-  static constexpr int NLocalTracksMAX = 20;
+  static constexpr int NLocalTracksMAX = 10;
   static constexpr int hitMultMAX = 50;   // tuned
   static constexpr int ClusMultMAX = 10;  // tuned
   static constexpr int ClusterSizeMax = 9;
   static constexpr int errCodeSize = 15;
   static constexpr int minFedNumber = 1462;
   static constexpr int numberOfFeds = 2;
-  static constexpr int mapXbins = 200;
-  static constexpr int mapYbins = 240;
-  static constexpr float mapYmin = -16.;
-  static constexpr float mapYmax = 8.;
-  const float mapXmin = 0. * TMath::Cos(18.4 / 180. * TMath::Pi());
-  const float mapXmax = 30. * TMath::Cos(18.4 / 180. * TMath::Pi());
+  static constexpr float x0Minimum = -5.;
+  static constexpr float y0Minimum = -10.;
+  static constexpr float x0Maximum = 25.;
+  static constexpr float y0Maximum = 22.;
+  static constexpr float xBins_per_mm = 3;  // number of x bins per mm
+  static constexpr float yBins_per_mm = 3;  // number of y bins per mm
 
   CTPPSPixelIndices thePixIndices;
 
@@ -471,12 +471,16 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co
 
         ibooker.setCurrentFolder(rpd);
 
-        const float x0Maximum = 70.;
-        const float y0Maximum = 15.;
         string st = "track intercept point";
         string st2 = ": " + stnTitle;
-        h2trackXY0[indexP] = ibooker.book2D(
-            st, st + st2 + ";x0;y0", int(x0Maximum) * 2, 0., x0Maximum, int(y0Maximum) * 4, -y0Maximum, y0Maximum);
+        h2trackXY0[indexP] = ibooker.book2D(st,
+                                            st + st2 + ";x0;y0",
+                                            int(x0Maximum - x0Minimum) * xBins_per_mm,
+                                            x0Minimum,
+                                            x0Maximum,
+                                            int(y0Maximum - y0Minimum) * yBins_per_mm,
+                                            y0Minimum,
+                                            y0Maximum);
         h2trackXY0[indexP]->getTH2F()->SetOption("colz");
         st = "Error Code";
         h2ErrorCodeRP[indexP] = ibooker.book2D(st,
@@ -643,8 +647,17 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co
 
           if (offlinePlots) {
             st = "plane efficiency";
-            h2Efficiency[indexP][p] = ibooker.bookProfile2D(
-                st, st1 + ";x0;y0", mapXbins, mapXmin, mapXmax, mapYbins, mapYmin, mapYmax, 0, 1, "");
+            h2Efficiency[indexP][p] = ibooker.bookProfile2D(st,
+                                                            st1 + ";x0;y0",
+                                                            int(x0Maximum - x0Minimum) * xBins_per_mm,
+                                                            x0Minimum,
+                                                            x0Maximum,
+                                                            int(y0Maximum - y0Minimum) * yBins_per_mm,
+                                                            y0Minimum,
+                                                            y0Maximum,
+                                                            0,
+                                                            1,
+                                                            "");
             h2Efficiency[indexP][p]->getTProfile2D()->SetOption("colz");
           }
         }  // end of for(int p=0; p<NplaneMAX;..