fHist->Fill("DataCuts","dndyPt",v.Rapidity(),jpsi.GetPt());
//Additional TRD cuts
- if ( (trackN->GetStatus()&AliESDtrack::kTRDrefit!=0) &&trackN->GetTRDntrackletsPID()>4 ){
- if ( (trackP->GetStatus()&AliESDtrack::kTRDrefit!=0) &&trackP->GetTRDntrackletsPID()>4 ){
+ if ( ((trackN->GetStatus()&AliESDtrack::kTRDrefit)!=0) && trackN->GetTRDntrackletsPID()>4 ){
+ if ( ((trackP->GetStatus()&AliESDtrack::kTRDrefit)!=0) && trackP->GetTRDntrackletsPID()>4 ){
if (motherN){
fHist->Fill("DataTRDCuts","JpsiMCPt",motherN->Pt());
fHist->Fill("DataTRDCuts","e+Pt",pP->Pt());
TLorentzVector v;
//Fill MC info
- for (Int_t ipart=0; ipart<pStack->GetNprimary(); ++ipart){
- TParticle *part=pStack->Particle(pStack->GetPrimary(ipart));
+ for (Int_t ipart=0; ipart<pStack->GetNtrack(); ++ipart){
+ TParticle *part=pStack->Particle(ipart);
// printf("Particle %d\n",part->GetPdgCode());
if (part->GetPdgCode()!=fIdMCMother || part->GetNDaughters()!=2) continue;
TParticle *d1=pStack->Particle(part->GetFirstDaughter());
UInt_t selectedMask=(1<<fEventFilter.GetCuts()->GetEntries())-1;
//apply event cuts
- if (ev1&&fEventFilter.IsSelected(ev1)!=selectedMask ||
- ev2&&fEventFilter.IsSelected(ev2)!=selectedMask) return;
+ if ((ev1&&fEventFilter.IsSelected(ev1)!=selectedMask) ||
+ (ev2&&fEventFilter.IsSelected(ev2)!=selectedMask)) return;
//fill track arrays for the first event
if (ev1) FillTrackArrays(ev1);
for (Int_t ipart=0; ipart<dieMC->GetNMCTracks();++ipart){
//TODO: MC truth cut properly!!!
AliVParticle *mcPart=dieMC->GetMCTrackFromMCEvent(ipart);
- if (!AliDielectronMC::Instance()->IsMCMotherToEE(mcPart, fPdgMother)) continue;
+ if (!dieMC->IsMCMotherToEE(mcPart, fPdgMother)) continue;
fCfManagerPair->FillMC(mcPart);
}
}
//Steps for each of the cuts
if (fStepsForEachCut){
for (Int_t iCut=0; iCut<fNCuts;++iCut) {
- TString cutName=filter.GetCuts()->At(iCut)->GetName(); //TODO: User GetTitle???
+ cutName=filter.GetCuts()->At(iCut)->GetName(); //TODO: User GetTitle???
fCfContainer->SetStepTitle(step++, cutName.Data()); //Step for the cut
cutName+=" (MC truth)";
fCfContainer->SetStepTitle(step++, cutName.Data()); //Step for the cut with MC truth
//Steps for increasing cut match
if (fStepsForCutsIncreasing&&fNCuts>2){
- TString cutName=filter.GetCuts()->At(0)->GetName(); //TODO: User GetTitle???
+ cutName=filter.GetCuts()->At(0)->GetName(); //TODO: User GetTitle???
for (Int_t iCut=1; iCut<fNCuts-1;++iCut) {
cutName+="&";
cutName+=filter.GetCuts()->At(iCut)->GetName();
//Steps of user defined cut combinations
for (UInt_t iComb=0; iComb<fNStepMasks; ++iComb){
- TString cutName;
+ cutName="";
UInt_t mask=fStepMasks[iComb];
for (Int_t iCut=0; iCut<fNCuts;++iCut) {
if (mask&(1<<iCut)){
// Draw histograms
//
- TString drawOpt(option);
- drawOpt.ToLower();
+ TString drawStr(option);
+ drawStr.ToLower();
//options
// Bool_t same=drawOpt.Contains("same"); //FIXME not yet implemented