Squashed commit of the following:

commit a64ee329941239cab568894af6cdaf799f271cb6
Author: Svein Lindal <svein.lindal@gmail.com>
Date:   Thu Apr 26 15:43:42 2012 -0400

    removed unneded pointer.

commit 570afc81a9176a7763a2eb77e25d960f9704f54b
Author: Svein Lindal <svein.lindal@gmail.com>
Date:   Tue Apr 24 18:51:26 2012 -0400

    removing conv corr dir

diff --git a/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx b/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
index 400e3943d64f49e8343d3662d407955e4fd11502..af54a9e878a687204dd34c7bf1149e4dcdc2b4a6 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
@@ -593,7 +593,7 @@ Bool_t AliAnalysisTaskdPhi::VerifyAODGamma(AliAODConversionPhoton * gamma) {
   // Float_t sumdpt = d1->Pt() + d2->Pt();
   // cout << "pt: " << sumdpt << " " << gamma->Pt() << endl;
 
-  return kTRUE;
+  return kFALSE;
 
 
 

diff --git a/PWGGA/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C b/PWGGA/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C
deleted file mode 100644 (file)
index 137719a..0000000
--- a/PWGGA/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-void ConfigGammaJet (TString inputfile = "files.txt" ) {
-
-  Int_t debugLevel = 0;
-  
-  gSystem->Load("libTree.so");
-  gSystem->Load("libPhysics.so");
-  gSystem->Load("libGeom.so");
-  gSystem->Load("libVMC.so");
-  gSystem->Load("libSTEERBase.so");
-  gSystem->Load("libESD.so");
-  gSystem->Load("libAOD.so"); 
-  gSystem->Load("libANALYSIS");
-  gSystem->Load("libANALYSISalice");
-  gSystem->Load("libJETAN.so");
-  gSystem->Load("libPWG4GammaConv.so");
-  gSystem->AddIncludePath("-I$ALICE_ROOT/include");
-
-
-  TChain * chain = createAODChain (inputfile);
-  if(!chain) {
-    cout << "Errror in chain cration"<<endl;
-    return -1;
-  }
-  
-  AliAODInputHandler * inpHandler = new AliAODInputHandler();
-  inpHandler->AddFriend("AliAODGammaConversion.root");
-  
-  AliAnalysisManager *mgr  = new AliAnalysisManager("GammaJet Manager", "GammaJet Manager");
-  mgr->SetInputEventHandler  (inpHandler);
-  mgr->SetDebugLevel(debugLevel);
-
-  AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
-  AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("histos", TList::Class(), AliAnalysisManager::kOutputContainer, "histos.root");
-
-  // AliAnaConvIsolation * iso3 = new AliAnaConvIsolation(0.7, 0.5, 0.5, 0.5, 0.5);
-  // gammaJetAna->AddIsolationAna(dynamic_cast<TObject*>(iso3));
-
-
-  AliAnalysisTaskGammaJet * gammaJetAna = new AliAnalysisTaskGammaJet("gamma jet analysis");
-  gammaJetAna->SetDebugLevel(0);
-  //gammaJetAna->SetConversionCutId("90022670901120321036000000090");
-  gammaJetAna->SetGammaCutId("90035620801003321136000000090"); 
-  gammaJetAna->SetPionCutId("90036620801003321136000000090"); 
-
-  gammaJetAna->SetMinNTracks(0);
-  mgr->AddTask(gammaJetAna);
-
-  AliAnaConvIsolation * isolation = gammaJetAna->GetIsolation();
-  isolation->SetMaxPtThreshold(0.7);
-  isolation->SetSumPtThreshold(2.5);
-  isolation->SetSumPtFraction(0.1);
-  isolation->SetConeSize(0.4);
- 
-  AliAnaConvCorrPhoton * ghAna = new AliAnaConvCorrPhoton("photon_wDec");
-  ghAna->DoDecayParticles();
-  gammaJetAna->AddPhotonHadronAna(dynamic_cast<TObject*>(ghAna));
-
-  AliAnaConvCorrPhoton * ghAna2 = new AliAnaConvCorrPhoton("photon_noDec");
-  ghAna2->SkipDecayParticles();
-  gammaJetAna->AddPhotonHadronAna(dynamic_cast<TObject*>(ghAna2));
-
-  AliAnaConvCorrPhoton * ghAna3 = new AliAnaConvCorrPhoton("photon_DecOnly");
-  ghAna3->DoDecayOnly();
-  gammaJetAna->AddPhotonHadronAna(dynamic_cast<TObject*>(ghAna3));
-
-  AliAnaConvCorrPion * gPiAna = new AliAnaConvCorrPion("pionHadron");
-  gammaJetAna->AddPionHadronAna(dynamic_cast<TObject*>(gPiAna));
-
-  inpHandler->AddFriend("AliAODs.pwg4jets.root");
-  AliAnaConvCorrPhotonJet* gJetAna = new AliAnaConvCorrPhotonJet("photonJet");
-  gammaJetAna->AddPhotonJetAna(gJetAna);
- 
-  AliAnaConvCorrPionJet* pJetAna = new AliAnaConvCorrPionJet("pionJet");
-  gammaJetAna->AddPionJetAna(pJetAna);
-
-  mgr->ConnectInput  (gammaJetAna,  0, cinput1  );
-  mgr->ConnectOutput (gammaJetAna,  1, coutput2 );
-  
-  mgr->InitAnalysis();
-  mgr->PrintStatus();
-  //mgr->StartAnalysis("local",chain);
-  mgr->StartAnalysis("local",chain, 100000);
-  
-}
-
-
-///_________________________________________________________________________________________
-TChain * createAODChain (TString inputfile = "allfiles.txt") {
-
-  chain = new TChain("aodTree");
-
-  TString line;
-  ifstream in;
-  in.open(inputfile.Data());
-  while (in.good()) {
-    in >> line;
-    if (line.Length() == 0) continue;
-    chain->Add(line.Data());
-  }
-
-  return chain;
-  
-}