Skip to content

Commit 9c0eacd

Browse files
iarseneiarsene
authored
Merge pull request #29 from alibuild/alibot-cleanup-14982
[PWGDQ] Please consider the following formatting changes to #14982
2 parents 5fb6e0e + 35990b0 commit 9c0eacd

File tree

3 files changed

+26
-27
lines changed

3 files changed

+26
-27
lines changed

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,23 @@ DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinned, dcazBimodalityCoefficientBin
7171
DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed1, dcazBimodalityCoefficientBinnedTrimmed1, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 1
7272
DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed2, dcazBimodalityCoefficientBinnedTrimmed2, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 2
7373
DECLARE_SOA_COLUMN(DCAzBimodalityCoefficientBinnedTrimmed3, dcazBimodalityCoefficientBinnedTrimmed3, float); //! Bimodality coefficient of the DCAz distribution of the tracks in the event, binned and trimmed 3
74-
DECLARE_SOA_COLUMN(DCAzMean, dcazMean, float); //! Mean of the DCAz distribution of the tracks in the event
75-
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed1, dcazMeanBinnedTrimmed1, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 1
76-
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed2, dcazMeanBinnedTrimmed2, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 2
77-
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed3, dcazMeanBinnedTrimmed3, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 3
78-
DECLARE_SOA_COLUMN(DCAzRMS, dcazRMS, float); //! RMS of the DCAz distribution of the tracks in the event
79-
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed1, dcazRMSBinnedTrimmed1, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 1
80-
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed2, dcazRMSBinnedTrimmed2, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 2
81-
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed3, dcazRMSBinnedTrimmed3, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 3
82-
DECLARE_SOA_COLUMN(DCAzSkewness, dcazSkewness, float); //! Skewness of the DCAz distribution of the tracks in the event
83-
DECLARE_SOA_COLUMN(DCAzKurtosis, dcazKurtosis, float); //! Kurtosis of the DCAz distribution of the tracks in the event
84-
DECLARE_SOA_COLUMN(DCAzFracAbove100um, dcazFracAbove100um, float); //! Fraction of tracks in the event with |DCAz| > 100um
85-
DECLARE_SOA_COLUMN(DCAzFracAbove200um, dcazFracAbove200um, float); //! Fraction of tracks in the event with |DCAz| > 200um
86-
DECLARE_SOA_COLUMN(DCAzFracAbove500um, dcazFracAbove500um, float); //! Fraction of tracks in the event with |DCAz| > 500um
87-
DECLARE_SOA_COLUMN(DCAzFracAbove1mm, dcazFracAbove1mm, float); //! Fraction of tracks in the event with |DCAz| > 1mm
88-
DECLARE_SOA_COLUMN(DCAzFracAbove2mm, dcazFracAbove2mm, float); //! Fraction of tracks in the event with |DCAz| > 2mm
89-
DECLARE_SOA_COLUMN(DCAzFracAbove5mm, dcazFracAbove5mm, float); //! Fraction of tracks in the event with |DCAz| > 5mm
90-
DECLARE_SOA_COLUMN(DCAzFracAbove10mm, dcazFracAbove10mm, float); //! Fraction of tracks in the event with |DCAz| > 10mm
74+
DECLARE_SOA_COLUMN(DCAzMean, dcazMean, float); //! Mean of the DCAz distribution of the tracks in the event
75+
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed1, dcazMeanBinnedTrimmed1, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 1
76+
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed2, dcazMeanBinnedTrimmed2, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 2
77+
DECLARE_SOA_COLUMN(DCAzMeanBinnedTrimmed3, dcazMeanBinnedTrimmed3, float); //! Mean of the DCAz distribution of the tracks in the event, binned and trimmed 3
78+
DECLARE_SOA_COLUMN(DCAzRMS, dcazRMS, float); //! RMS of the DCAz distribution of the tracks in the event
79+
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed1, dcazRMSBinnedTrimmed1, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 1
80+
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed2, dcazRMSBinnedTrimmed2, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 2
81+
DECLARE_SOA_COLUMN(DCAzRMSBinnedTrimmed3, dcazRMSBinnedTrimmed3, float); //! RMS of the DCAz distribution of the tracks in the event, binned and trimmed 3
82+
DECLARE_SOA_COLUMN(DCAzSkewness, dcazSkewness, float); //! Skewness of the DCAz distribution of the tracks in the event
83+
DECLARE_SOA_COLUMN(DCAzKurtosis, dcazKurtosis, float); //! Kurtosis of the DCAz distribution of the tracks in the event
84+
DECLARE_SOA_COLUMN(DCAzFracAbove100um, dcazFracAbove100um, float); //! Fraction of tracks in the event with |DCAz| > 100um
85+
DECLARE_SOA_COLUMN(DCAzFracAbove200um, dcazFracAbove200um, float); //! Fraction of tracks in the event with |DCAz| > 200um
86+
DECLARE_SOA_COLUMN(DCAzFracAbove500um, dcazFracAbove500um, float); //! Fraction of tracks in the event with |DCAz| > 500um
87+
DECLARE_SOA_COLUMN(DCAzFracAbove1mm, dcazFracAbove1mm, float); //! Fraction of tracks in the event with |DCAz| > 1mm
88+
DECLARE_SOA_COLUMN(DCAzFracAbove2mm, dcazFracAbove2mm, float); //! Fraction of tracks in the event with |DCAz| > 2mm
89+
DECLARE_SOA_COLUMN(DCAzFracAbove5mm, dcazFracAbove5mm, float); //! Fraction of tracks in the event with |DCAz| > 5mm
90+
DECLARE_SOA_COLUMN(DCAzFracAbove10mm, dcazFracAbove10mm, float); //! Fraction of tracks in the event with |DCAz| > 10mm
9191

9292
// Columns declared to guarantee the backward compatibility of the tables
9393
DECLARE_SOA_COLUMN(QvecBPosRe, qvecBPosRe, float);

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ struct TableMakerMC {
294294
std::map<int32_t, float> fraction100umDCAz; // fraction of tracks with |DCAz|>100um
295295
std::map<int32_t, float> fraction200umDCAz; // fraction of tracks with |DCAz|>200um
296296
std::map<int32_t, float> fraction500umDCAz; // fraction of tracks with |DCAz|>500um
297-
std::map<int32_t, float> fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm
298-
std::map<int32_t, float> fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm
299-
std::map<int32_t, float> fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm
300-
std::map<int32_t, float> fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm
297+
std::map<int32_t, float> fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm
298+
std::map<int32_t, float> fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm
299+
std::map<int32_t, float> fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm
300+
std::map<int32_t, float> fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm
301301
} fCollMergingTag;
302302

303303
void init(o2::framework::InitContext& context)

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,13 +394,12 @@ struct TableMaker {
394394
std::map<int32_t, float> fraction100umDCAz; // fraction of tracks with |DCAz|>100um
395395
std::map<int32_t, float> fraction200umDCAz; // fraction of tracks with |DCAz|>200um
396396
std::map<int32_t, float> fraction500umDCAz; // fraction of tracks with |DCAz|>500um
397-
std::map<int32_t, float> fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm
398-
std::map<int32_t, float> fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm
399-
std::map<int32_t, float> fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm
400-
std::map<int32_t, float> fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm
397+
std::map<int32_t, float> fraction1mmDCAz; // fraction of tracks with |DCAz|>1mm
398+
std::map<int32_t, float> fraction2mmDCAz; // fraction of tracks with |DCAz|>2mm
399+
std::map<int32_t, float> fraction5mmDCAz; // fraction of tracks with |DCAz|>5mm
400+
std::map<int32_t, float> fraction10mmDCAz; // fraction of tracks with |DCAz|>10mm
401401
} fCollMergingTag;
402402

403-
404403
void init(o2::framework::InitContext& context)
405404
{
406405
// CCDB configuration
@@ -1078,7 +1077,7 @@ struct TableMaker {
10781077
VarManager::fgValues[VarManager::kNTPCmedianTimeShortA] = fOccup.oMedianTimeShortA[collision.globalIndex()];
10791078
VarManager::fgValues[VarManager::kNTPCmedianTimeShortC] = fOccup.oMedianTimeShortC[collision.globalIndex()];
10801079
}
1081-
1080+
10821081
if (fDoDetailedQA) {
10831082
fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues);
10841083
}

0 commit comments

Comments
 (0)