diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 83e749df764..8d1e9b10ab3 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -211,14 +211,14 @@ using MultHepMCHI = MultHepMCHIs::iterator; namespace multZeq { -DECLARE_SOA_COLUMN(MultZeqFV0A, multZeqFV0A, float); //! Multiplicity equalized for the vertex position with the FV0A detector -DECLARE_SOA_COLUMN(MultZeqFT0A, multZeqFT0A, float); //! Multiplicity equalized for the vertex position with the FT0A detector -DECLARE_SOA_COLUMN(MultZeqFT0C, multZeqFT0C, float); //! Multiplicity equalized for the vertex position with the FT0C detector -DECLARE_SOA_COLUMN(MultZeqFDDA, multZeqFDDA, float); //! Multiplicity equalized for the vertex position with the FDDA detector -DECLARE_SOA_COLUMN(MultZeqFDDC, multZeqFDDC, float); //! Multiplicity equalized for the vertex position with the FDDC detector -DECLARE_SOA_COLUMN(MultZeqNTracksPV, multZeqNTracksPV, float); //! Multiplicity equalized for the vertex position from the PV contributors +DECLARE_SOA_COLUMN(MultZeqFV0A, multZeqFV0A, float); //! Multiplicity equalized for the vertex position with the FV0A detector +DECLARE_SOA_COLUMN(MultZeqFT0A, multZeqFT0A, float); //! Multiplicity equalized for the vertex position with the FT0A detector +DECLARE_SOA_COLUMN(MultZeqFT0C, multZeqFT0C, float); //! Multiplicity equalized for the vertex position with the FT0C detector +DECLARE_SOA_COLUMN(MultZeqFDDA, multZeqFDDA, float); //! Multiplicity equalized for the vertex position with the FDDA detector +DECLARE_SOA_COLUMN(MultZeqFDDC, multZeqFDDC, float); //! Multiplicity equalized for the vertex position with the FDDC detector +DECLARE_SOA_COLUMN(MultZeqNTracksPV, multZeqNTracksPV, float); //! Multiplicity equalized for the vertex position from the PV contributors DECLARE_SOA_COLUMN(MultZeqNTracksGlobal, multZeqNTracksGlobal, float); //! Multiplicity equalized for the vertex position, global tracks -DECLARE_SOA_COLUMN(MultZeqMFTNtracks, multZeqMFTNtracks, float); //! Multiplicity equalized for the vertex position, MFT tracks +DECLARE_SOA_COLUMN(MultZeqMFTNtracks, multZeqMFTNtracks, float); //! Multiplicity equalized for the vertex position, MFT tracks } // namespace multZeq DECLARE_SOA_TABLE(FV0MultZeqs, "AOD", "FV0MULTZEQ", //! Multiplicity equalized for the vertex position with the FV0 detector multZeq::MultZeqFV0A); diff --git a/Common/Tools/MultModule.h b/Common/Tools/MultModule.h index 2bc245fafe4..017c1d70de3 100644 --- a/Common/Tools/MultModule.h +++ b/Common/Tools/MultModule.h @@ -522,7 +522,7 @@ class MultModule hVtxZFDDA = nullptr; hVtxZFDDC = nullptr; hVtxZNTracks = nullptr; - hVtxZNMFTTracks = nullptr; + hVtxZNMFTTracks = nullptr; hVtxZNGlobalTracks = nullptr; opts = internalOpts; @@ -663,10 +663,10 @@ class MultModule LOGF(error, "Problem loading CCDB objects! Please check"); lCalibLoaded = false; } - if (!hVtxZNMFTTracks){ + if (!hVtxZNMFTTracks) { LOGF(info, "MFT track counter: vertex-Z calibration not loaded, will run without."); } - if (!hVtxZNGlobalTracks){ + if (!hVtxZNGlobalTracks) { LOGF(info, "Global track counter: vertex-Z calibration not loaded, will run without."); } } else { @@ -854,9 +854,9 @@ class MultModule cursors.multsGlobal(mults.multGlobalTracks, mults.multNbrContribsEta08GlobalTrackWoDCA, mults.multNbrContribsEta10GlobalTrackWoDCA, mults.multNbrContribsEta05GlobalTrackWoDCA); - if(!hVtxZNGlobalTracks || std::fabs(collision.posZ()) > 15.0f){ + if (!hVtxZNGlobalTracks || std::fabs(collision.posZ()) > 15.0f) { mults.multGlobalTracksZeq = mults.multGlobalTracks; // if no equalization available, don't do it - }else{ + } else { mults.multGlobalTracksZeq = hVtxZNGlobalTracks->Interpolate(0.0) * mults.multFT0C / hVtxZNGlobalTracks->Interpolate(collision.posZ()); } @@ -978,9 +978,9 @@ class MultModule mults[collision.globalIndex()].multMFTTracks = nTracks; // vertex-Z equalized MFT - if(!hVtxZNMFTTracks || std::fabs(collision.posZ()) > 15.0f){ + if (!hVtxZNMFTTracks || std::fabs(collision.posZ()) > 15.0f) { mults[collision.globalIndex()].multMFTTracksZeq = mults[collision.globalIndex()].multMFTTracks; // if no equalization available, don't do it - }else{ + } else { mults[collision.globalIndex()].multMFTTracksZeq = hVtxZNMFTTracks->Interpolate(0.0) * mults[collision.globalIndex()].multMFTTracks / hVtxZNMFTTracks->Interpolate(collision.posZ()); }