Skip to content

Commit 79ec813

Browse files
mdaniel-14mdaniel-14
committed
alibuild fixes and adding switches for efficiency corrections
1 parent 26292b4 commit 79ec813

1 file changed

Lines changed: 31 additions & 52 deletions

File tree

‎PWGCF/MultiparticleCorrelations/Tasks/multiparticleCorrelationsDm.cxx‎

Lines changed: 31 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -748,91 +748,70 @@ struct MultiparticleCorrelationsDm { // this name is used in lower-case format t
748748
const bool bookSim = doprocessRecSim || doprocessSim;
749749
for (int ba = 0; ba < EBeforeAfter_N; ba++) {
750750

751-
// par
752751
if (bookRec) {
752+
// par
753753
pc.fParticleHistograms[EPt][ERec][ba] = new TH1F(Form("fHistPt[ERec][%s]", baNames[ba]), Form("pt distribution for reconstructed particles (%s cuts)", baNames[ba]), nBins, min, max);
754754
pc.fParticleHistograms[EPt][ERec][ba]->GetXaxis()->SetTitle("p_{T}");
755755
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPt][ERec][ba]);
756-
}
757-
if (bookSim) {
758-
pc.fParticleHistograms[EPt][ESim][ba] = new TH1F(Form("fHistPt[ESim][%s]", baNames[ba]), Form("pt distribution for simulated particles (%s cuts)", baNames[ba]), nBins, min, max);
759-
pc.fParticleHistograms[EPt][ESim][ba]->GetXaxis()->SetTitle("p_{T}");
760-
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPt][ESim][ba]);
761-
}
762756

763-
if (bookRec) {
764757
pc.fParticleHistograms[EPhi][ERec][ba] = new TH1F(Form("fHistPhi[ERec][%s]", baNames[ba]), Form("Azimuthal-angle distribution for reconstructed particles (%s cuts)", baNames[ba]), nPhiBins, phiMin, phiMax);
765758
pc.fParticleHistograms[EPhi][ERec][ba]->GetXaxis()->SetTitle("#varphi (rad)");
766759
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPhi][ERec][ba]);
767-
}
768-
if (bookSim) {
769-
pc.fParticleHistograms[EPhi][ESim][ba] = new TH1F(Form("fHistPhi[ESim][%s]", baNames[ba]), Form("Azimuthal-angle distribution for simulated particles (%s cuts)", baNames[ba]), nPhiBins, phiMin, phiMax);
770-
pc.fParticleHistograms[EPhi][ESim][ba]->GetXaxis()->SetTitle("#varphi (rad)");
771-
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPhi][ESim][ba]);
772-
}
773-
774-
// ev
775-
if (bookRec) {
760+
// ev
776761
ec.fEventHistograms[EMultiplicity][ERec][ba] = new TH1F(Form("fHistMultiplicity[ERec][%s]", baNames[ba]), Form("Multiplicity for reconstructed particles (%s cuts)", baNames[ba]), nMultBins, multMin, multMax);
777762
ec.fEventHistograms[EMultiplicity][ERec][ba]->GetXaxis()->SetTitle("total number of available particles");
778763
ec.fEventHistogramsList->Add(ec.fEventHistograms[EMultiplicity][ERec][ba]);
779-
}
780-
if (bookSim) {
781-
ec.fEventHistograms[EMultiplicity][ESim][ba] = new TH1F(Form("fHistMultiplicity[ESim][%s]", baNames[ba]), Form("Multiplicity for simulated particles (%s cuts)", baNames[ba]), nMultBins, multMin, multMax);
782-
ec.fEventHistograms[EMultiplicity][ESim][ba]->GetXaxis()->SetTitle("total number of available particles");
783-
ec.fEventHistogramsList->Add(ec.fEventHistograms[EMultiplicity][ESim][ba]);
784-
}
785764

786-
// reference multiplicity, only reconstructed
787-
if (bookRec) {
765+
// reference multiplicity (only reconstructed)
788766
ec.fEventHistograms[EReferenceMultiplicity][ERec][ba] = new TH1F(Form("fHistReferenceMultiplicity[ERec][%s]", baNames[ba]), Form("Reference multiplicity, reconstructed (%s cuts)", baNames[ba]), nRefMultBins, refMultMin, refMultMax);
789767
ec.fEventHistograms[EReferenceMultiplicity][ERec][ba]->GetXaxis()->SetTitle("reference multiplicity");
790768
ec.fEventHistogramsList->Add(ec.fEventHistograms[EReferenceMultiplicity][ERec][ba]);
791-
}
792769

793-
if (bookRec) {
794770
ec.fEventHistograms[ECentrality][ERec][ba] = new TH1F(Form("fHistCentrality[ERec][%s]", baNames[ba]), Form("Centrality for reconstructed particles (%s cuts)", baNames[ba]), nCentBins, centMin, centMax);
795771
ec.fEventHistograms[ECentrality][ERec][ba]->GetXaxis()->SetTitle("centrality (%)");
796772
ec.fEventHistogramsList->Add(ec.fEventHistograms[ECentrality][ERec][ba]);
773+
774+
ec.fEventHistograms[EVertexX][ERec][ba] = new TH1F(Form("fHistVertexX[ERec][%s]", baNames[ba]), Form("Vertex X for reconstructed particles (%s cuts)", baNames[ba]), nvxBins, vxMin, vxMax);
775+
ec.fEventHistograms[EVertexX][ERec][ba]->GetXaxis()->SetTitle("vertex X");
776+
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexX][ERec][ba]);
777+
778+
ec.fEventHistograms[EVertexY][ERec][ba] = new TH1F(Form("fHistVertexY[ERec][%s]", baNames[ba]), Form("Vertex Y for reconstructed particles (%s cuts)", baNames[ba]), nvyBins, vyMin, vyMax);
779+
ec.fEventHistograms[EVertexY][ERec][ba]->GetXaxis()->SetTitle("vertex Y");
780+
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexY][ERec][ba]);
781+
782+
ec.fEventHistograms[EVertexZ][ERec][ba] = new TH1F(Form("fHistVertexZ[ERec][%s]", baNames[ba]), Form("Vertex Z for reconstructed particles (%s cuts)", baNames[ba]), nvzBins, vzMin, vzMax);
783+
ec.fEventHistograms[EVertexZ][ERec][ba]->GetXaxis()->SetTitle("vertex Z");
784+
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexZ][ERec][ba]);
797785
}
798-
// sim from impact parameter
799786
if (bookSim) {
787+
pc.fParticleHistograms[EPt][ESim][ba] = new TH1F(Form("fHistPt[ESim][%s]", baNames[ba]), Form("pt distribution for simulated particles (%s cuts)", baNames[ba]), nBins, min, max);
788+
pc.fParticleHistograms[EPt][ESim][ba]->GetXaxis()->SetTitle("p_{T}");
789+
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPt][ESim][ba]);
790+
791+
pc.fParticleHistograms[EPhi][ESim][ba] = new TH1F(Form("fHistPhi[ESim][%s]", baNames[ba]), Form("Azimuthal-angle distribution for simulated particles (%s cuts)", baNames[ba]), nPhiBins, phiMin, phiMax);
792+
pc.fParticleHistograms[EPhi][ESim][ba]->GetXaxis()->SetTitle("#varphi (rad)");
793+
pc.fParticleHistogramsList->Add(pc.fParticleHistograms[EPhi][ESim][ba]);
794+
// ev
795+
ec.fEventHistograms[EMultiplicity][ESim][ba] = new TH1F(Form("fHistMultiplicity[ESim][%s]", baNames[ba]), Form("Multiplicity for simulated particles (%s cuts)", baNames[ba]), nMultBins, multMin, multMax);
796+
ec.fEventHistograms[EMultiplicity][ESim][ba]->GetXaxis()->SetTitle("total number of available particles");
797+
ec.fEventHistogramsList->Add(ec.fEventHistograms[EMultiplicity][ESim][ba]);
798+
// sim from impact parameter
800799
ec.fEventHistograms[ECentrality][ESim][ba] = new TH1F(Form("fHistCentrality[ESim][%s]", baNames[ba]), Form("Centrality for simulated particles, from impact parameter (%s cuts)", baNames[ba]), nCentBins, centMin, centMax);
801800
ec.fEventHistograms[ECentrality][ESim][ba]->GetXaxis()->SetTitle("centrality (%)");
802801
ec.fEventHistogramsList->Add(ec.fEventHistograms[ECentrality][ESim][ba]);
803-
}
804-
// impact parameter, only simulated
805-
if (bookSim) {
802+
// impact parameter, only simulated
806803
ec.fEventHistograms[EImpactParameter][ESim][ba] = new TH1F(Form("fHistImpactParameter[ESim][%s]", baNames[ba]), Form("Impact parameter, simulated (%s cuts)", baNames[ba]), nBBins, bMin, bMax);
807804
ec.fEventHistograms[EImpactParameter][ESim][ba]->GetXaxis()->SetTitle("b (fm)");
808805
ec.fEventHistogramsList->Add(ec.fEventHistograms[EImpactParameter][ESim][ba]);
809-
}
810-
if (bookRec) {
811-
ec.fEventHistograms[EVertexX][ERec][ba] = new TH1F(Form("fHistVertexX[ERec][%s]", baNames[ba]), Form("Vertex X for reconstructed particles (%s cuts)", baNames[ba]), nvxBins, vxMin, vxMax);
812-
ec.fEventHistograms[EVertexX][ERec][ba]->GetXaxis()->SetTitle("vertex X");
813-
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexX][ERec][ba]);
814-
}
815-
if (bookSim) {
806+
816807
ec.fEventHistograms[EVertexX][ESim][ba] = new TH1F(Form("fHistVertexX[ESim][%s]", baNames[ba]), Form("Vertex X for simulated particles (%s cuts)", baNames[ba]), nvxBins, vxMin, vxMax);
817808
ec.fEventHistograms[EVertexX][ESim][ba]->GetXaxis()->SetTitle("vertex X");
818809
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexX][ESim][ba]);
819-
}
820-
if (bookRec) {
821-
ec.fEventHistograms[EVertexY][ERec][ba] = new TH1F(Form("fHistVertexY[ERec][%s]", baNames[ba]), Form("Vertex Y for reconstructed particles (%s cuts)", baNames[ba]), nvyBins, vyMin, vyMax);
822-
ec.fEventHistograms[EVertexY][ERec][ba]->GetXaxis()->SetTitle("vertex Y");
823-
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexY][ERec][ba]);
824-
}
825-
if (bookSim) {
810+
826811
ec.fEventHistograms[EVertexY][ESim][ba] = new TH1F(Form("fHistVertexY[ESim][%s]", baNames[ba]), Form("Vertex Y for simulated particles (%s cuts)", baNames[ba]), nvyBins, vyMin, vyMax);
827812
ec.fEventHistograms[EVertexY][ESim][ba]->GetXaxis()->SetTitle("vertex Y");
828813
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexY][ESim][ba]);
829-
}
830-
if (bookRec) {
831-
ec.fEventHistograms[EVertexZ][ERec][ba] = new TH1F(Form("fHistVertexZ[ERec][%s]", baNames[ba]), Form("Vertex Z for reconstructed particles (%s cuts)", baNames[ba]), nvzBins, vzMin, vzMax);
832-
ec.fEventHistograms[EVertexZ][ERec][ba]->GetXaxis()->SetTitle("vertex Z");
833-
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexZ][ERec][ba]);
834-
}
835-
if (bookSim) {
814+
836815
ec.fEventHistograms[EVertexZ][ESim][ba] = new TH1F(Form("fHistVertexZ[ESim][%s]", baNames[ba]), Form("Vertex Z for simulated particles (%s cuts)", baNames[ba]), nvzBins, vzMin, vzMax);
837816
ec.fEventHistograms[EVertexZ][ESim][ba]->GetXaxis()->SetTitle("vertex Z");
838817
ec.fEventHistogramsList->Add(ec.fEventHistograms[EVertexZ][ESim][ba]);

0 commit comments

Comments
 (0)