message: add pp compatibility for JES shift estimate, and filter CPV cells in AllCells sum
diff: @@ -802,7 +802,7 @@ void AliAnalysisTaskEmcalVsPhos::FillClusterHistograms()
  continue;
  }
  } else {
  - continue;
  + continue; // avoid CPV clusters
  }
  // Fill cluster spectra by SM, and fill cell histograms
  @@ -1098,6 +1098,10 @@ void AliAnalysisTaskEmcalVsPhos::FillCellHistograms()
  absId = phosCaloCells->GetCellNumber(i);
  ecell = phosCaloCells->GetCellAmplitude(absId);
  + if (absId < 0) {
  + continue; // skip CPV cells
  + }
  +
  // Fill cell histo
  histname = TString::Format("Cells/hCellEnergyAll");
  fHistManager.FillTH3(histname, ecell, fCent, kPHOS);
  @@ -1188,17 +1192,26 @@ void AliAnalysisTaskEmcalVsPhos::FillClustersInJetsHistograms()
  Int_t nClusters = jet->GetNumberOfClusters();
  AliVCluster* clus;
  for (Int_t iClus = 0; iClus < nClusters; iClus++) {
  +
  clus = jet->Cluster(iClus);
  +
  + if (fForceBeamType != AliAnalysisTaskEmcal::kpp) {
  Double_t x[5] = {fCent, clus->E(), GetJetPt(jet, rho), jet->Eta(), jet->Phi_0_2pi()};
  fHistManager.FillTHnSparse(histname, x);
  }
  + else {
  + Double_t x[4] = {clus->E(), GetJetPt(jet, rho), jet->Eta(), jet->Phi_0_2pi()};
  + fHistManager.FillTHnSparse(histname, x);
  + }
  +
  + }
  // Loop through clusters, and plot estimated shift in JES due to cluster bump
  // Only do for 0-10% centrality, and for EMCal/DCal
  Double_t eclus;
  Double_t shift;
  Double_t shiftSum = 0;
  - if (fCent < 10.) {
  + if (fCent < 10. || fForceBeamType == AliAnalysisTaskEmcal::kpp) {
  if (GetJetType(jet) > -0.5 && GetJetType(jet) < 1.5) {
  for (Int_t iClus = 0; iClus < nClusters; iClus++) {
  clus = jet->Cluster(iClus);
  @@ -1462,7 +1475,7 @@ Double_t AliAnalysisTaskEmcalVsPhos::GetConeCellEnergy(Double_t etaRef, Double_t
  }
  /**
  - * Compute the cell energy within a SM, excluding cells from rejected clusters.
  + * Compute the cell energy within a SM, excluding cells from rejected clusters if requested.
  * Optionally, can instead return the number of cells.
  */
  Double_t AliAnalysisTaskEmcalVsPhos::GetSMCellEnergy(Int_t sm, Int_t clusType, Bool_t returnNcells)
  