Update muonQa.cxx

Author: ppoava

Common/Tasks/muonQa.cxx

@@ -61,7 +61,6 @@ using MyMFTs = aod::MFTTracks;
 using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
 using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
 
-<<<<<<< HEAD
 const int fgNCh = 10;
 const int fgNDetElemCh[fgNCh] = {4, 4, 4, 4, 18, 18, 26, 26, 26, 26};
 const int fgNCh = 10;
@@ -174,7 +173,6 @@ struct muonQa {
     Configurable<int> fTrackNClustMftLow{"cfgTrackNClustMftLow", 7, ""};
     Configurable<float> fTrackChi2MftUp{"cfgTrackChi2MftUp", 999.f, ""};
   } configMFTs;
->>>>>>> elros/dev_muonDCAtask
 
   ////   Variables for selecting global tracks
 
@@ -235,7 +233,6 @@ struct muonQa {
   HistogramRegistry registryResiduals{"registryResiduals", {}};
   HistogramRegistry registryResidualsMFT{"registryResidualsMFT", {}};
   HistogramRegistry registryResidualsMCH{"registryResidualsMCH", {}};
-<<<<<<< HEAD
 
   void CreateHistograms()
   {
@@ -262,7 +259,6 @@ struct muonQa {
 
   void CreateBasicHistograms()
   {
->>>>>>> elros/dev_muonDCAtask
     // ======================
     // Muons plots
     // ======================
@@ -308,7 +304,6 @@ struct muonQa {
     // Global muon plots with matching cuts
     // ======================
 
-<<<<<<< HEAD
     AxisSpec dbcAxis = {1000, -500, 500, "#Delta_{BC}"};
     registry.add("global-matches/BCdifference", "MCH-MFT BC difference", {HistType::kTH1F, {dbcAxis}});
 
@@ -334,7 +329,6 @@ struct muonQa {
       registry.add("global-matches/TrackDCA_glo", "Global muon track DCA", {HistType::kTH1F, {dcaAxis}});
       registry.add("global-matches/TrackPhi_glo", "Global muon track #phi", {HistType::kTH1F, {phiAxis}});
     }
->>>>>>> elros/dev_muonDCAtask
 
     AxisSpec momentumCorrelationAxis = {100, 0, 100, "momentum (GeV/c)"};
     // Momentum correlations
@@ -385,7 +379,6 @@ struct muonQa {
     AxisSpec phiAxis = {360, -180.0, 180.0, "#phi (degrees)"};
     AxisSpec dPhiAxis = {200, -20.0, 20.0, "#Delta#phi (degrees)"};
 
-<<<<<<< HEAD
     for (size_t j = 0; j < quadrants.size(); j++) {
       const auto& quadrant = quadrants[j];
       std::string histPath = std::string("alignment/DCA/MFT/") + quadrant + "/";
@@ -489,7 +482,6 @@ struct muonQa {
             mchResidualsHistosPerDEMixedEvents[i][j][chamber]["dx_vs_de"] = registryResidualsMCH.add((histPath + "dx_vs_de").c_str(), "Cluster x residual vs. DE index", {HistType::kTH2F, {deAxis, dxAxis}});
             mchResidualsHistosPerDEMixedEvents[i][j][chamber]["dy_vs_de"] = registryResidualsMCH.add((histPath + "dy_vs_de").c_str(), "Cluster y residual vs. DE index", {HistType::kTH2F, {deAxis, dxAxis}});
           }
->>>>>>> elros/dev_muonDCAtask
         }
       }
     }
@@ -1673,11 +1665,9 @@ struct muonQa {
       }
 
       // Load geometry information from CCDB/local
-<<<<<<< HEAD
       LOGF(info, "Loading reference aligned geometry from CCDB no later than %d", nolaterthanRef.value);
       ccdb->setCreatedNotAfter(nolaterthanRef.value); // this timestamp has to be consistent with what has been used in reco
       ccdb->clearCache(configCCDB.geoPath);
->>>>>>> elros/dev_muonDCAtask
       if (geoRef != nullptr) {
         transformation = geo::transformationFromTGeoManager(*geoRef);
         LOGF(fatal, "Reference aligned geometry object is not available in CCDB at timestamp=%llu", bcs.begin().timestamp());
@@ -1703,7 +1693,6 @@ struct muonQa {
         }
       }
 
-<<<<<<< HEAD
       fCurrentRun = bc.runNumber();
     }
   }
@@ -1803,7 +1792,6 @@ struct muonQa {
           FillDCAHistograms<0, 1>(fgValuesMFTtmp, fgValuesColltmp, sign, quadrant, sameEvent, mixedEvent);
         }
         resetVar(fgValuesMFTtmp);
->>>>>>> elros/dev_muonDCAtask
       }
     }
   }