Fix linter

Author: fchinu

PWGHF/D2H/TableProducer/candidateCreatorBToJPsiReduced.cxx

@@ -1,4 +1,3 @@
-
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
@@ -362,17 +361,11 @@ struct HfCandidateCreatorBToJPsiReduced {
       registry.fill(HIST("hEvents"), 1, collisionCounter.originalCollisionCount());
     }
 
-    static int ncol = 0;
-
     for (const auto& collision : collisions) {
       auto thisCollId = collision.globalIndex();
       auto candsJPsiThisColl = candsJPsi.sliceBy(candsJPsiPerCollision, thisCollId);
       auto tracksKaonThisCollision = tracksKaon.sliceBy(tracksLf0PerCollision, thisCollId);
       runCandidateCreation<DecayChannel::BplusToJPsiK>(collision, candsJPsiThisColl, tracksKaonThisCollision, tracksKaonThisCollision, invMass2JPsiKMin, invMass2JPsiKMax);
-      if (ncol % 10000 == 0) {
-        LOG(debug) << ncol << " collisions parsed";
-      }
-      ncol++;
     }
   } // processDataBplus
   PROCESS_SWITCH(HfCandidateCreatorBToJPsiReduced, processDataBplus, "Process data for B+", true);
@@ -397,18 +390,12 @@ struct HfCandidateCreatorBToJPsiReduced {
       registry.fill(HIST("hEvents"), 1, collisionCounter.originalCollisionCount());
     }
 
-    static int ncol = 0;
-
     for (const auto& collision : collisions) {
       auto thisCollId = collision.globalIndex();
       auto candsJPsiThisColl = candsJPsi.sliceBy(candsJPsiPerCollision, thisCollId);
       auto tracksLf0ThisCollision = tracksLfDau0.sliceBy(tracksLf0PerCollision, thisCollId);
       auto tracksLf1ThisCollision = tracksLfDau1.sliceBy(tracksLf1PerCollision, thisCollId);
       runCandidateCreation<DecayChannel::BsToJPsiPhi>(collision, candsJPsiThisColl, tracksLf0ThisCollision, tracksLf1ThisCollision, invMass2JPsiKMin, invMass2JPsiKMax);
-      if (ncol % 10000 == 0) {
-        LOG(debug) << ncol << " collisions parsed";
-      }
-      ncol++;
     }
   } // processDataBs
   PROCESS_SWITCH(HfCandidateCreatorBToJPsiReduced, processDataBs, "Process data for Bs", false);

PWGHF/D2H/TableProducer/dataCreatorJPsiHadReduced.cxx

@@ -121,6 +121,13 @@ struct HfDataCreatorJPsiHadReduced {
   Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
   Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
 
+  HfHelper hfHelper;
+
+  // CCDB service
+  Service<o2::ccdb::BasicCCDBManager> ccdb;
+  // O2DatabasePDG service
+  Service<o2::framework::O2DatabasePDG> pdg;
+
   using TracksPid = soa::Join<aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>;
   using TracksPidWithSel = soa::Join<aod::TracksWCovDcaExtra, TracksPid, aod::TrackSelection>;
   using TracksSel = soa::Join<aod::TracksWDcaExtra, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa>;
@@ -131,23 +138,16 @@ struct HfDataCreatorJPsiHadReduced {
   Preslice<aod::TrackAssoc> trackIndicesPerCollision = aod::track_association::collisionId;
   PresliceUnsorted<CollisionsWCMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
 
-  HistogramRegistry registry{"registry"};
-
-  // CCDB service
-  Service<o2::ccdb::BasicCCDBManager> ccdb;
   o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
   int runNumber;
   double bz{0.};
-
-  // O2DatabasePDG service
-  Service<o2::framework::O2DatabasePDG> pdg;
-
   double invMass2JPsiHadMin, invMass2JPsiHadMax;
-  HfHelper hfHelper;
+  bool isHfCandBhadConfigFilled = false;
+
   o2::hf_evsel::HfEventSelection hfEvSel;
   o2::vertexing::DCAFitterN<2> df2;
 
-  bool isHfCandBhadConfigFilled = false;
+  HistogramRegistry registry{"registry"};
 
   void init(InitContext const&)
   {

PWGHF/D2H/Tasks/taskBplusToJPsiKReduced.cxx

@@ -42,7 +42,7 @@ namespace o2::aod
 {
 namespace hf_cand_bplustojpsik_lite
 {
-DECLARE_SOA_COLUMN(PtJPsi, ptD, float);    //! Transverse momentum of JPsi daughter candidate (GeV/c)
+DECLARE_SOA_COLUMN(PtJPsi, ptJPsi, float); //! Transverse momentum of JPsi daughter candidate (GeV/c)
 DECLARE_SOA_COLUMN(PtBach, ptBach, float); //! Transverse momentum of bachelor kaon (GeV/c)
 // DECLARE_SOA_COLUMN(AbsEtaBach, absEtaBach, float);                                       //! Absolute pseudorapidity of bachelor kaon
 // DECLARE_SOA_COLUMN(ItsNClsBach, itsNClsBach, int);                                       //! Number of ITS clusters of bachelor kaon

PWGHF/D2H/Tasks/taskBsToJPsiPhiReduced.cxx

@@ -43,7 +43,7 @@ namespace o2::aod
 {
 namespace hf_cand_bstojpsiphi_lite
 {
-DECLARE_SOA_COLUMN(PtJPsi, ptD, float);      //! Transverse momentum of JPsi daughter candidate (GeV/c)
+DECLARE_SOA_COLUMN(PtJPsi, ptJPsi, float);   //! Transverse momentum of JPsi daughter candidate (GeV/c)
 DECLARE_SOA_COLUMN(PtBach0, ptBach0, float); //! Transverse momentum of bachelor kaon(<- phi) (GeV/c)
 DECLARE_SOA_COLUMN(PtBach1, ptBach1, float); //! Transverse momentum of bachelor kaon(<- phi) (GeV/c)
 // DECLARE_SOA_COLUMN(AbsEtaBach, absEtaBach, float);                                       //! Absolute pseudorapidity of bachelor kaon