Response: rearrangement of filling histos
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 2 May 2013 12:48:50 +0000 (12:48 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 2 May 2013 12:48:50 +0000 (12:48 +0000)
Spectrum2: change binning in phi for QA

PWGJE/AliAnalysisTaskJetResponseV2.cxx
PWGJE/AliAnalysisTaskJetResponseV2.h
PWGJE/AliAnalysisTaskJetSpectrum2.cxx

index e86d1aa..b7a016e 100644 (file)
@@ -324,9 +324,9 @@ void AliAnalysisTaskJetResponseV2::UserCreateOutputObjects()
     fhnJetsArea = NewTHnSparseF("fhnJetsArea", entries, opt);
   }
 
-  // cent : nInpTrks : jetPt(3x) : deltaPt : delta : jetArea(3x) : fraction(2x) : pT hard bin
+  // cent : nInpTrks : jetPt(3x) : deltaPt : delta : jetArea(3x) : fraction(2x) : deltaR(1x) : pT hard bin
   if(fbJets3Branches){
-    entries = 1<<0 | 1<<1 | 1<<6 | 1<<7 | 1<<27 | 1<<14 | 1<<28 | 1<<12 | 1<<13 | 1<<29 | 1<<19 | 1<<30 | 1<<26;
+    entries = 1<<0 | 1<<1 | 1<<6 | 1<<7 | 1<<27 | 1<<14 | 1<<28 | 1<<12 | 1<<13 | 1<<29 | 1<<19 | 1<<30 | 1<<17 | 1<<26;
     opt = 1<<6 | 1<<7 | 1<<27 | 1<<14 | 1<<28;
     fhnJets3Branches = NewTHnSparseF("fhnJets3Branches", entries, opt);
   }
@@ -802,12 +802,12 @@ void AliAnalysisTaskJetResponseV2::UserExec(Option_t *)
     }
 
     if(fbJets3Branches){
-      Double_t jetEntries3Branches[13] = {
+      Double_t jetEntries3Branches[14] = {
        (Double_t)centValue, (Double_t)nInputTracks, 
        (Double_t)jetPt[0], (Double_t)jetPt[1],
        (Double_t)jetArea[0], (Double_t)jetArea[1],
        (Double_t)deltaPt, (Double_t)fraction, (Double_t)pthardbin,
-       (Double_t)jetPt[2],(Double_t)delta,(Double_t)jetArea[2], (Double_t)fraction2
+       (Double_t)jetPt[2],(Double_t)delta,(Double_t)jetArea[2], (Double_t)fraction2, (Double_t)deltaR
       };                                
       fhnJets3Branches->Fill(jetEntries3Branches);
     }
index ca62483..fee03c6 100644 (file)
@@ -90,6 +90,7 @@ public:
    virtual void     SetFillJetsBeforeCut1(Bool_t b) { fbJetsBeforeCut1 = b; }
    virtual void     SetFillJetsBeforeCut2(Bool_t b) { fbJetsBeforeCut2 = b; }
    virtual void     SetKeepJets(Bool_t b = kTRUE) { fKeepJets = b; }
+   virtual void     SetMatchMaxDist(Double_t max) { fMatchMaxDist = max;}
 
 private:
    // ESD/AOD events
index 9dd55ca..b1c1430 100644 (file)
@@ -580,7 +580,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     
     // Bins:  Jet number: pTJet, cent, eta, phi, Area, trigger, acceptance, signed pT leading
     const Int_t nBinsSparse2 = 9;
-    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 60,   8,  18, 18, 100,fNTrigger,fNAcceptance+1,20};
+    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 60,   8,  6, 90, 100,fNTrigger,fNAcceptance+1,20};
     if(cJetBranch.Contains("RandomCone")){
       nBins2[5] = 1;
     }
@@ -1071,23 +1071,25 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
     if(ttphi<0)ttphi+=TMath::Pi()*2.;  
     Float_t ttpt=tt->Pt();
     Int_t phiBintt = GetPhiBin(ttphi-fRPAngle);
-     Double_t dphitrigjet=RelativePhi(ttphi,phiJet);
+    Double_t dphitrigjet=RelativePhi(ttphi,phiJet);
     if(fTRP==1){
-    if(TMath::Abs(dphitrigjet)<TMath::Pi()-0.6) continue; 
-    var1[1] = ptJet;
-    var1[4] = phiBintt;
-    var1[5] = jet->EffectiveAreaCharged();
-    var1[7] = ttpt;
-    var1[8] = CheckAcceptance(phiJet,etaJet);}
-
-     if(fTRP==0){
-    var1[1] = ptJet;
-    var1[4] = phiBin;
-    var1[5] = jet->EffectiveAreaCharged();
-    var1[7] = ptLead;
-    var1[8] = CheckAcceptance(phiJet,etaJet);}
+      if(TMath::Abs(dphitrigjet)<TMath::Pi()-0.6) continue; 
+      var1[1] = ptJet;
+      var1[4] = phiBintt;
+      var1[5] = jet->EffectiveAreaCharged();
+      var1[7] = ttpt;
+      var1[8] = CheckAcceptance(phiJet,etaJet);
+    }
     
-
+    if(fTRP==0){
+      var1[1] = ptJet;
+      var1[4] = phiBin;
+      var1[5] = jet->EffectiveAreaCharged();
+      var1[7] = ptLead;
+      var1[8] = CheckAcceptance(phiJet,etaJet);
+    }
+    
+    //jet number;p_{T,jet};cent;#eta;#phi;area;trigger;acceptance bin;signed pt leading
     var2[1] = ptJet;
     var2[3] = etaJet;
     var2[4] = phiJet;