break;
case kJpsiFamily:
case kPsiP:
+ case kChic1:
+ case kChic2:
case kJpsi:
if (sname == "Vogt" || sname == "Vogt PbPb") {
func=PtJpsiPbPb;
func=PtJpsiCDFscaledPP10;
} else if (sname == "CDF pp 8.8") {
func=PtJpsiCDFscaledPP9;
- } else if (sname == "CDF pp 7") {
+ } else if (sname == "CDF pp 7" || sname == "CDF pp 7 flat y") {
func=PtJpsiCDFscaledPP7;
} else if (sname == "CDF pp 3.94") {
func=PtJpsiCDFscaledPP4;
func=PtJpsiCDFscaledPbP9;
} else if (sname == "CDF PbPb 3.94") {
func=PtJpsiCDFscaledPbPb4;
- } else if (sname == "Flat") {
+ } else if (sname == "Flat" || sname == "CDF pp 7 flat pt") {
func=PtJpsiFlat;
} else {
func=PtJpsi;
case kChic0:
func=PtChic0;
break;
- case kChic1:
- func=PtChic1;
- break;
- case kChic2:
- func=PtChic2;
- break;
case kChic:
func=PtChic;
break;
break;
case kJpsiFamily:
case kPsiP:
+ case kChic1:
+ case kChic2:
case kJpsi:
if (sname == "Vogt" || sname == "Vogt PbPb") {
func=YJpsiPbPb;
func=YJpsiCDFscaledPP10;
} else if (sname == "CDF pp 8.8") {
func=YJpsiCDFscaledPP9;
- } else if (sname == "CDF pp 7") {
+ } else if (sname == "CDF pp 7" || sname == "CDF pp 7 flat pt") {
func=YJpsiCDFscaledPP7;
} else if (sname == "CDF pp 3.94") {
func=YJpsiCDFscaledPP4;
func=YJpsiCDFscaledPbP9;
} else if (sname == "CDF PbPb 3.94") {
func=YJpsiCDFscaledPbPb4;
- } else if (sname == "Flat") {
+ } else if (sname == "Flat" || sname == "CDF pp 7 flat y") {
func=YJpsiFlat;
} else {
func=YJpsi;
case kChic0:
func=YChic0;
break;
- case kChic1:
- func=YChic1;
- break;
- case kChic2:
- func=YChic2;
- break;
case kChic:
func=YChic;
break;