fCorrelationLeading2Phi(0),
fCorrelationMultiplicity(0),
fYields(0),
+ fInvYield2(0),
fEventCount(0),
fEventCountDifferential(0),
fVertexContributors(0),
fEtaOrdering(kFALSE),
fCutConversions(kFALSE),
fCutResonances(kFALSE),
+ fRejectResonanceDaughters(-1),
fOnlyOneEtaSide(0),
fWeightPerEvent(kFALSE),
fPtOrder(kTRUE),
+ fTwoTrackCutMinRadius(0.8),
fRunNumber(0),
fMergeCount(1)
{
;
// combine customBinning with defaultBinningStr -> use customBinning where available and otherwise defaultBinningStr
- TString customBinning(binning);
- TString binningStr;
-
- TObjArray* lines = defaultBinningStr.Tokenize("\n");
- for (Int_t i=0; i<lines->GetEntriesFast(); i++)
- {
- TString line(lines->At(i)->GetName());
- TString tag = line(0, line.Index(":")+1);
- if (!customBinning.BeginsWith(tag) && !customBinning.Contains(TString("\n") + tag))
- binningStr += line + "\n";
- else
- Printf("Using custom binning for %s", tag.Data());
- }
- delete lines;
- binningStr += customBinning;
+ TString binningStr = AliUEHist::CombineBinning(defaultBinningStr, TString(binning));
if (histogramsStr.Contains("1"))
fNumberDensitypT = new AliUEHist("NumberDensitypT", binningStr);
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),
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;
for (Int_t i=0; i<input->GetEntriesFast(); i++)
eta[i] = ((AliVParticle*) input->UncheckedAt(i))->Eta();
- // list needed to prevent double counting
- // contains 1 if list element in list <particles> is also contained in <mixed>
- TArrayC* existsInMixed = 0;
- if (mixed && !fPtOrder)
- {
- existsInMixed = new TArrayC(particles->GetEntriesFast());
- for (Int_t i=0; i<particles->GetEntriesFast(); i++)
- {
- if (mixed->Contains(particles->UncheckedAt(i)))
- (*existsInMixed)[i] = 1;
- else
- (*existsInMixed)[i] = 0;
- }
- }
-
// if particles is not set, just fill event statistics
if (particles)
{
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++)
if (triggerParticle->Charge() * fTriggerSelectCharge < 0)
continue;
+ 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)
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 == particle)
+ if (mixed && triggerParticle->IsEqual(particle))
continue;
if (fPtOrder)
- {
if (particle->Pt() >= triggerParticle->Pt())
continue;
- }
- else
- {
- // if we do not use the pt ordering, we have to prevent double counting in a different way
- // if the trigger particle is also part of the associated particle list, the pT ordering condition is applied anyway
- if (!mixed || (*existsInMixed)[i] != 0)
- if (particle->Pt() >= triggerParticle->Pt())
- continue;
- }
if (fAssociatedSelectCharge != 0)
if (particle->Charge() * fAssociatedSelectCharge < 0)
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 = GetInvMassSquaredCheap(triggerParticle->Pt(), triggerEta, triggerParticle->Phi(), particle->Pt(), eta[j], particle->Phi(), 0.510e-3, 0.510e-3);
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);
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
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());*/
}
}
}
- delete existsInMixed;
-
fCentralityDistribution->Fill(centrality);
fCentralityCorrelation->Fill(centrality, particles->GetEntriesFast());
FillEvent(centrality, step);
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());
target.fMergeCount = fMergeCount;
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);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff