From Salvatore:

plot over-subtraction histos only for matched clusters; allow "exact" correction also when QA histos are not requested.

diff --git a/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx b/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
index 69aa600fddb66aea6af38758db8811a56f5f8cce..8202cd0e86368081c0319b40e410affcd34ef464 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
@@ -818,6 +818,33 @@ Double_t AliHadCorrTask::ApplyHadCorrAllTracks(AliEmcalParticle *emccluster, Dou
   if ((energyclus - Esub) < clusEexcl) 
     Esub = (energyclus - clusEexcl);
 
+  // embedding
+  Double_t EsubMC = 0;
+  Double_t EsubBkg = 0;
+  Double_t EclusMC = 0;
+  Double_t EclusBkg = 0;
+  Double_t EclusCorr = 0;
+  Double_t EclusMCcorr = 0;
+  Double_t EclusBkgcorr = 0;
+  Double_t overSub = 0;
+  if (fIsEmbedded) {
+    EsubMC = hadCorr * totalTrkP * trkPMCfrac;
+    EsubBkg = hadCorr * totalTrkP - EsubMC;
+    EclusMC = energyclus * cluster->GetMCEnergyFraction();
+    EclusBkg = energyclus - EclusMC;
+ 
+    if (energyclus > Esub)
+      EclusCorr = energyclus - Esub;
+
+    if (EclusMC > EsubMC)
+      EclusMCcorr = EclusMC - EsubMC;
+  
+    if (EclusBkg > EsubBkg)
+      EclusBkgcorr = EclusBkg - EsubBkg;
+  
+    overSub = EclusMCcorr + EclusBkgcorr - EclusCorr;
+  }
+
   // plot some histograms if switched on
   if (fCreateHisto) {
     fHistNMatchCent->Fill(fCent, Nmatches);
@@ -849,45 +876,27 @@ Double_t AliHadCorrTask::ApplyHadCorrAllTracks(AliEmcalParticle *emccluster, Dou
        fHistEsubPchRat[centbinchm]->Fill(totalTrkP, Esub / totalTrkP);
        fHistEsubPch[centbinchm]->Fill(totalTrkP, Esub);
       }
-    }
 
-    if (fIsEmbedded) {
-      Double_t EsubMC = hadCorr * totalTrkP * trkPMCfrac;
-      Double_t EsubBkg = hadCorr * totalTrkP - EsubMC;
-      Double_t EclusMC = energyclus * cluster->GetMCEnergyFraction();
-      Double_t EclusBkg = energyclus - EclusMC;
-      
-      Double_t EclusCorr = 0;
-      if (energyclus > Esub)
-       EclusCorr = energyclus - Esub;
-      
-      Double_t EclusMCcorr = 0;
-      if (EclusMC > EsubMC)
-       EclusMCcorr = EclusMC - EsubMC;
-
-      Double_t EclusBkgcorr = 0;
-      if (EclusBkg > EsubBkg)
-       EclusBkgcorr = EclusBkg - EsubBkg;
-
-      Double_t overSub = EclusMCcorr + EclusBkgcorr - EclusCorr;
-      fHistOversub[fCentBin]->Fill(energyclus, overSub);
-      fHistOversubOverClusE[fCentBin]->Fill(energyclus, overSub / energyclus);
-
-      if (trkPMCfrac < 0.05)
-       fHistNonEmbTrackMatchesOversub[fCentBin]->Fill(energyclus, overSub);
-      else if (trkPMCfrac > 0.95)
-       fHistEmbTrackMatchesOversub[fCentBin]->Fill(energyclus, overSub);
-
-      if (fDoExact) {
-       Esub -= overSub;
-       if (EclusBkgcorr + EclusMCcorr > 0) {
-         Double_t newfrac = EclusMCcorr / (EclusBkgcorr + EclusMCcorr);
-         cluster->SetMCEnergyFraction(newfrac);
-       }
+      if (fIsEmbedded) {
+       fHistOversub[fCentBin]->Fill(energyclus, overSub);
+       fHistOversubOverClusE[fCentBin]->Fill(energyclus, overSub / energyclus);
+
+       if (trkPMCfrac < 0.05)
+         fHistNonEmbTrackMatchesOversub[fCentBin]->Fill(energyclus, overSub);
+       else if (trkPMCfrac > 0.95)
+         fHistEmbTrackMatchesOversub[fCentBin]->Fill(energyclus, overSub);
       }
     }
   }
 
+  if (fIsEmbedded && fDoExact) {
+    Esub -= overSub;
+    if (EclusBkgcorr + EclusMCcorr > 0) {
+      Double_t newfrac = EclusMCcorr / (EclusBkgcorr + EclusMCcorr);
+      cluster->SetMCEnergyFraction(newfrac);
+    }
+  }
+
   // apply the correction
   energyclus -= Esub;