diff --git a/PWGDQ/DataModel/ReducedInfoTables.h b/PWGDQ/DataModel/ReducedInfoTables.h index fdef422c15d..3b5833a772c 100644 --- a/PWGDQ/DataModel/ReducedInfoTables.h +++ b/PWGDQ/DataModel/ReducedInfoTables.h @@ -71,23 +71,23 @@ DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinned, dcazBimodalityCoefficientBin DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed1, dcazBimodalityCoefficientBinnedTrimmed1, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 1 DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed2, dcazBimodalityCoefficientBinnedTrimmed2, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 2 DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed3, dcazBimodalityCoefficientBinnedTrimmed3, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 3 -DECLARE_SOA_COLUMN(DCAzMean, dcazMean, float); //! Mean of the DCAz distribution of the tracks in the event -DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed1, dcazMeanBinnedTrimmed1, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 1 -DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed2, dcazMeanBinnedTrimmed2, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 2 -DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed3, dcazMeanBinnedTrimmed3, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 3 -DECLARE_SOA_COLUMN(DCAzRMS, dcazRMS, float); //! RMS of the DCAz distribution of the tracks in the event -DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed1, dcazRMSBinnedTrimmed1, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 1 -DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed2, dcazRMSBinnedTrimmed2, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 2 -DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed3, dcazRMSBinnedTrimmed3, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 3 -DECLARE_SOA_COLUMN(DCAzSkewness, dcazSkewness, float); //! Skewness of the DCAz distribution of the tracks in the event -DECLARE_SOA_COLUMN(DCAzKurtosis, dcazKurtosis, float); //! Kurtosis of the DCAz distribution of the tracks in the event -DECLARE_SOA_COLUMN(DCAzFracAbove100um, dcazFracAbove100um, float); //! Fraction of tracks in the event with |DCAz| > 100um -DECLARE_SOA_COLUMN(DCAzFracAbove200um, dcazFracAbove200um, float); //! Fraction of tracks in the event with |DCAz| > 200um -DECLARE_SOA_COLUMN(DCAzFracAbove500um, dcazFracAbove500um, float); //! Fraction of tracks in the event with |DCAz| > 500um -DECLARE_SOA_COLUMN(DCAzFracAbove1mm, dcazFracAbove1mm, float); //! Fraction of tracks in the event with |DCAz| > 1mm -DECLARE_SOA_COLUMN(DCAzFracAbove2mm, dcazFracAbove2mm, float); //! Fraction of tracks in the event with |DCAz| > 2mm -DECLARE_SOA_COLUMN(DCAzFracAbove5mm, dcazFracAbove5mm, float); //! Fraction of tracks in the event with |DCAz| > 5mm -DECLARE_SOA_COLUMN(DCAzFracAbove10mm, dcazFracAbove10mm, float); //! Fraction of tracks in the event with |DCAz| > 10mm +DECLARE_SOA_COLUMN(DCAzMean, dcazMean, float); //! Mean of the DCAz distribution of the tracks in the event +DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed1, dcazMeanBinnedTrimmed1, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 1 +DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed2, dcazMeanBinnedTrimmed2, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 2 +DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed3, dcazMeanBinnedTrimmed3, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 3 +DECLARE_SOA_COLUMN(DCAzRMS, dcazRMS, float); //! RMS of the DCAz distribution of the tracks in the event +DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed1, dcazRMSBinnedTrimmed1, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 1 +DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed2, dcazRMSBinnedTrimmed2, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 2 +DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed3, dcazRMSBinnedTrimmed3, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 3 +DECLARE_SOA_COLUMN(DCAzSkewness, dcazSkewness, float); //! Skewness of the DCAz distribution of the tracks in the event +DECLARE_SOA_COLUMN(DCAzKurtosis, dcazKurtosis, float); //! Kurtosis of the DCAz distribution of the tracks in the event +DECLARE_SOA_COLUMN(DCAzFracAbove100um, dcazFracAbove100um, float); //! Fraction of tracks in the event with |DCAz| > 100um +DECLARE_SOA_COLUMN(DCAzFracAbove200um, dcazFracAbove200um, float); //! Fraction of tracks in the event with |DCAz| > 200um +DECLARE_SOA_COLUMN(DCAzFracAbove500um, dcazFracAbove500um, float); //! Fraction of tracks in the event with |DCAz| > 500um +DECLARE_SOA_COLUMN(DCAzFracAbove1mm, dcazFracAbove1mm, float); //! Fraction of tracks in the event with |DCAz| > 1mm +DECLARE_SOA_COLUMN(DCAzFracAbove2mm, dcazFracAbove2mm, float); //! Fraction of tracks in the event with |DCAz| > 2mm +DECLARE_SOA_COLUMN(DCAzFracAbove5mm, dcazFracAbove5mm, float); //! Fraction of tracks in the event with |DCAz| > 5mm +DECLARE_SOA_COLUMN(DCAzFracAbove10mm, dcazFracAbove10mm, float); //! Fraction of tracks in the event with |DCAz| > 10mm // Columns declared to guarantee the backward compatibility of the tables DECLARE_SOA_COLUMN(QvecBPosRe, qvecBPosRe, float); diff --git a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx index f0f95e065e6..17e84871cdd 100644 --- a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx @@ -294,10 +294,10 @@ struct TableMakerMC { std::map fraction100umDCAz; // fraction of tracks with |DCAz|>100um std::map fraction200umDCAz; // fraction of tracks with |DCAz|>200um std::map fraction500umDCAz; // fraction of tracks with |DCAz|>500um - std::map fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm - std::map fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm - std::map fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm - std::map fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm + std::map fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm + std::map fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm + std::map fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm + std::map fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm } fCollMergingTag; void init(o2::framework::InitContext& context) diff --git a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx index a84dbf715d3..3d9a8380431 100644 --- a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx @@ -394,13 +394,12 @@ struct TableMaker { std::map fraction100umDCAz; // fraction of tracks with |DCAz|>100um std::map fraction200umDCAz; // fraction of tracks with |DCAz|>200um std::map fraction500umDCAz; // fraction of tracks with |DCAz|>500um - std::map fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm - std::map fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm - std::map fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm - std::map fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm + std::map fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm + std::map fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm + std::map fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm + std::map fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm } fCollMergingTag; - void init(o2::framework::InitContext& context) { // CCDB configuration @@ -1078,7 +1077,7 @@ struct TableMaker { VarManager::fgValues[VarManager::kNTPCmedianTimeShortA] = fOccup.oMedianTimeShortA[collision.globalIndex()]; VarManager::fgValues[VarManager::kNTPCmedianTimeShortC] = fOccup.oMedianTimeShortC[collision.globalIndex()]; } - + if (fDoDetailedQA) { fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues); }