const Int_t AliUEHistograms::fgkUEHists = 3;
-AliUEHistograms::AliUEHistograms(const char* name, const char* histograms) :
+AliUEHistograms::AliUEHistograms(const char* name, const char* histograms, const char* binning) :
TNamed(name, name),
fNumberDensitypT(0),
fSumpT(0),
fCorrelationLeading2Phi(0),
fCorrelationMultiplicity(0),
fYields(0),
+ fInvYield2(0),
fEventCount(0),
fEventCountDifferential(0),
fVertexContributors(0),
fCentralityCorrelation(0),
fITSClusterMap(0),
fControlConvResoncances(0),
- fEfficiencyCorrection(0),
- fCorrectTriggers(kFALSE),
+ fEfficiencyCorrectionTriggers(0),
+ fEfficiencyCorrectionAssociated(0),
fSelectCharge(0),
fTriggerSelectCharge(0),
+ fAssociatedSelectCharge(0),
fTriggerRestrictEta(-1),
fEtaOrdering(kFALSE),
fCutConversions(kFALSE),
fCutResonances(kFALSE),
+ fRejectResonanceDaughters(-1),
fOnlyOneEtaSide(0),
fWeightPerEvent(kFALSE),
+ fPtOrder(kTRUE),
+ fTwoTrackCutMinRadius(0.8),
fRunNumber(0),
fMergeCount(1)
{
TString histogramsStr(histograms);
+ TString defaultBinningStr;
+ defaultBinningStr = "eta: -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0\n"
+ "p_t_assoc: 0.5, 0.75, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 8.0\n"
+ "p_t_leading: 0.0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 14.5, 15.0, 15.5, 16.0, 16.5, 17.0, 17.5, 18.0, 18.5, 19.0, 19.5, 20.0, 20.5, 21.0, 21.5, 22.0, 22.5, 23.0, 23.5, 24.0, 24.5, 25.0, 25.5, 26.0, 26.5, 27.0, 27.5, 28.0, 28.5, 29.0, 29.5, 30.0, 30.5, 31.0, 31.5, 32.0, 32.5, 33.0, 33.5, 34.0, 34.5, 35.0, 35.5, 36.0, 36.5, 37.0, 37.5, 38.0, 38.5, 39.0, 39.5, 40.0, 40.5, 41.0, 41.5, 42.0, 42.5, 43.0, 43.5, 44.0, 44.5, 45.0, 45.5, 46.0, 46.5, 47.0, 47.5, 48.0, 48.5, 49.0, 49.5, 50.0\n"
+ "p_t_leading_course: 0.5, 1.0, 2.0, 3.0, 4.0, 6.0, 8.0\n"
+ "p_t_eff: 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.25, 1.5, 1.75, 2.0, 2.25, 2.5, 2.75, 3.0, 3.25, 3.5, 3.75, 4.0, 4.5, 5.0, 6.0, 7.0, 8.0\n"
+ "vertex_eff: -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10\n"
+ ;
+
+ if (histogramsStr.Contains("4") || histogramsStr.Contains("5") || histogramsStr.Contains("6")) // Dphi Corr
+ {
+ if (histogramsStr.Contains("C"))
+ defaultBinningStr += "multiplicity: 0, 20, 40, 60, 80, 100.1\n"; // course
+ else
+ defaultBinningStr += "multiplicity: 0, 1, 2, 3, 4, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100.1\n";
+
+ if (histogramsStr.Contains("5"))
+ defaultBinningStr += "vertex: -7, -5, -3, -1, 1, 3, 5, 7\n";
+ else
+ defaultBinningStr += "vertex: -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10\n";
+
+ if (histogramsStr.Contains("R"))
+ defaultBinningStr += "delta_phi: -1.570796, -1.483530, -1.396263, -1.308997, -1.221730, -1.134464, -1.047198, -0.959931, -0.872665, -0.785398, -0.698132, -0.610865, -0.523599, -0.436332, -0.349066, -0.261799, -0.174533, -0.087266, 0.0, 0.087266, 0.174533, 0.261799, 0.349066, 0.436332, 0.523599, 0.610865, 0.698132, 0.785398, 0.872665, 0.959931, 1.047198, 1.134464, 1.221730, 1.308997, 1.396263, 1.483530, 1.570796, 1.658063, 1.745329, 1.832596, 1.919862, 2.007129, 2.094395, 2.181662, 2.268928, 2.356194, 2.443461, 2.530727, 2.617994, 2.705260, 2.792527, 2.879793, 2.967060, 3.054326, 3.141593, 3.228859, 3.316126, 3.403392, 3.490659, 3.577925, 3.665191, 3.752458, 3.839724, 3.926991, 4.014257, 4.101524, 4.188790, 4.276057, 4.363323, 4.450590, 4.537856, 4.625123, 4.712389\n" // this binning starts at -pi/2 and is modulo 3
+ "delta_eta: -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6, -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0,2.1, 2.2, 2.3, 2.4\n"
+ ;
+ else // for TTR studies
+ defaultBinningStr += "delta_phi: -1.570796, -1.483530, -1.396263, -1.308997, -1.221730, -1.134464, -1.047198, -0.959931, -0.872665, -0.785398, -0.698132, -0.610865, -0.523599, -0.436332, -0.349066, -0.261799, -0.174533, -0.087266, -0.043633, -0.021817, 0.0, 0.021817, 0.043633, 0.087266, 0.174533, 0.261799, 0.349066, 0.436332, 0.523599, 0.610865, 0.698132, 0.785398, 0.872665, 0.959931, 1.047198, 1.134464, 1.221730, 1.308997, 1.396263, 1.483530, 1.570796, 1.658063, 1.745329, 1.832596, 1.919862, 2.007129, 2.094395, 2.181662, 2.268928, 2.356194, 2.443461, 2.530727, 2.617994, 2.705260, 2.792527, 2.879793, 2.967060, 3.054326, 3.141593, 3.228859, 3.316126, 3.403392, 3.490659, 3.577925, 3.665191, 3.752458, 3.839724, 3.926991, 4.014257, 4.101524, 4.188790, 4.276057, 4.363323, 4.450590, 4.537856, 4.625123, 4.712389\n"
+ "delta_eta: -2.0, -1.9, -1.8, -1.7, -1.6, -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, -0.05, -0.025, 0, 0.025, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0\n"
+ ;
+ }
+ else // UE
+ defaultBinningStr += "multiplicity: -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 200.0\n"
+ "delta_phi: -1.570796, -1.483530, -1.396263, -1.308997, -1.221730, -1.134464, -1.047198, -0.959931, -0.872665, -0.785398, -0.698132, -0.610865, -0.523599, -0.436332, -0.349066, -0.261799, -0.174533, -0.087266, 0.0, 0.087266, 0.174533, 0.261799, 0.349066, 0.436332, 0.523599, 0.610865, 0.698132, 0.785398, 0.872665, 0.959931, 1.047198, 1.134464, 1.221730, 1.308997, 1.396263, 1.483530, 1.570796, 1.658063, 1.745329, 1.832596, 1.919862, 2.007129, 2.094395, 2.181662, 2.268928, 2.356194, 2.443461, 2.530727, 2.617994, 2.705260, 2.792527, 2.879793, 2.967060, 3.054326, 3.141593, 3.228859, 3.316126, 3.403392, 3.490659, 3.577925, 3.665191, 3.752458, 3.839724, 3.926991, 4.014257, 4.101524, 4.188790, 4.276057, 4.363323, 4.450590, 4.537856, 4.625123, 4.712389\n"
+ "vertex: -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10\n"
+ ;
+
+ // combine customBinning with defaultBinningStr -> use customBinning where available and otherwise defaultBinningStr
+ TString binningStr = AliUEHist::CombineBinning(defaultBinningStr, TString(binning));
+
if (histogramsStr.Contains("1"))
- fNumberDensitypT = new AliUEHist("NumberDensitypT");
+ fNumberDensitypT = new AliUEHist("NumberDensitypT", binningStr);
if (histogramsStr.Contains("2"))
- fSumpT = new AliUEHist("SumpT");
+ fSumpT = new AliUEHist("SumpT", binningStr);
if (histogramsStr.Contains("3"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhi");
- else if (histogramsStr.Contains("4RC"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityCourse");
- else if (histogramsStr.Contains("4R"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentrality");
+ fNumberDensityPhi = new AliUEHist("NumberDensityPhi", binningStr);
else if (histogramsStr.Contains("4"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityTTR");
- else if (histogramsStr.Contains("5RC"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtxCourse");
- else if (histogramsStr.Contains("5R"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtx");
- else if (histogramsStr.Contains("5"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtxTTR");
- else if (histogramsStr.Contains("6RC"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtx10Course");
- else if (histogramsStr.Contains("6R"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtx10");
- else if (histogramsStr.Contains("6"))
- fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtx10TTR");
+ fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentrality", binningStr);
+ else if (histogramsStr.Contains("5") || histogramsStr.Contains("6"))
+ fNumberDensityPhi = new AliUEHist("NumberDensityPhiCentralityVtx", binningStr);
// do not add this hists to the directory
Bool_t oldStatus = TH1::AddDirectoryStatus();
fCorrelationLeading2Phi = new TH2F("fCorrelationLeading2Phi", ";#Delta #varphi;p_{T,lead} (MC)", 200, -TMath::Pi(), TMath::Pi(), 200, 0, 50);
fCorrelationMultiplicity = new TH2F("fCorrelationMultiplicity", ";MC tracks;Reco tracks", 100, -0.5, 99.5, 100, -0.5, 99.5);
fYields = new TH3F("fYields", ";centrality;pT;eta", 100, 0, 100, 40, 0, 20, 100, -1, 1);
+ fInvYield2 = new TH2F("fInvYield2", ";centrality;pT;1/pT dNch/dpT", 100, 0, 100, 80, 0, 20);
if (!histogramsStr.Contains("4") && !histogramsStr.Contains("5") && !histogramsStr.Contains("6"))
{
if (fNumberDensityPhi)
{
fCentralityDistribution = new TH1F("fCentralityDistribution", ";centrality;count", fNumberDensityPhi->GetEventHist()->GetNBins(1), fNumberDensityPhi->GetEventHist()->GetAxis(1, 0)->GetXbins()->GetArray());
- fCentralityCorrelation = new TH2F("fCentralityCorrelation", ";centrality;multiplicity", 101, 0, 101, 200, 0, 4000);
+ fCentralityCorrelation = new TH2F("fCentralityCorrelation", ";centrality;multiplicity", 404, 0, 101, 200, 0, 4000);
}
fITSClusterMap = new TH3F("fITSClusterMap", "; its cluster map; centrality; pT", 256, -0.5, 255.5, 20, 0, 100.001, 100, 0, 20);
fCorrelationLeading2Phi(0),
fCorrelationMultiplicity(0),
fYields(0),
+ fInvYield2(0),
fEventCount(0),
fEventCountDifferential(0),
fVertexContributors(0),
fCentralityCorrelation(0),
fITSClusterMap(0),
fControlConvResoncances(0),
- fEfficiencyCorrection(0),
- fCorrectTriggers(kFALSE),
+ fEfficiencyCorrectionTriggers(0),
+ fEfficiencyCorrectionAssociated(0),
fSelectCharge(0),
fTriggerSelectCharge(0),
+ fAssociatedSelectCharge(0),
fTriggerRestrictEta(-1),
fEtaOrdering(kFALSE),
fCutConversions(kFALSE),
fCutResonances(kFALSE),
+ fRejectResonanceDaughters(-1),
fOnlyOneEtaSide(0),
fWeightPerEvent(kFALSE),
+ fPtOrder(kTRUE),
+ fTwoTrackCutMinRadius(0.8),
fRunNumber(0),
fMergeCount(1)
{
fYields = 0;
}
+ if (fInvYield2)
+ {
+ delete fInvYield2;
+ fInvYield2 = 0;
+ }
+
if (fEventCount)
{
delete fEventCount;
fControlConvResoncances = 0;
}
- if (fEfficiencyCorrection)
+ if (fEfficiencyCorrectionTriggers)
{
- delete fEfficiencyCorrection;
- fEfficiencyCorrection = 0;
+ delete fEfficiencyCorrectionTriggers;
+ fEfficiencyCorrectionTriggers = 0;
+ }
+
+ if (fEfficiencyCorrectionAssociated)
+ {
+ delete fEfficiencyCorrectionAssociated;
+ fEfficiencyCorrectionAssociated = 0;
}
}
TObjArray* input = (mixed) ? mixed : particles;
TArrayF eta(input->GetEntriesFast());
for (Int_t i=0; i<input->GetEntriesFast(); i++)
- eta[i] = ((AliVParticle*) input->At(i))->Eta();
+ eta[i] = ((AliVParticle*) input->UncheckedAt(i))->Eta();
// if particles is not set, just fill event statistics
if (particles)
for (Int_t i=0; i<particles->GetEntriesFast(); i++)
{
- AliVParticle* triggerParticle = (AliVParticle*) particles->At(i);
+ AliVParticle* triggerParticle = (AliVParticle*) particles->UncheckedAt(i);
// some optimization
Float_t triggerEta = triggerParticle->Eta();
triggerWeighting->Fill(triggerParticle->Pt());
}
-// new TCanvas; triggerWeighting->Draw();
+ }
+
+ // identify K, Lambda candidates and flag those particles
+ // a TObject bit is used for this
+ const UInt_t kResonanceDaughterFlag = 1 << 14;
+ if (fRejectResonanceDaughters > 0)
+ {
+ Double_t resonanceMass = -1;
+ Double_t massDaughter1 = -1;
+ Double_t massDaughter2 = -1;
+ const Double_t interval = 0.02;
+
+ switch (fRejectResonanceDaughters)
+ {
+ case 1: resonanceMass = 1.2; massDaughter1 = 0.1396; massDaughter2 = 0.9383; break; // method test
+ case 2: resonanceMass = 0.4976; massDaughter1 = 0.1396; massDaughter2 = massDaughter1; break; // k0
+ case 3: resonanceMass = 1.115; massDaughter1 = 0.1396; massDaughter2 = 0.9383; break; // lambda
+ default: AliFatal(Form("Invalid setting %d", fRejectResonanceDaughters));
+ }
+
+ for (Int_t i=0; i<particles->GetEntriesFast(); i++)
+ particles->UncheckedAt(i)->ResetBit(kResonanceDaughterFlag);
+ if (mixed)
+ for (Int_t i=0; i<jMax; i++)
+ mixed->UncheckedAt(i)->ResetBit(kResonanceDaughterFlag);
+
+ for (Int_t i=0; i<particles->GetEntriesFast(); i++)
+ {
+ AliVParticle* triggerParticle = (AliVParticle*) particles->UncheckedAt(i);
+
+ for (Int_t j=0; j<jMax; j++)
+ {
+ if (!mixed && i == j)
+ continue;
+
+ AliVParticle* particle = 0;
+ if (!mixed)
+ particle = (AliVParticle*) particles->UncheckedAt(j);
+ else
+ particle = (AliVParticle*) mixed->UncheckedAt(j);
+
+ // check if both particles point to the same element (does not occur for mixed events, but if subsets are mixed within the same event)
+ if (mixed && triggerParticle->IsEqual(particle))
+ continue;
+
+ if (triggerParticle->Charge() * particle->Charge() > 0)
+ continue;
+
+ Float_t mass = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerParticle->Eta(), triggerParticle->Phi(), particle->Pt(), particle->Eta(), particle->Phi(), massDaughter1, massDaughter2);
+
+ if (TMath::Abs(mass - resonanceMass*resonanceMass) < interval*5)
+ {
+ mass = GetInvMassSquared(triggerParticle->Pt(), triggerParticle->Eta(), triggerParticle->Phi(), particle->Pt(), particle->Eta(), particle->Phi(), massDaughter1, massDaughter2);
+
+ if (mass > (resonanceMass-interval)*(resonanceMass-interval) && mass < (resonanceMass+interval)*(resonanceMass+interval))
+ {
+ triggerParticle->SetBit(kResonanceDaughterFlag);
+ particle->SetBit(kResonanceDaughterFlag);
+
+// Printf("Flagged %d %d %f", i, j, TMath::Sqrt(mass));
+ }
+ }
+ }
+ }
}
for (Int_t i=0; i<particles->GetEntriesFast(); i++)
{
- AliVParticle* triggerParticle = (AliVParticle*) particles->At(i);
+ AliVParticle* triggerParticle = (AliVParticle*) particles->UncheckedAt(i);
// some optimization
Float_t triggerEta = triggerParticle->Eta();
if (fTriggerSelectCharge != 0)
if (triggerParticle->Charge() * fTriggerSelectCharge < 0)
continue;
-
- if (!mixed)
- {
- // QA
- fCorrelationpT->Fill(centrality, triggerParticle->Pt());
- fCorrelationEta->Fill(centrality, triggerEta);
- fCorrelationPhi->Fill(centrality, triggerParticle->Phi());
- fYields->Fill(centrality, triggerParticle->Pt(), triggerEta);
-/* if (dynamic_cast<AliAODTrack*>(triggerParticle))
- fITSClusterMap->Fill(((AliAODTrack*) triggerParticle)->GetITSClusterMap(), centrality, triggerParticle->Pt());*/
- }
-
+
+ if (fRejectResonanceDaughters > 0)
+ if (triggerParticle->TestBit(kResonanceDaughterFlag))
+ {
+// Printf("Skipped i=%d", i);
+ continue;
+ }
+
for (Int_t j=0; j<jMax; j++)
{
if (!mixed && i == j)
AliVParticle* particle = 0;
if (!mixed)
- particle = (AliVParticle*) particles->At(j);
+ particle = (AliVParticle*) particles->UncheckedAt(j);
else
- particle = (AliVParticle*) mixed->At(j);
+ particle = (AliVParticle*) mixed->UncheckedAt(j);
- // check if both particles point to the same element (does not occur for mixed events, but if subsets are mixed within the same event for cross-checks)
- if (mixed && triggerParticle == particle)
+ // check if both particles point to the same element (does not occur for mixed events, but if subsets are mixed within the same event)
+ if (mixed && triggerParticle->IsEqual(particle))
continue;
- if (particle->Pt() > triggerParticle->Pt())
- continue;
-
+ if (fPtOrder)
+ if (particle->Pt() >= triggerParticle->Pt())
+ continue;
+
+ if (fAssociatedSelectCharge != 0)
+ if (particle->Charge() * fAssociatedSelectCharge < 0)
+ continue;
+
if (fSelectCharge > 0)
{
// skip like sign
continue;
}
- // conversions
+ if (fRejectResonanceDaughters > 0)
+ if (particle->TestBit(kResonanceDaughterFlag))
+ {
+// Printf("Skipped j=%d", j);
+ continue;
+ }
+
+ // conversions
if (fCutConversions && particle->Charge() * triggerParticle->Charge() < 0)
{
- Float_t mass = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.510e-3, 0.510e-3);
+ Float_t mass = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.510e-3, 0.510e-3);
- fControlConvResoncances->Fill(0.0, mass);
+ if (mass < 0.1)
+ {
+ mass = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.510e-3, 0.510e-3);
+
+ fControlConvResoncances->Fill(0.0, mass);
- if (mass < 0.04*0.04)
- continue;
+ if (mass < 0.04*0.04)
+ continue;
+ }
}
// K0s
if (fCutResonances && particle->Charge() * triggerParticle->Charge() < 0)
{
- Float_t mass = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.1396);
+ Float_t mass = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.1396);
const Float_t kK0smass = 0.4976;
- fControlConvResoncances->Fill(1, mass - kK0smass*kK0smass);
+ if (TMath::Abs(mass - kK0smass*kK0smass) < 0.1)
+ {
+ mass = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.1396);
+
+ fControlConvResoncances->Fill(1, mass - kK0smass*kK0smass);
- if (mass > (kK0smass-0.02)*(kK0smass-0.02) && mass < (kK0smass+0.02)*(kK0smass+0.02))
- continue;
+ if (mass > (kK0smass-0.02)*(kK0smass-0.02) && mass < (kK0smass+0.02)*(kK0smass+0.02))
+ continue;
+ }
}
// Lambda
if (fCutResonances && particle->Charge() * triggerParticle->Charge() < 0)
{
- Float_t mass1 = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.9383);
- Float_t mass2 = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.9383, 0.1396);
+ Float_t mass1 = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.9383);
+ Float_t mass2 = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.9383, 0.1396);
const Float_t kLambdaMass = 1.115;
- fControlConvResoncances->Fill(2, mass1 - kLambdaMass*kLambdaMass);
- fControlConvResoncances->Fill(2, mass2 - kLambdaMass*kLambdaMass);
+ if (TMath::Abs(mass1 - kLambdaMass*kLambdaMass) < 0.1)
+ {
+ mass1 = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.1396, 0.9383);
- if ((mass1 > (kLambdaMass-0.02)*(kLambdaMass-0.02) && mass1 < (kLambdaMass+0.02)*(kLambdaMass+0.02)) ||
- (mass2 > (kLambdaMass-0.02)*(kLambdaMass-0.02) && mass2 < (kLambdaMass+0.02)*(kLambdaMass+0.02)))
- continue;
+ fControlConvResoncances->Fill(2, mass1 - kLambdaMass*kLambdaMass);
+
+ if (mass1 > (kLambdaMass-0.02)*(kLambdaMass-0.02) && mass1 < (kLambdaMass+0.02)*(kLambdaMass+0.02))
+ continue;
+ }
+ if (TMath::Abs(mass2 - kLambdaMass*kLambdaMass) < 0.1)
+ {
+ mass2 = GetInvMassSquared(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.9383, 0.1396);
+
+ fControlConvResoncances->Fill(2, mass2 - kLambdaMass*kLambdaMass);
+
+ if (mass2 > (kLambdaMass-0.02)*(kLambdaMass-0.02) && mass2 < (kLambdaMass+0.02)*(kLambdaMass+0.02))
+ continue;
+ }
}
if (twoTrackEfficiencyCut)
if (TMath::Abs(deta) < twoTrackEfficiencyCutValue * 2.5 * 3)
{
// check first boundaries to see if is worth to loop and find the minimum
- Float_t dphistar1 = GetDPhiStar(phi1, pt1, charge1, phi2, pt2, charge2, 0.8, bSign);
+ Float_t dphistar1 = GetDPhiStar(phi1, pt1, charge1, phi2, pt2, charge2, fTwoTrackCutMinRadius, bSign);
Float_t dphistar2 = GetDPhiStar(phi1, pt1, charge1, phi2, pt2, charge2, 2.5, bSign);
const Float_t kLimit = twoTrackEfficiencyCutValue * 3;
Float_t dphistarmin = 1e5;
if (TMath::Abs(dphistar1) < kLimit || TMath::Abs(dphistar2) < kLimit || dphistar1 * dphistar2 < 0)
{
- for (Double_t rad=0.8; rad<2.51; rad+=0.01)
+ for (Double_t rad=fTwoTrackCutMinRadius; rad<2.51; rad+=0.01)
{
Float_t dphistar = GetDPhiStar(phi1, pt1, charge1, phi2, pt2, charge2, rad, bSign);
weight = particle->Pt();
Double_t useWeight = weight;
- if (fEfficiencyCorrection && applyEfficiency)
+ if (applyEfficiency)
{
- Int_t effVars[4];
-
- // associated particle
- effVars[0] = fEfficiencyCorrection->GetAxis(0)->FindBin(eta[j]);
- effVars[1] = fEfficiencyCorrection->GetAxis(1)->FindBin(vars[1]); //pt
- effVars[2] = fEfficiencyCorrection->GetAxis(2)->FindBin(vars[3]); //centrality
- effVars[3] = fEfficiencyCorrection->GetAxis(3)->FindBin(vars[5]); //zVtx
-
-// Printf("%d %d %d %d %f", effVars[0], effVars[1], effVars[2], effVars[3], fEfficiencyCorrection->GetBinContent(effVars));
-
- useWeight *= fEfficiencyCorrection->GetBinContent(effVars);
+ if (fEfficiencyCorrectionAssociated)
+ {
+ Int_t effVars[4];
+ // associated particle
+ effVars[0] = fEfficiencyCorrectionAssociated->GetAxis(0)->FindBin(eta[j]);
+ effVars[1] = fEfficiencyCorrectionAssociated->GetAxis(1)->FindBin(vars[1]); //pt
+ effVars[2] = fEfficiencyCorrectionAssociated->GetAxis(2)->FindBin(vars[3]); //centrality
+ effVars[3] = fEfficiencyCorrectionAssociated->GetAxis(3)->FindBin(vars[5]); //zVtx
+
+ // Printf("%d %d %d %d %f", effVars[0], effVars[1], effVars[2], effVars[3], fEfficiencyCorrectionAssociated->GetBinContent(effVars));
- // trigger particle
- if (fCorrectTriggers)
+ useWeight *= fEfficiencyCorrectionAssociated->GetBinContent(effVars);
+ }
+ if (fEfficiencyCorrectionTriggers)
{
- effVars[0] = fEfficiencyCorrection->GetAxis(0)->FindBin(triggerEta);
- effVars[1] = fEfficiencyCorrection->GetAxis(1)->FindBin(vars[2]); //pt
- useWeight *= fEfficiencyCorrection->GetBinContent(effVars);
+ Int_t effVars[4];
+
+ effVars[0] = fEfficiencyCorrectionTriggers->GetAxis(0)->FindBin(triggerEta);
+ effVars[1] = fEfficiencyCorrectionTriggers->GetAxis(1)->FindBin(vars[2]); //pt
+ effVars[2] = fEfficiencyCorrectionTriggers->GetAxis(2)->FindBin(vars[3]); //centrality
+ effVars[3] = fEfficiencyCorrectionTriggers->GetAxis(3)->FindBin(vars[5]); //zVtx
+ useWeight *= fEfficiencyCorrectionTriggers->GetBinContent(effVars);
}
}
-
+
if (fWeightPerEvent)
{
Int_t weightBin = triggerWeighting->GetXaxis()->FindBin(vars[2]);
}
// fill all in toward region and do not use the other regions
- fNumberDensityPhi->GetTrackHist(AliUEHist::kToward)->Fill(vars, step, useWeight);
-
+ fNumberDensityPhi->GetTrackHist(AliUEHist::kToward)->Fill(vars, step, useWeight);
+
// Printf("%.2f %.2f --> %.2f", triggerEta, eta[j], vars[0]);
}
vars[2] = zVtx;
Double_t useWeight = 1;
- if (fEfficiencyCorrection && applyEfficiency && fCorrectTriggers)
+ if (fEfficiencyCorrectionTriggers && applyEfficiency)
{
Int_t effVars[4];
// trigger particle
- effVars[0] = fEfficiencyCorrection->GetAxis(0)->FindBin(triggerEta);
- effVars[1] = fEfficiencyCorrection->GetAxis(1)->FindBin(vars[0]); //pt
- effVars[2] = fEfficiencyCorrection->GetAxis(2)->FindBin(vars[1]); //centrality
- effVars[3] = fEfficiencyCorrection->GetAxis(3)->FindBin(vars[2]); //zVtx
- useWeight *= fEfficiencyCorrection->GetBinContent(effVars);
+ effVars[0] = fEfficiencyCorrectionTriggers->GetAxis(0)->FindBin(triggerEta);
+ effVars[1] = fEfficiencyCorrectionTriggers->GetAxis(1)->FindBin(vars[0]); //pt
+ effVars[2] = fEfficiencyCorrectionTriggers->GetAxis(2)->FindBin(vars[1]); //centrality
+ effVars[3] = fEfficiencyCorrectionTriggers->GetAxis(3)->FindBin(vars[2]); //zVtx
+ useWeight *= fEfficiencyCorrectionTriggers->GetBinContent(effVars);
+ }
+
+ if (TMath::Abs(triggerEta) < 0.8 && triggerParticle->Pt() > 0)
+ fInvYield2->Fill(centrality, triggerParticle->Pt(), useWeight / triggerParticle->Pt());
+
+ if (fWeightPerEvent)
+ {
+ // leads effectively to a filling of one entry per filled trigger particle pT bin
+ Int_t weightBin = triggerWeighting->GetXaxis()->FindBin(vars[0]);
+// Printf("Using weight %f", triggerWeighting->GetBinContent(weightBin));
+ useWeight /= triggerWeighting->GetBinContent(weightBin);
}
fNumberDensityPhi->GetEventHist()->Fill(vars, step, useWeight);
+
+ // QA
+ fCorrelationpT->Fill(centrality, triggerParticle->Pt());
+ fCorrelationEta->Fill(centrality, triggerEta);
+ fCorrelationPhi->Fill(centrality, triggerParticle->Phi());
+ fYields->Fill(centrality, triggerParticle->Pt(), triggerEta);
+
+/* if (dynamic_cast<AliAODTrack*>(triggerParticle))
+ fITSClusterMap->Fill(((AliAODTrack*) triggerParticle)->GetITSClusterMap(), centrality, triggerParticle->Pt());*/
}
}
}
//____________________________________________________________________
-void AliUEHistograms::FillTrackingEfficiency(TObjArray* mc, TObjArray* recoPrim, TObjArray* recoAll, TObjArray* fake, Int_t particleType, Double_t centrality, Double_t zVtx)
+void AliUEHistograms::FillTrackingEfficiency(TObjArray* mc, TObjArray* recoPrim, TObjArray* recoAll, TObjArray* recoPrimPID, TObjArray* recoAllPID, TObjArray* fake, Int_t particleType, Double_t centrality, Double_t zVtx)
{
// fills the tracking efficiency objects
//
// mc: all primary MC particles
// recoPrim: reconstructed primaries (again MC particles)
// recoAll: reconstructed (again MC particles)
+ // recoPrim: reconstructed primaries with checks on PID (again MC particles)
+ // recoAll: reconstructed with checks on PID (again MC particles)
// particleType is: 0 for pion, 1 for kaon, 2 for proton, 3 for others
- for (Int_t step=0; step<4; step++)
+ for (Int_t step=0; step<6; step++)
{
TObjArray* list = mc;
if (step == 1)
else if (step == 2)
list = recoAll;
else if (step == 3)
+ list = recoPrimPID;
+ else if (step == 4)
+ list = recoAllPID;
+ else if (step == 5)
list = fake;
if (!list)
for (Int_t i=0; i<list->GetEntriesFast(); i++)
{
- AliVParticle* particle = (AliVParticle*) list->At(i);
+ AliVParticle* particle = (AliVParticle*) list->UncheckedAt(i);
Double_t vars[5];
vars[0] = particle->Eta();
vars[1] = particle->Pt();
GetUEHist(i)->SetPtRange(ptMin, ptMax);
}
+//____________________________________________________________________
+void AliUEHistograms::SetPartSpecies(Int_t species)
+{
+ // sets PartSpecie for all contained AliUEHist classes
+
+ for (Int_t i=0; i<fgkUEHists; i++)
+ if (GetUEHist(i))
+ GetUEHist(i)->SetPartSpecies(species);
+}
+
//____________________________________________________________________
void AliUEHistograms::SetZVtxRange(Float_t min, Float_t max)
{
GetUEHist(i)->SetTrackEtaCut(value);
}
+//____________________________________________________________________
+void AliUEHistograms::SetWeightPerEvent(Bool_t flag)
+{
+ // sets fWeightPerEvent for all contained AliUEHist classes
+
+ fWeightPerEvent = flag;
+
+ for (Int_t i=0; i<fgkUEHists; i++)
+ if (GetUEHist(i))
+ GetUEHist(i)->SetWeightPerEvent(fWeightPerEvent);
+}
+
//____________________________________________________________________
void AliUEHistograms::Correct(AliUEHistograms* corrections)
{
if (fYields)
target.fYields = dynamic_cast<TH3F*> (fYields->Clone());
+ if (fInvYield2)
+ target.fInvYield2 = dynamic_cast<TH2F*> (fInvYield2->Clone());
+
if (fEventCount)
target.fEventCount = dynamic_cast<TH2F*> (fEventCount->Clone());
if (fTwoTrackDistancePt[i])
target.fTwoTrackDistancePt[i] = dynamic_cast<TH3F*> (fTwoTrackDistancePt[i]->Clone());
- if (fEfficiencyCorrection)
- target.fEfficiencyCorrection = dynamic_cast<THnF*> (fEfficiencyCorrection->Clone());
+ if (fEfficiencyCorrectionTriggers)
+ target.fEfficiencyCorrectionTriggers = dynamic_cast<THnF*> (fEfficiencyCorrectionTriggers->Clone());
+
+ if (fEfficiencyCorrectionAssociated)
+ target.fEfficiencyCorrectionAssociated = dynamic_cast<THnF*> (fEfficiencyCorrectionAssociated->Clone());
target.fSelectCharge = fSelectCharge;
target.fTriggerSelectCharge = fTriggerSelectCharge;
+ target.fAssociatedSelectCharge = fAssociatedSelectCharge;
target.fTriggerRestrictEta = fTriggerRestrictEta;
target.fEtaOrdering = fEtaOrdering;
target.fCutConversions = fCutConversions;
target.fWeightPerEvent = fWeightPerEvent;
target.fRunNumber = fRunNumber;
target.fMergeCount = fMergeCount;
- target.fCorrectTriggers = fCorrectTriggers;
+ target.fWeightPerEvent = fWeightPerEvent;
+ target.fPtOrder = fPtOrder;
+ target.fTwoTrackCutMinRadius = fTwoTrackCutMinRadius;
}
//____________________________________________________________________
TObject* obj;
// collections of objects
- const Int_t kMaxLists = 19;
+ const Int_t kMaxLists = 20;
TList* lists[kMaxLists];
for (Int_t i=0; i<kMaxLists; i++)
lists[16]->Add(entry->fCentralityCorrelation);
if (entry->fYields)
lists[17]->Add(entry->fYields);
+ if (entry->fInvYield2)
+ lists[18]->Add(entry->fInvYield2);
if (entry->fControlConvResoncances)
- lists[18]->Add(entry->fControlConvResoncances);
+ lists[19]->Add(entry->fControlConvResoncances);
fMergeCount += entry->fMergeCount;
fCentralityCorrelation->Merge(lists[16]);
if (fYields && lists[17]->GetEntries() > 0)
fYields->Merge(lists[17]);
- if (fControlConvResoncances && lists[18]->GetEntries() > 0)
- fControlConvResoncances->Merge(lists[18]);
+ if (fInvYield2 && lists[18]->GetEntries() > 0)
+ fInvYield2->Merge(lists[18]);
+ if (fControlConvResoncances && lists[19]->GetEntries() > 0)
+ fControlConvResoncances->Merge(lists[19]);
for (Int_t i=0; i<kMaxLists; i++)
delete lists[i];
list.Add(fCorrelationLeading2Phi);
list.Add(fCorrelationMultiplicity);
list.Add(fYields);
+ list.Add(fInvYield2);
list.Add(fEventCount);
list.Add(fEventCountDifferential);
list.Add(fVertexContributors);
if (GetUEHist(i))
GetUEHist(i)->Reset();
}
-
-Float_t AliUEHistograms::GetInvMassSquared(Float_t pt1, Float_t eta1, Float_t phi1, Float_t pt2, Float_t eta2, Float_t phi2, Float_t m0_1, Float_t m0_2)
-{
- // calculate inv mass squared
- // same can be achieved, but with more computing time with
- /*TLorentzVector photon, p1, p2;
- p1.SetPtEtaPhiM(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), 0.510e-3);
- p2.SetPtEtaPhiM(particle->Pt(), eta[j], particle->Phi(), 0.510e-3);
- photon = p1+p2;
- photon.M()*/
-
- Float_t tantheta1 = 1e10;
-
- if (eta1 < -1e-10 || eta1 > 1e-10)
- tantheta1 = 2 * TMath::Exp(-eta1) / ( 1 - TMath::Exp(-2*eta1));
-
- Float_t tantheta2 = 1e10;
- if (eta2 < -1e-10 || eta2 > 1e-10)
- tantheta2 = 2 * TMath::Exp(-eta2) / ( 1 - TMath::Exp(-2*eta2));
-
- Float_t e1squ = m0_1 * m0_1 + pt1 * pt1 * (1.0 + 1.0 / tantheta1 / tantheta1);
- Float_t e2squ = m0_2 * m0_2 + pt2 * pt2 * (1.0 + 1.0 / tantheta2 / tantheta2);
-
- Float_t mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2 * ( TMath::Sqrt(e1squ * e2squ) - ( pt1 * pt2 * ( TMath::Cos(phi1 - phi2) + 1.0 / tantheta1 / tantheta2 ) ) );
-
- return mass2;
-}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff