bug fixes

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
index 58c91bf7bed8c20959d9042802ec9048fc7864e9..c377470735f849f2b66ac96aeff0090b6601aa07 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
@@ -206,18 +206,18 @@ AliAnalysisTaskEmcalJetMass::AliAnalysisTaskEmcalJetMass(const char *name) :
     fh2MassVsNConstJet1Tagged[i]            = 0;
     fh2MassVsNConstJet1TaggedMatch[i]       = 0;
 
-    fh3PtJet1VsRatVsLeadPtAllSel[i]        = 0;
-    fh3PtJet1VsRatVsLeadPtTagged[i]        = 0;
-    fh3PtJet1VsRatVsLeadPtTaggedMatch[i]   = 0;
-    fpPtVsRatJet1All[i]                    = 0;
-    fpPtVsRatJet1Tagged[i]                 = 0;
-    fpPtVsRatJet1TaggedMatch[i]            = 0;
-    fh2RatVsAreaJet1All[i]                 = 0;
-    fh2RatVsAreaJet1Tagged[i]              = 0;
-    fh2RatVsAreaJet1TaggedMatch[i]         = 0;
-    fh2RatVsNConstJet1All[i]               = 0;
-    fh2RatVsNConstJet1Tagged[i]            = 0;
-    fh2RatVsNConstJet1TaggedMatch[i]       = 0;
+    fh3PtJet1VsRatVsLeadPtAllSel[i]         = 0;
+    fh3PtJet1VsRatVsLeadPtTagged[i]         = 0;
+    fh3PtJet1VsRatVsLeadPtTaggedMatch[i]    = 0;
+    fpPtVsRatJet1All[i]                     = 0;
+    fpPtVsRatJet1Tagged[i]                  = 0;
+    fpPtVsRatJet1TaggedMatch[i]             = 0;
+    fh2RatVsAreaJet1All[i]                  = 0;
+    fh2RatVsAreaJet1Tagged[i]               = 0;
+    fh2RatVsAreaJet1TaggedMatch[i]          = 0;
+    fh2RatVsNConstJet1All[i]                = 0;
+    fh2RatVsNConstJet1Tagged[i]             = 0;
+    fh2RatVsNConstJet1TaggedMatch[i]        = 0;
 
     fh2EtMassOverEtRSq[i]                   = 0;
   }

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
index 648bf33e028bf06155f48898e87a70bba0f8e4a4..849009d8f9aa2838c3cee44cba075e7727e84588 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
@@ -364,8 +364,10 @@ Bool_t AliAnalysisTaskJetShapeConst::FillHistograms()
        if(jetL) drToLJ = jet1->DeltaR(jetL);
        fh3MSubPtRawDRMatch[fCentBin]->Fill(var,ptjet1,drToLJ);
        if(jet2) {
-         Double_t var2 = -999.;
-         if(jet2->Pt()>0. || jet2->Pt()<0.) var2 = jet2->M()/jet2->Pt();
+         Double_t var2 = jet2->M();
+         if(fJetMassVarType==kRatMPt) {
+           if(jet2->Pt()>0. || jet2->Pt()<0.) var2 = jet2->M()/jet2->Pt();
+         }
          fh3MSubPtTrueDR[fCentBin]->Fill(var,jet2->Pt(),drToLJ);
          fh3MTruePtTrueDR[fCentBin]->Fill(var2,jet2->Pt(),drToLJ);
          fh3PtTrueDeltaMDR[fCentBin]->Fill(jet2->Pt(),var-var2,drToLJ);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
index 9fec0a8668e2983f5ae61484657894be4a0d0144..bc2d48ced5a4fa0c574c48e8d2f8c0a93dd0cf25 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
@@ -451,8 +451,10 @@ Bool_t AliAnalysisTaskJetShapeDeriv::FillHistograms()
        if(jetL) drToLJ = jet1->DeltaR(jetL);
        fh3MSubPtRawDRMatch[fCentBin]->Fill(var,ptjet1,drToLJ);
        if(jet2) {
-         Double_t var2 = -999.;
-         if(jet2->Pt()>0. || jet2->Pt()<0.) var2 = jet2->M()/jet2->Pt();
+         Double_t var2 = jet2->M();
+         if(fJetMassVarType==kRatMPt) {
+           if(jet2->Pt()>0. || jet2->Pt()<0.) var2 = jet2->M()/jet2->Pt();
+         }
          fh3MSubPtTrueDR[fCentBin]->Fill(var,jet2->Pt(),drToLJ);
          fh3MTruePtTrueDR[fCentBin]->Fill(var2,jet2->Pt(),drToLJ);
          fh3PtTrueDeltaMDR[fCentBin]->Fill(jet2->Pt(),var-var2,drToLJ);