[PPS] Removed all 'get' prefixes from PPS DataFormat objects

CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsData.cc

@@ -50,7 +50,7 @@ CTPPSRPAlignmentCorrectionData CTPPSRPAlignmentCorrectionsData::getFullSensorCor
   CTPPSRPAlignmentCorrectionData align_corr;
 
   // try to get alignment correction of the full RP
-  auto rpIt = rps_.find(CTPPSDetId(id).getRPId());
+  auto rpIt = rps_.find(CTPPSDetId(id).rpId());
   if (rpIt != rps_.end())
     align_corr = rpIt->second;
 
@@ -132,4 +132,4 @@ std::ostream& operator<<(std::ostream& s, const CTPPSRPAlignmentCorrectionsData&
   return s;
 }
 
-//----------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------

CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc

@@ -357,7 +357,7 @@ void CTPPSRPAlignmentCorrectionsMethods::writeXMLBlock(const CTPPSRPAlignmentCor
 
   for (auto it = sensors.begin(); it != sensors.end(); ++it) {
     CTPPSDetId sensorId(it->first);
-    unsigned int rpId = sensorId.getRPId();
+    unsigned int rpId = sensorId.rpId();
     unsigned int decRPId = sensorId.arm() * 100 + sensorId.station() * 10 + sensorId.rp();
 
     // start a RP block

DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc

@@ -351,7 +351,7 @@ void CTPPSCommonDQMSource::analyzeTracks(edm::Event const &event, edm::EventSetu
   map<unsigned int, set<signed int>> ms_rp_idx_arm;
 
   for (auto &tr : *hTracks) {
-    const CTPPSDetId rpId(tr.getRPId());
+    const CTPPSDetId rpId(tr.rpId());
     const unsigned int arm = rpId.arm();
     const unsigned int stNum = rpId.station();
     const unsigned int rpNum = rpId.rp();
@@ -429,7 +429,7 @@ void CTPPSCommonDQMSource::analyzeTracks(edm::Event const &event, edm::EventSetu
   map<unsigned int, set<unsigned int>> mTop, mHor, mBot;
 
   for (auto &tr : *hTracks) {
-    CTPPSDetId rpId(tr.getRPId());
+    CTPPSDetId rpId(tr.rpId());
     const unsigned int rpNum = rpId.rp();
     const unsigned int armIdx = rpId.arm();
 
@@ -447,17 +447,17 @@ void CTPPSCommonDQMSource::analyzeTracks(edm::Event const &event, edm::EventSetu
     {
       auto it = ap.trackingRPPlots.find(rpDecId);
       if (it != ap.trackingRPPlots.end()) {
-        it->second.h_x->Fill(tr.getX());
-        it->second.h_y->Fill(tr.getY());
+        it->second.h_x->Fill(tr.x());
+        it->second.h_y->Fill(tr.y());
       }
     }
 
     // fill in reference timing-RP plots
     {
       auto it = ap.timingRPPlots.find(rpDecId);
       if (it != ap.timingRPPlots.end()) {
-        it->second.h_x->Fill(tr.getX());
-        it->second.h_time->Fill(tr.getTime());
+        it->second.h_x->Fill(tr.x());
+        it->second.h_time->Fill(tr.time());
       }
     }
   }

DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc

@@ -250,17 +250,17 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co
       ID.setStation(stn);
       string stnd, stnTitle;
 
-      CTPPSDetId(ID.getStationId()).stationName(stnd, CTPPSDetId::nPath);
-      CTPPSDetId(ID.getStationId()).stationName(stnTitle, CTPPSDetId::nFull);
-      CTPPSDetId(ID.getStationId()).stationName(stnTitleShort, CTPPSDetId::nShort);
+      CTPPSDetId(ID.stationId()).stationName(stnd, CTPPSDetId::nPath);
+      CTPPSDetId(ID.stationId()).stationName(stnTitle, CTPPSDetId::nFull);
+      CTPPSDetId(ID.stationId()).stationName(stnTitleShort, CTPPSDetId::nShort);
 
       ibooker.setCurrentFolder(stnd);
       //--------- RPots ---
       int pixBinW = 4;
       for (int rp = RPn_first; rp < RPn_last; rp++) {  // only installed pixel pots
         ID.setRP(rp);
         string rpd, rpTitle;
-        CTPPSDetId(ID.getRPId()).rpName(rpTitle, CTPPSDetId::nShort);
+        CTPPSDetId(ID.rpId()).rpName(rpTitle, CTPPSDetId::nShort);
         string rpBinName = armTitleShort + "_" + stnTitleShort + "_" + rpTitle;
         yah1st->SetBinLabel(getRPglobalBin(arm, stn), rpBinName.c_str());
         xah1trk->SetBinLabel(getRPglobalBin(arm, stn), rpBinName.c_str());
@@ -271,8 +271,8 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co
         int indexP = getRPindex(arm, stn, rp);
         RPindexValid[indexP] = 1;
 
-        CTPPSDetId(ID.getRPId()).rpName(rpTitle, CTPPSDetId::nFull);
-        CTPPSDetId(ID.getRPId()).rpName(rpd, CTPPSDetId::nPath);
+        CTPPSDetId(ID.rpId()).rpName(rpTitle, CTPPSDetId::nFull);
+        CTPPSDetId(ID.rpId()).rpName(rpd, CTPPSDetId::nPath);
 
         ibooker.setCurrentFolder(rpd);
 
@@ -450,15 +450,15 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const
 
       for (DetSet<CTPPSPixelLocalTrack>::const_iterator dit = ds_tr.begin(); dit != ds_tr.end(); ++dit) {
         ++pixRPTracks[rpInd];
-        int nh_tr = (dit->getNDF() + TrackFitDimension) / 2;
+        int nh_tr = (dit->ndf() + TrackFitDimension) / 2;
         for (int i = 0; i <= NplaneMAX; i++) {
           if (i == nh_tr)
             htrackHits[rpInd]->Fill(nh_tr, 1.);
           else
             htrackHits[rpInd]->Fill(i, 0.);
         }
-        float x0 = dit->getX0();
-        float y0 = dit->getY0();
+        float x0 = dit->x0();
+        float y0 = dit->y0();
         h2trackXY0[rpInd]->Fill(x0, y0);
         if (x0_MAX < x0)
           x0_MAX = x0;

DQM/CTPPS/plugins/ElasticPlotDQMSource.cc

@@ -258,7 +258,7 @@ void ElasticPlotDQMSource::analyze(edm::Event const &event, edm::EventSetup cons
 
   for (const auto &ds : *hits) {
     TotemRPDetId detId(ds.detId());
-    CTPPSDetId rpId = detId.getRPId();
+    CTPPSDetId rpId = detId.rpId();
 
     if (ds.size() > 5) {
       if (detId.isStripsCoordinateUDirection())
@@ -274,12 +274,12 @@ void ElasticPlotDQMSource::analyze(edm::Event const &event, edm::EventSetup cons
     // count U and V patterns
     unsigned int n_pat_u = 0, n_pat_v = 0;
     for (auto &p : ds) {
-      if (!p.getFittable())
+      if (!p.fittable())
         continue;
 
-      if (p.getProjection() == TotemRPUVPattern::projU)
+      if (p.projection() == TotemRPUVPattern::projU)
         n_pat_u++;
-      else if (p.getProjection() == TotemRPUVPattern::projV)
+      else if (p.projection() == TotemRPUVPattern::projV)
         n_pat_v++;
     }
 
@@ -330,18 +330,18 @@ void ElasticPlotDQMSource::analyze(edm::Event const &event, edm::EventSetup cons
         continue;
 
       if (cond_4rp)
-        dp.v_h2_y_vs_x_dgn_4rp[i]->Fill(tr_i->getX0(), tr_i->getY0());
+        dp.v_h2_y_vs_x_dgn_4rp[i]->Fill(tr_i->x0(), tr_i->y0());
 
       if (cond_2rp)
-        dp.v_h2_y_vs_x_dgn_2rp[i]->Fill(tr_i->getX0(), tr_i->getY0());
+        dp.v_h2_y_vs_x_dgn_2rp[i]->Fill(tr_i->x0(), tr_i->y0());
 
       for (unsigned int j = 0; j < 4; j++) {
         if (rp_track[dp.rpIds[j]] == nullptr)
           continue;
 
         dp.h2_track_corr_vert->Fill(i, j);
 
-        dp.v_h_y[i][j]->Fill(tr_i->getY0());
+        dp.v_h_y[i][j]->Fill(tr_i->y0());
       }
     }
   }

DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc

@@ -93,14 +93,14 @@ void TotemDAQTriggerDQMSource::analyze(edm::Event const &event, edm::EventSetup
   // DAQ plots
   if (daqValid) {
     for (auto &it1 : *fedInfo) {
-      daq_event_bx_diff->Fill(it1.getBX() - event.bunchCrossing());
-      daq_event_bx_diff_vs_fed->Fill(it1.getFEDId(), it1.getBX() - event.bunchCrossing());
+      daq_event_bx_diff->Fill(it1.bx() - event.bunchCrossing());
+      daq_event_bx_diff_vs_fed->Fill(it1.fedId(), it1.bx() - event.bunchCrossing());
 
       for (auto &it2 : *fedInfo) {
-        if (it2.getFEDId() <= it1.getFEDId())
+        if (it2.fedId() <= it1.fedId())
           continue;
 
-        daq_bx_diff->Fill(it2.getBX() - it1.getBX());
+        daq_bx_diff->Fill(it2.bx() - it1.bx());
       }
     }
   }

DQM/CTPPS/plugins/TotemRPDQMHarvester.cc

@@ -132,7 +132,7 @@ void TotemRPDQMHarvester::MakePlaneEfficiencyHistograms(unsigned int id,
   }
 
   // book new RP histogram, if not yet done
-  CTPPSDetId rpId = detId.getRPId();
+  CTPPSDetId rpId = detId.rpId();
   rpId.rpName(path, TotemRPDetId::nPath);
   const string rp_efficiency_name = "plane efficiency";
   MonitorElement *rp_efficiency = igetter.get(path + "/" + rp_efficiency_name);