undo some changes (M. Zimmermann)

diff --git a/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.cxx b/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.cxx
index 1f2546fa5213985e661439e8fd9bd6cdf06afa0e..e3786fc7f119fee7263c57ec1fbf74cd88253dab 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.cxx
@@ -72,8 +72,8 @@ AliAnalysisTaskJetHBOM::~AliAnalysisTaskJetHBOM(){
   if(fTCARandomConesOut)fTCARandomConesOut->Delete();
   delete fTCARandomConesOut;
   
-  //if(fTCARandomConesOutRan)fTCARandomConesOutRan->Delete();
-  //delete fTCARandomConesOutRan;
+  if(fTCARandomConesOutRan)fTCARandomConesOutRan->Delete();
+  delete fTCARandomConesOutRan;
 
 }
 
@@ -131,7 +131,7 @@ AliAnalysisTaskJetHBOM::AliAnalysisTaskJetHBOM():
   fGhostEtamax(1.5),
   background(0),
   fTCARandomConesOut(0x0),
-  //fTCARandomConesOutRan(0x0),
+  fTCARandomConesOutRan(0x0),
   fRandom(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
@@ -144,7 +144,7 @@ AliAnalysisTaskJetHBOM::AliAnalysisTaskJetHBOM():
   fh1DeltapT(0x0),
   fh1Rho(0x0),
   fh1PtRandCone(0x0),
-  //fh1Area(0x0),
+  fh1Area(0x0),
   fh1efficiencyPt(0x0),
   fh2efficiencyPhi(0x0),
   fh1ZPhySel(0x0), 
@@ -208,7 +208,7 @@ AliAnalysisTaskJetHBOM::AliAnalysisTaskJetHBOM(const char* name):
   fGhostEtamax(1.5),
   background(0),
   fTCARandomConesOut(0x0),
-  //fTCARandomConesOutRan(0x0),
+  fTCARandomConesOutRan(0x0),
   fRandom(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
@@ -221,7 +221,7 @@ AliAnalysisTaskJetHBOM::AliAnalysisTaskJetHBOM(const char* name):
   fh1DeltapT(0x0),
   fh1Rho(0x0),
   fh1PtRandCone(0x0),
-  //fh1Area(0x0),
+  fh1Area(0x0),
   fh1efficiencyPt(0x0),
   fh2efficiencyPhi(0x0),
   fh1ZPhySel(0x0), 
@@ -277,7 +277,6 @@ void AliAnalysisTaskJetHBOM::UserCreateOutputObjects()
        fTCARandomConesOut->SetName(cName.Data());
        AddAODBranch("TClonesArray",&fTCARandomConesOut,fNonStdFile.Data());
       }
-      /*
       // create the branch with the random for the random cones on the random event
       cName = Form("%sRandomCone_random",fNonStdBranch.Data());
       if(!AODEvent()->FindListObject(cName.Data())){
@@ -285,7 +284,7 @@ void AliAnalysisTaskJetHBOM::UserCreateOutputObjects()
        fTCARandomConesOutRan->SetName(cName.Data());
        AddAODBranch("TClonesArray",&fTCARandomConesOutRan,fNonStdFile.Data());
       }
-      */
+      
       if(fNonStdFile.Length()!=0){
        // 
        // case that we have an AOD extension we need to fetch the jets from the extended output
@@ -368,7 +367,7 @@ void AliAnalysisTaskJetHBOM::UserCreateOutputObjects()
   fh1DeltapT = new TH1F("fh1DeltapT","DeltapT",100,-50,50);
   fh1Rho = new TH1F("fh1Rho","Rho",100,0,200);
   fh1PtRandCone = new TH1F("fh1PtRandCone","pt",100,0,200);
-  //fh1Area = new TH1F("fh1Area","area",100,0,1);
+  fh1Area = new TH1F("fh1Area","area",100,0,1);
 
   const Int_t saveLevel = 3; // large save level more histos
   if(saveLevel>0){
@@ -383,7 +382,7 @@ void AliAnalysisTaskJetHBOM::UserCreateOutputObjects()
     fHistList->Add(fh1DeltapT);
     fHistList->Add(fh1Rho);
     fHistList->Add(fh1PtRandCone);
-    //fHistList->Add(fh1Area);
+    fHistList->Add(fh1Area);
   }
 
   // =========== Switch on Sumw2 for all histos ===========
@@ -417,7 +416,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
   // handle and reset the output jet branch 
 
   if(fTCARandomConesOut)fTCARandomConesOut->Delete();
-  //if(fTCARandomConesOutRan)fTCARandomConesOutRan->Delete();
+  if(fTCARandomConesOutRan)fTCARandomConesOutRan->Delete();
 
   //
   // Execute analysis for current event
@@ -629,7 +628,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
       // create a random jet within the acceptance
       Double_t etaMax = fTrackEtaWindow - fRparam;//0.9 - 0.4
       Int_t nCone = 0;
-      //      Int_t nConeRan = 0;
+      Int_t nConeRan = 0;
       Double_t pTC = 1; // small number
       Double_t etaC = etaMax*2.*(fRandom->Rndm()-0.5); // +- etamax
       Double_t phiC = fRandom->Rndm()*2.*TMath::Pi(); // 0 - 2pi
@@ -648,7 +647,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
       
       tmpRecC.SetBgEnergy(0,0); // this is use as temporary storage of the summed p_T below
       if(fTCARandomConesOut)new ((*fTCARandomConesOut)[nCone++]) AliAODJet(tmpRecC);
-      //if(fTCARandomConesOutRan)new ((*fTCARandomConesOutRan)[nConeRan++]) AliAODJet(tmpRecC);
+      if(fTCARandomConesOutRan)new ((*fTCARandomConesOutRan)[nConeRan++]) AliAODJet(tmpRecC);
   
       // loop over the reconstructed particles and add up the pT in the random cones
       // maybe better to loop over randomized particles not in the real jets...
@@ -664,7 +663,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
            jC->SetBgEnergy(jC->ChargedBgEnergy()+vp->Pt(),0);
          }
        }// add up energy in cone
-       /*      
+       
        // the randomized input changes eta and phi, but keeps the p_T
        if(fTCARandomConesOutRan){
          Double_t pTR = vp->Pt();
@@ -685,7 +684,6 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
            jC->SetBgEnergy(jC->ChargedBgEnergy()+vTmpRanR.Pt(),0);
          }
        }
-       */
       }// loop over recparticles
     }  //fTCARandomConesOut
     Float_t jetArea = fRparam*fRparam*TMath::Pi();
@@ -708,7 +706,6 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
        rC->SetEffArea(jetArea,0);
       }
     }
-    /*
     if(fTCARandomConesOutRan){
       AliAODJet* rC = (AliAODJet*)fTCARandomConesOutRan->At(0);
       // same with random
@@ -728,7 +725,6 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
        rC->SetEffArea(jetArea,0);
       }
     }//find the random jets
-    */
   }//inclusive Jets > 0
 
  //Calculate delta pT
@@ -741,7 +737,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
    fh1DeltapT->Fill(ptSub);// delta pT
    fh1Rho->Fill(background);// background rho
    fh1PtRandCone->Fill(randCone->Pt());// pT of random cone
-   //fh1Area->Fill(randCone->EffectiveAreaCharged()); // area of random cone; should always be pi*0.4^2 = 0.5
+   fh1Area->Fill(randCone->EffectiveAreaCharged()); // area of random cone; should always be pi*0.4^2 = 0.5
  }else{
    if(fDebug)Printf("%s:%d No random Cone found",(char*)__FILE__,__LINE__);
  }
@@ -749,7 +745,7 @@ void AliAnalysisTaskJetHBOM::UserExec(Option_t */*option*/)
 
  if (fDebug > 2){
    if(fTCARandomConesOut)Printf("%s:%d RC %d",(char*)__FILE__,__LINE__,fTCARandomConesOut->GetEntriesFast());
-   //if(fTCARandomConesOutRan)Printf("%s:%d RC Ran %d",(char*)__FILE__,__LINE__,fTCARandomConesOutRan->GetEntriesFast());
+   if(fTCARandomConesOutRan)Printf("%s:%d RC Ran %d",(char*)__FILE__,__LINE__,fTCARandomConesOutRan->GetEntriesFast());
  }
  PostData(1, fHistList);
 }

diff --git a/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.h b/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.h
index b8b94d342f5852b6a241f738fbc85839c69f1c90..a8805dc918a6f9b45d3a673f15a6afa68ce4044c 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.h
+++ b/PWGJE/UserTasks/AliAnalysisTaskJetHBOM.h
@@ -198,7 +198,7 @@ class AliAnalysisTaskJetHBOM : public AliAnalysisTaskSE
     Double_t background; //background rho in the event
 
     TClonesArray  *fTCARandomConesOut;    //! TCA of output jets in randomized event
-    //TClonesArray  *fTCARandomConesOutRan; //! TCA of output jets in randomized event
+    TClonesArray  *fTCARandomConesOutRan; //! TCA of output jets in randomized event
 
     TRandom3*     fRandom;   //! random number generator
     TProfile*     fh1Xsec;   //! pythia cross section and trials
@@ -213,7 +213,7 @@ class AliAnalysisTaskJetHBOM : public AliAnalysisTaskSE
     TH1F*         fh1DeltapT;        // pT of random Cone - background energy
     TH1F*         fh1Rho;            //background rho
     TH1F*         fh1PtRandCone;     //pT of random Cone
-    //TH1F*         fh1Area;           //area of random jet
+    TH1F*         fh1Area;           //area of random jet
 
     TH1F*         fh1efficiencyPt;          //here efficiency is stored
     TH2D*         fh2efficiencyPhi;         //here efficiency is stored