bug fixes
authormverweij <marta.verweij@cern.ch>
Wed, 1 Oct 2014 12:53:25 +0000 (14:53 +0200)
committermverweij <marta.verweij@cern.ch>
Wed, 1 Oct 2014 13:15:14 +0000 (15:15 +0200)
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx

index 58c91bf..c377470 100644 (file)
@@ -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;
   }
index 648bf33..849009d 100644 (file)
@@ -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);
index 9fec0a8..bc2d48c 100644 (file)
@@ -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);