Skip to content

Commit 019777d

Browse files
bghanley1995bghanley1995
committed
Added charged particle histograms
1 parent 71a39dc commit 019777d

File tree

2 files changed

+54
-43
lines changed

2 files changed

+54
-43
lines changed

‎PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx‎

Lines changed: 52 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ TH1F* fhVertexZA = nullptr;
8181
TH1F* fhMultB = nullptr;
8282
TH1F* fhMultA = nullptr;
8383
TH1F* fhPB = nullptr;
84-
TH1F* fhPA[kIdBfNoOfSpecies] = {nullptr};
84+
TH1F* fhPA[kIdBfNoOfSpecies + 1] = {nullptr};
8585
TH1F* fhPtB = nullptr;
86-
TH1F* fhPtA[kIdBfNoOfSpecies] = {nullptr};
86+
TH1F* fhPtA[kIdBfNoOfSpecies + 1] = {nullptr};
8787
TH1F* fhPtPosB = nullptr;
88-
TH1F* fhPtPosA[kIdBfNoOfSpecies] = {nullptr};
88+
TH1F* fhPtPosA[kIdBfNoOfSpecies + 1] = {nullptr};
8989
TH1F* fhPtNegB = nullptr;
90-
TH1F* fhPtNegA[kIdBfNoOfSpecies] = {nullptr};
91-
TH2F* fhNPosNegA[kIdBfNoOfSpecies] = {nullptr};
92-
TH1F* fhDeltaNA[kIdBfNoOfSpecies] = {nullptr};
90+
TH1F* fhPtNegA[kIdBfNoOfSpecies + 1] = {nullptr};
91+
TH2F* fhNPosNegA[kIdBfNoOfSpecies + 1] = {nullptr};
92+
TH1F* fhDeltaNA[kIdBfNoOfSpecies + 1] = {nullptr};
9393

9494
TH2F* fhNSigmaTPC[kIdBfNoOfSpecies] = {nullptr};
9595
TH2F* fhNSigmaTOF[kIdBfNoOfSpecies] = {nullptr};
@@ -106,8 +106,8 @@ TH1F* fhPhiA = nullptr;
106106

107107
TH2F* fhdEdxB = nullptr;
108108
TH2F* fhdEdxIPTPCB = nullptr;
109-
TH2F* fhdEdxA[kIdBfNoOfSpecies + 1] = {nullptr};
110-
TH2F* fhdEdxIPTPCA[kIdBfNoOfSpecies + 1] = {nullptr};
109+
TH2F* fhdEdxA[kIdBfNoOfSpecies + 2] = {nullptr};
110+
TH2F* fhdEdxIPTPCA[kIdBfNoOfSpecies + 2] = {nullptr};
111111

112112
TH1F* fhMassB = nullptr;
113113
TH1F* fhMassA[kIdBfNoOfSpecies + 1] = {nullptr};
@@ -134,15 +134,15 @@ TH1F* fhTrueVertexZB = nullptr;
134134
TH1F* fhTrueVertexZA = nullptr;
135135
TH1F* fhTrueVertexZAA = nullptr;
136136
TH1F* fhTruePB = nullptr;
137-
TH1F* fhTruePA[kIdBfNoOfSpecies] = {nullptr};
137+
TH1F* fhTruePA[kIdBfNoOfSpecies + 1] = {nullptr};
138138
TH1F* fhTruePtB = nullptr;
139-
TH1F* fhTruePtA[kIdBfNoOfSpecies] = {nullptr};
139+
TH1F* fhTruePtA[kIdBfNoOfSpecies + 1] = {nullptr};
140140
TH1F* fhTruePtPosB = nullptr;
141-
TH1F* fhTruePtPosA[kIdBfNoOfSpecies] = {nullptr};
141+
TH1F* fhTruePtPosA[kIdBfNoOfSpecies + 1] = {nullptr};
142142
TH1F* fhTruePtNegB = nullptr;
143-
TH1F* fhTruePtNegA[kIdBfNoOfSpecies] = {nullptr};
144-
TH2F* fhTrueNPosNegA[kIdBfNoOfSpecies] = {nullptr};
145-
TH1F* fhTrueDeltaNA[kIdBfNoOfSpecies] = {nullptr};
143+
TH1F* fhTruePtNegA[kIdBfNoOfSpecies + 1] = {nullptr};
144+
TH2F* fhTrueNPosNegA[kIdBfNoOfSpecies + 1] = {nullptr};
145+
TH1F* fhTrueDeltaNA[kIdBfNoOfSpecies + 1] = {nullptr};
146146

147147
TH1F* fhTrueEtaB = nullptr;
148148
TH1F* fhTrueEtaA = nullptr;
@@ -772,7 +772,27 @@ struct IdentifiedBfFilterTracks {
772772
fhCompatibleCollisionsZVtxRms = new TH2F("fHistCompatibleCollisionsZVtxRms", "Compatible collisions #it{z}_{vtx} RMS;#sigma_{#it{z}_{vtx}};Multiplicity (%);counts", 100, -10.0, 10.0, 101, -0.5, 100.5);
773773
}
774774

775-
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
775+
for(int sp = 0; sp < kIdBfNoOfSpecies; ++sp){
776+
fhNSigmaTPC[sp] = new TH2F(TString::Format("fhNSigmaTPC_%s", speciesName[sp]).Data(),
777+
TString::Format("N Sigma from TPC vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
778+
48, -6, 6,
779+
ptbins, ptlow, ptup);
780+
fhNSigmaTOF[sp] = new TH2F(TString::Format("fhNSigmaTOF_%s", speciesName[sp]).Data(),
781+
TString::Format("N Sigma from TOF vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
782+
48, -6, 6,
783+
ptbins, ptlow, ptup);
784+
fhNSigmaCombo[sp] = new TH2F(TString::Format("fhNSigmaCombo_%s", speciesName[sp]).Data(),
785+
TString::Format("N Sigma from Combo vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
786+
48, -6, 6,
787+
ptbins, ptlow, ptup);
788+
fhNSigmaTPC_IdTrks[sp] = new TH2F(TString::Format("fhNSigmaTPC_IdTrks_%s", speciesName[sp]).Data(),
789+
TString::Format("N Sigma from TPC vs P for Identified %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
790+
48, -6, 6,
791+
ptbins, ptlow, ptup);
792+
}
793+
LOGF(info,"Making histos");
794+
795+
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
776796
fhPA[sp] = new TH1F(TString::Format("fHistPA_%s", speciesName[sp]).Data(),
777797
TString::Format("p distribution for reconstructed %s;p (GeV/c);dN/dp (c/GeV)", speciesTitle[sp]).Data(),
778798
ptbins, ptlow, ptup);
@@ -791,33 +811,17 @@ struct IdentifiedBfFilterTracks {
791811
fhDeltaNA[sp] = new TH1F(TString::Format("fhDeltaNA_%s", speciesName[sp]).Data(),
792812
TString::Format("N(%s^{#plus}) #minus N(%s^{#minus}) distribution for reconstructed;N(%s^{#plus}) #minus N(%s^{#minus})", speciesTitle[sp], speciesTitle[sp], speciesTitle[sp], speciesTitle[sp]).Data(),
793813
79, -39.5, 39.5);
794-
fhNSigmaTPC[sp] = new TH2F(TString::Format("fhNSigmaTPC_%s", speciesName[sp]).Data(),
795-
TString::Format("N Sigma from TPC vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
796-
48, -6, 6,
797-
ptbins, ptlow, ptup);
798-
fhNSigmaTOF[sp] = new TH2F(TString::Format("fhNSigmaTOF_%s", speciesName[sp]).Data(),
799-
TString::Format("N Sigma from TOF vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
800-
48, -6, 6,
801-
ptbins, ptlow, ptup);
802-
fhNSigmaCombo[sp] = new TH2F(TString::Format("fhNSigmaCombo_%s", speciesName[sp]).Data(),
803-
TString::Format("N Sigma from Combo vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
804-
48, -6, 6,
805-
ptbins, ptlow, ptup);
806-
fhNSigmaTPC_IdTrks[sp] = new TH2F(TString::Format("fhNSigmaTPC_IdTrks_%s", speciesName[sp]).Data(),
807-
TString::Format("N Sigma from TPC vs P for Identified %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
808-
48, -6, 6,
809-
ptbins, ptlow, ptup);
810814
fhdEdxA[sp] = new TH2F(TString::Format("fhdEdxA_%s", speciesName[sp]).Data(),
811815
TString::Format("dE/dx vs P reconstructed %s; P (GeV/c); dE/dx (a.u.)", speciesTitle[sp]).Data(),
812816
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
813817
fhdEdxIPTPCA[sp] = new TH2F(TString::Format("fhdEdxIPTPCA_%s", speciesName[sp]).Data(),
814818
TString::Format("dE/dx vs P_{IP} reconstructed %s; P (GeV/c); dE/dx (a.u.)", speciesTitle[sp]).Data(),
815819
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
816820
}
817-
fhdEdxA[kIdBfNoOfSpecies] = new TH2F(TString::Format("fhdEdxA_WrongSpecies").Data(),
821+
fhdEdxA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxA_WrongSpecies").Data(),
818822
TString::Format("dE/dx vs P reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
819823
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
820-
fhdEdxIPTPCA[kIdBfNoOfSpecies] = new TH2F(TString::Format("fhdEdxIPTPCA_WrongSpecies").Data(),
824+
fhdEdxIPTPCA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxIPTPCA_WrongSpecies").Data(),
821825
TString::Format("dE/dx vs P_{IP} reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
822826
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
823827
/* add the hstograms to the output list */
@@ -839,6 +843,7 @@ struct IdentifiedBfFilterTracks {
839843
fOutputList->Add(fhDCAzB);
840844
fOutputList->Add(fhDCAzA);
841845
fOutputList->Add(fhFineDCAzA);
846+
842847
if (checkAmbiguousTracks) {
843848
fOutputList->Add(fhAmbiguousTrackType);
844849
fOutputList->Add(fhAmbiguousTrackPt);
@@ -847,21 +852,27 @@ struct IdentifiedBfFilterTracks {
847852
}
848853

849854
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
855+
fOutputList->Add(fhNSigmaTPC[sp]);
856+
fOutputList->Add(fhNSigmaTOF[sp]);
857+
fOutputList->Add(fhNSigmaCombo[sp]);
858+
fOutputList->Add(fhNSigmaTPC_IdTrks[sp]);
859+
}
860+
861+
LOGF(info, "Adding Histos to list");
862+
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
850863
fOutputList->Add(fhPA[sp]);
851864
fOutputList->Add(fhPtA[sp]);
852865
fOutputList->Add(fhPtPosA[sp]);
853866
fOutputList->Add(fhPtNegA[sp]);
854867
fOutputList->Add(fhNPosNegA[sp]);
855868
fOutputList->Add(fhDeltaNA[sp]);
856-
fOutputList->Add(fhNSigmaTPC[sp]);
857-
fOutputList->Add(fhNSigmaTOF[sp]);
858-
fOutputList->Add(fhNSigmaCombo[sp]);
859-
fOutputList->Add(fhNSigmaTPC_IdTrks[sp]);
860869
fOutputList->Add(fhdEdxA[sp]);
861870
fOutputList->Add(fhdEdxIPTPCA[sp]);
862871
}
863-
fOutputList->Add(fhdEdxA[kIdBfNoOfSpecies]);
864-
fOutputList->Add(fhdEdxIPTPCA[kIdBfNoOfSpecies]);
872+
LOGF(info, "Adding Additional Histos to list");
873+
fOutputList->Add(fhdEdxA[kIdBfNoOfSpecies + 1]);
874+
fOutputList->Add(fhdEdxIPTPCA[kIdBfNoOfSpecies + 1]);
875+
LOGF(info, "Added additional histos to list ");
865876
}
866877

867878
if ((fDataType != kData) && (fDataType != kDataNoEvtSel)) {
@@ -884,7 +895,7 @@ struct IdentifiedBfFilterTracks {
884895
fhTrueDCAzB = new TH1F("TrueDCAzB", "DCA_{z} distribution for generated before;DCA_{z} (cm);counts", 1000, -4.0, 4.0);
885896
fhTrueDCAzA = new TH1F("TrueDCAzA", "DCA_{z} distribution for generated;DCA_{z} (cm);counts", 1000, -4.0, 4.0);
886897

887-
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
898+
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
888899
fhTruePA[sp] = new TH1F(TString::Format("fTrueHistPA_%s", speciesName[sp]).Data(),
889900
TString::Format("p distribution %s (truth);p (GeV/c);dN/dp (c/GeV)", speciesTitle[sp]).Data(),
890901
ptbins, ptlow, ptup);
@@ -922,7 +933,7 @@ struct IdentifiedBfFilterTracks {
922933
fOutputList->Add(fhTrueDCAzB);
923934
fOutputList->Add(fhTrueDCAzA);
924935

925-
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
936+
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
926937
fOutputList->Add(fhTruePA[sp]);
927938
fOutputList->Add(fhTruePtA[sp]);
928939
fOutputList->Add(fhTruePtPosA[sp]);

‎PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ enum SpeciesPairMatch {
8484
kIdBfProtonProton ///< Proton-Proton
8585
};
8686

87-
const char* speciesName[kIdBfNoOfSpecies] = {"e", "pi", "ka", "p"};
87+
const char* speciesName[kIdBfNoOfSpecies+1] = {"e", "pi", "ka", "p","ha"};
8888

89-
const char* speciesTitle[kIdBfNoOfSpecies] = {"e", "#pi", "K", "p"};
89+
const char* speciesTitle[kIdBfNoOfSpecies+1] = {"e", "#pi", "K", "p","ha"};
9090

9191
const int speciesChargeValue1[kIdBfNoOfSpecies] = {
9292
0, //< electron

0 commit comments

Comments
 (0)