Skip to content

Commit 9ede436

Browse files
yhou-gityhou-git
authored
Merge branch 'AliceO2Group:master' into jethadronBranch
2 parents d530f73 + cbeb09b commit 9ede436

File tree

84 files changed

+1353
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1353
-983
lines changed

‎CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
/PWGLF/Utils @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
5757

5858
# PWG-MM (fused with LF, LF conveners included. Directories to be merged in the future)
59-
/PWGMM @alibuild @sustripathy @skundu692 @aalkin @jgcn
60-
/PWGMM/Mult @alibuild @sustripathy @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61-
/PWGMM/Lumi @alibuild @sustripathy @skundu692 @aalkin @jgcn @gbencedi @abmodak
62-
/PWGMM/UE @alibuild @sustripathy @skundu692 @aalkin @aortizve @jgcn
59+
/PWGMM @alibuild @mpuccio @skundu692 @aalkin @jgcn
60+
/PWGMM/Mult @alibuild @mpuccio @skundu692 @aalkin @aortizve @ddobrigk @gbencedi @jgcn
61+
/PWGMM/Lumi @alibuild @mpuccio @skundu692 @aalkin @jgcn @gbencedi @abmodak
62+
/PWGMM/UE @alibuild @mpuccio @skundu692 @aalkin @aortizve @jgcn
6363

6464
/PWGUD @alibuild @amatyja @rolavick
6565
/PWGJE @alibuild @lhavener @maoyx @nzardosh @fjonasALICE @mfasDa @mhemmer-cern

‎Common/DataModel/ZDCExtra.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ DECLARE_SOA_COLUMN(Vx, vx, float); //! Vertex X
4646
DECLARE_SOA_COLUMN(Vy, vy, float); //! Vertex Y
4747
DECLARE_SOA_COLUMN(Vz, vz, float); //! Vertex Z
4848
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp
49+
DECLARE_SOA_COLUMN(RunNumber, runNumber, uint32_t); //! Run Number
4950
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags
5051
} // namespace zdcextra
5152

@@ -71,6 +72,7 @@ DECLARE_SOA_TABLE(ZdcExtras, "AOD", "ZDCEXTRA", o2::soa::Index<>,
7172
zdcextra::Vy,
7273
zdcextra::Vz,
7374
zdcextra::Timestamp,
75+
zdcextra::RunNumber,
7476
zdcextra::SelectionBits);
7577
} // namespace o2::aod
7678

‎Common/TableProducer/zdcExtraTableProducer.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ struct ZdcExtraTableProducer {
9595
registry.add("ZNAsumq", "ZNAsumq; ZNA uncalib. sum PMQ; Entries", {HistType::kTH1F, {{nBins, -0.5, maxZN}}});
9696
registry.add("ZNCsumq", "ZNCsumq; ZNC uncalib. sum PMQ; Entries", {HistType::kTH1F, {{nBins, -0.5, maxZN}}});
9797

98-
registry.add("ZNACentroid", "ZNACentroid; ZNA Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
99-
registry.add("ZNCCentroid", "ZNCCentroid; ZNC Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
98+
registry.add("ZNACentroid", "ZNA Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
99+
registry.add("ZNCCentroid", "ZNC Centroid; X; Y", {HistType::kTH2F, {{50, -1.5, 1.5}, {50, -1.5, 1.5}}});
100100

101101
registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
102102
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
@@ -312,7 +312,7 @@ struct ZdcExtraTableProducer {
312312
auto vy = collision.posY();
313313

314314
if (isZNAhit || isZNChit) {
315-
zdcextras(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNA, centroidZNA[0], centroidZNA[1], pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNC, centroidZNC[0], centroidZNC[1], centrality, vx, vy, vz, foundBC.timestamp(), evSelection);
315+
zdcextras(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNA, centroidZNA[0], centroidZNA[1], pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNC, centroidZNC[0], centroidZNC[1], centrality, vx, vy, vz, foundBC.timestamp(), foundBC.runNumber(), evSelection);
316316
}
317317
}
318318
}

‎Common/Tasks/qVectorsCorrection.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,8 @@ struct qVectorsCorrection {
760760
{
761761
histosQA.fill(HIST("histCentFull"), qVec.cent());
762762
if (cfgAddEvtSel) {
763+
if (std::abs(qVec.posZ()) > 10.)
764+
return;
763765
switch (cfgEvtSel) {
764766
case 0: // Sel8
765767
if (!qVec.sel8())

‎PWGCF/EbyEFluctuations/Tasks/Diff_pT_fluct_PID.cxx‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,38 @@
1313
/// v0(pT) along with its statistical uncertainity using subsampling technique.
1414
/// \author Anna Binoy (anna.binoy@niser.ac.in)
1515

16-
#include <CCDB/BasicCCDBManager.h>
17-
#include <algorithm>
18-
#include <numeric>
19-
#include <cmath>
20-
#include <vector>
16+
#include "Common/DataModel/Centrality.h"
17+
#include "Common/DataModel/EventSelection.h"
18+
#include "Common/DataModel/Multiplicity.h"
19+
#include "Common/DataModel/PIDResponseTOF.h"
20+
#include "Common/DataModel/PIDResponseTPC.h"
21+
#include "Common/DataModel/TrackSelectionTables.h"
2122

22-
#include "Framework/runDataProcessing.h"
23-
#include "Framework/AnalysisTask.h"
24-
#include "Framework/AnalysisDataModel.h"
2523
#include "Framework/ASoAHelpers.h"
26-
#include "Framework/RunningWorkflowInfo.h"
24+
#include "Framework/AnalysisDataModel.h"
25+
#include "Framework/AnalysisTask.h"
2726
#include "Framework/HistogramRegistry.h"
2827
#include "Framework/HistogramSpec.h"
28+
#include "Framework/RunningWorkflowInfo.h"
2929
#include "Framework/StaticFor.h"
30-
31-
#include "Common/DataModel/TrackSelectionTables.h"
32-
#include "Common/DataModel/EventSelection.h"
33-
#include "Common/DataModel/PIDResponse.h"
34-
#include "Common/DataModel/Multiplicity.h"
35-
#include "Common/DataModel/Centrality.h"
30+
#include "Framework/runDataProcessing.h"
31+
#include <CCDB/BasicCCDBManager.h>
3632

3733
#include "TDatabasePDG.h"
38-
#include "TLorentzVector.h"
34+
#include "TF1.h"
35+
#include "TH1D.h"
36+
#include "TH2D.h"
3937
#include "TList.h"
38+
#include "TLorentzVector.h"
39+
#include "TMath.h"
4040
#include "TProfile.h"
4141
#include "TProfile2D.h"
42-
#include "TH2D.h"
43-
#include "TH1D.h"
4442
#include "TRandom3.h"
45-
#include "TMath.h"
46-
#include "TF1.h"
43+
44+
#include <algorithm>
45+
#include <cmath>
46+
#include <numeric>
47+
#include <vector>
4748

4849
using namespace o2;
4950
using namespace o2::framework;

‎PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,28 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <CCDB/BasicCCDBManager.h>
13-
#include <cmath>
14-
#include <vector>
15-
#include "Framework/AnalysisTask.h"
16-
#include "Framework/runDataProcessing.h"
17-
#include "Framework/ASoAHelpers.h"
18-
#include "Framework/RunningWorkflowInfo.h"
19-
#include "Framework/HistogramRegistry.h"
20-
21-
#include "Common/DataModel/EventSelection.h"
2212
#include "Common/Core/TrackSelection.h"
23-
#include "Common/DataModel/TrackSelectionTables.h"
2413
#include "Common/DataModel/Centrality.h"
25-
#include "Common/DataModel/PIDResponse.h"
14+
#include "Common/DataModel/EventSelection.h"
15+
#include "Common/DataModel/PIDResponseTOF.h"
16+
#include "Common/DataModel/PIDResponseTPC.h"
17+
#include "Common/DataModel/TrackSelectionTables.h"
18+
19+
#include "Framework/ASoAHelpers.h"
20+
#include "Framework/AnalysisTask.h"
21+
#include "Framework/HistogramRegistry.h"
22+
#include "Framework/RunningWorkflowInfo.h"
23+
#include "Framework/runDataProcessing.h"
24+
#include <CCDB/BasicCCDBManager.h>
2625

2726
#include "TList.h"
27+
#include "TMath.h"
2828
#include "TProfile.h"
2929
#include "TProfile2D.h"
3030
#include "TRandom3.h"
31-
#include "TMath.h"
31+
32+
#include <cmath>
33+
#include <vector>
3234

3335
namespace o2::aod
3436
{

‎PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@
1212
/// \brief This task is a QA task to accumulate basic event- and track-level plots.
1313
/// \author Igor Altsybeev, Igor.Altsybeev@cern.ch
1414

15-
#include <iostream>
16-
#include <string>
17-
#include <memory>
18-
#include <vector>
19-
#include <map>
20-
21-
#include "TF1.h"
22-
#include "TGraphErrors.h"
15+
#include "PWGLF/DataModel/LFStrangenessTables.h"
2316

24-
#include "Framework/runDataProcessing.h"
25-
#include "Framework/AnalysisTask.h"
17+
#include "Common/CCDB/EventSelectionParams.h"
2618
#include "Common/Core/TrackSelection.h"
2719
#include "Common/Core/TrackSelectionDefaults.h"
28-
#include "Common/DataModel/PIDResponse.h"
2920
#include "Common/DataModel/Centrality.h"
21+
#include "Common/DataModel/EventSelection.h"
22+
#include "Common/DataModel/FT0Corrected.h"
3023
#include "Common/DataModel/Multiplicity.h"
24+
#include "Common/DataModel/PIDResponseTOF.h"
25+
#include "Common/DataModel/PIDResponseTPC.h"
3126
#include "Common/DataModel/TrackSelectionTables.h"
32-
#include "Common/DataModel/EventSelection.h"
33-
#include "Common/CCDB/EventSelectionParams.h"
3427

3528
#include "CCDB/BasicCCDBManager.h"
36-
#include "DataFormatsParameters/GRPObject.h"
29+
#include "DataFormatsFT0/Digit.h"
3730
#include "DataFormatsParameters/GRPECSObject.h"
3831
#include "DataFormatsParameters/GRPMagField.h"
32+
#include "DataFormatsParameters/GRPObject.h"
33+
#include "Framework/AnalysisTask.h"
34+
#include "Framework/runDataProcessing.h"
3935

40-
#include "Common/DataModel/FT0Corrected.h"
41-
#include "DataFormatsFT0/Digit.h"
36+
#include "TF1.h"
37+
#include "TGraphErrors.h"
4238

43-
#include "PWGLF/DataModel/LFStrangenessTables.h"
39+
#include <iostream>
40+
#include <map>
41+
#include <memory>
42+
#include <string>
43+
#include <vector>
4444

4545
using namespace std;
4646
using namespace o2;
@@ -2293,8 +2293,8 @@ struct RobustFluctuationObservables {
22932293
}
22942294

22952295
} // end of v0 loop
2296-
} // end of if (flagIncludeQAHistK0S)
2297-
} // end of processRobustFluctuationObservables()
2296+
} // end of if (flagIncludeQAHistK0S)
2297+
} // end of processRobustFluctuationObservables()
22982298

22992299
// shortcut function to fill 2D histograms
23002300
void fillHistForThisCut(string cutName, int multNTracksPV, int multTrk, int nTracksGlobalAccepted, double multT0A, double multT0C, double multV0A, double /*t0cCentr*/, int bc)

‎PWGCF/EbyEFluctuations/Tasks/antiprotonCumulantsMc.cxx‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,50 @@
1313
/// \brief Task for analyzing efficiency of proton, and net-proton distributions in MC reconstructed and generated, and calculating net-proton cumulants
1414
/// \author Swati Saha
1515

16-
#include <CCDB/BasicCCDBManager.h>
17-
#include <cstdlib>
18-
#include <cmath>
19-
#include <array>
20-
#include <vector>
21-
#include <string>
22-
#include "Framework/AnalysisTask.h"
23-
#include "Framework/runDataProcessing.h"
24-
#include "Framework/ASoAHelpers.h"
25-
#include "Framework/RunningWorkflowInfo.h"
26-
#include "Framework/HistogramRegistry.h"
27-
#include "Framework/AnalysisDataModel.h"
28-
#include "Framework/StepTHn.h"
29-
#include "ReconstructionDataFormats/Track.h"
30-
#include "Common/DataModel/EventSelection.h"
3116
#include "Common/Core/TrackSelection.h"
32-
#include "Common/DataModel/TrackSelectionTables.h"
17+
#include "Common/Core/trackUtilities.h"
3318
#include "Common/DataModel/Centrality.h"
34-
#include "Common/DataModel/PIDResponse.h"
35-
#include "Common/DataModel/PIDResponseITS.h"
19+
#include "Common/DataModel/EventSelection.h"
3620
#include "Common/DataModel/Multiplicity.h"
37-
#include "Common/Core/trackUtilities.h"
21+
#include "Common/DataModel/PIDResponseITS.h"
22+
#include "Common/DataModel/PIDResponseTOF.h"
23+
#include "Common/DataModel/PIDResponseTPC.h"
24+
#include "Common/DataModel/TrackSelectionTables.h"
25+
3826
#include "CommonConstants/PhysicsConstants.h"
39-
#include "Framework/O2DatabasePDGPlugin.h"
40-
#include "DataFormatsParameters/GRPObject.h"
4127
#include "DataFormatsParameters/GRPMagField.h"
42-
#include <TList.h>
43-
#include <TProfile.h>
44-
#include <TProfile2D.h>
45-
#include <TRandom3.h>
46-
#include <TMath.h>
47-
#include <TH1F.h>
28+
#include "DataFormatsParameters/GRPObject.h"
29+
#include "Framework/ASoAHelpers.h"
30+
#include "Framework/AnalysisDataModel.h"
31+
#include "Framework/AnalysisTask.h"
32+
#include "Framework/HistogramRegistry.h"
33+
#include "Framework/O2DatabasePDGPlugin.h"
34+
#include "Framework/RunningWorkflowInfo.h"
35+
#include "Framework/StepTHn.h"
36+
#include "Framework/runDataProcessing.h"
37+
#include "ReconstructionDataFormats/Track.h"
38+
#include <CCDB/BasicCCDBManager.h>
39+
4840
#include <TDirectory.h>
41+
#include <TF1.h>
42+
#include <TFile.h>
43+
#include <TH1F.h>
44+
#include <TH2F.h>
4945
#include <THn.h>
46+
#include <TList.h>
5047
#include <TLorentzVector.h>
5148
#include <TMath.h>
5249
#include <TObjArray.h>
53-
#include <TFile.h>
54-
#include <TH2F.h>
55-
#include <TLorentzVector.h>
5650
#include <TPDGCode.h>
57-
#include <TF1.h>
51+
#include <TProfile.h>
52+
#include <TProfile2D.h>
53+
#include <TRandom3.h>
54+
55+
#include <array>
56+
#include <cmath>
57+
#include <cstdlib>
58+
#include <string>
59+
#include <vector>
5860

5961
using namespace o2;
6062
using namespace o2::framework;

‎PWGCF/EbyEFluctuations/Tasks/eventMeanPtId.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#include "Common/DataModel/EventSelection.h"
2525
#include "Common/DataModel/FT0Corrected.h"
2626
#include "Common/DataModel/Multiplicity.h"
27-
#include "Common/DataModel/PIDResponse.h"
27+
#include "Common/DataModel/PIDResponseTOF.h"
28+
#include "Common/DataModel/PIDResponseTPC.h"
2829
#include "Common/DataModel/TrackSelectionTables.h"
2930

3031
#include "CCDB/BasicCCDBManager.h"

‎PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
///
1515
/// \author Rahul Verma (rahul.verma@iitb.ac.in) :: Sadhana Dash (sadhana@phy.iitb.ac.in)
1616

17-
#include <algorithm>
18-
#include <vector>
19-
20-
#include "Framework/runDataProcessing.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/O2DatabasePDGPlugin.h"
17+
#include "PWGLF/DataModel/LFStrangenessTables.h"
18+
#include "PWGLF/DataModel/mcCentrality.h"
2319

24-
#include "Common/DataModel/TrackSelectionTables.h"
25-
#include "Common/DataModel/PIDResponse.h"
26-
#include "Common/DataModel/EventSelection.h"
2720
#include "Common/DataModel/Centrality.h"
21+
#include "Common/DataModel/EventSelection.h"
2822
#include "Common/DataModel/Multiplicity.h"
23+
#include "Common/DataModel/PIDResponseTOF.h"
24+
#include "Common/DataModel/PIDResponseTPC.h"
25+
#include "Common/DataModel/TrackSelectionTables.h"
2926

30-
#include "PWGLF/DataModel/LFStrangenessTables.h"
27+
#include "Framework/AnalysisTask.h"
28+
#include "Framework/O2DatabasePDGPlugin.h"
29+
#include "Framework/runDataProcessing.h"
3130

32-
#include "PWGLF/DataModel/mcCentrality.h"
31+
#include <algorithm>
32+
#include <vector>
3333

3434
using namespace o2;
3535
using namespace o2::framework;

0 commit comments

Comments
 (0)