]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
remove old macros
authorgconesab <gconesab@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Jan 2012 09:26:50 +0000 (09:26 +0000)
committergconesab <gconesab@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Jan 2012 09:26:50 +0000 (09:26 +0000)
PWG4/macros/ConfigAnalysisOmegaToPi0Gamma.C [deleted file]
PWG4/macros/ConfigAnalysisPhotonAOD.C [deleted file]
PWG4/macros/ConfigAnalysisPhotonESD.C [deleted file]
PWG4/macros/ConfigAnalysisPhotonMC.C [deleted file]

diff --git a/PWG4/macros/ConfigAnalysisOmegaToPi0Gamma.C b/PWG4/macros/ConfigAnalysisOmegaToPi0Gamma.C
deleted file mode 100644 (file)
index aebe6c6..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-AliAnaPartCorrMaker*  ConfigAnalysis()
-{
-       //
-       // Configuration goes here
-       // 
-       printf("======================== \n");
-       printf("ConfigAnalysis() \n");
-       printf("======================== \n");
-       
-       //Detector Fidutial Cuts
-       AliFiducialCut * fidCut = new AliFiducialCut();
-       fidCut->DoCTSFiducialCut(kTRUE) ;
-       fidCut->DoEMCALFiducialCut(kTRUE) ;
-       fidCut->DoPHOSFiducialCut(kTRUE) ;
-       
-       fidCut->SetSimpleCTSFiducialCut(0.9,0.,360.);
-       fidCut->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-       fidCut->SetSimplePHOSFiducialCut(0.12,220.,320.);
-       
-       fidCut->Print("");
-       
-       //-----------------------------------------------------------  
-       // Reader
-       //-----------------------------------------------------------
-       AliCaloTrackESDReader *reader = new AliCaloTrackESDReader();
-       reader->SetDebug(-1);//10 for lots of messages
-       
-       //Switch on or off the detectors information that you want
-       reader->SwitchOnPHOS();
-       reader->SwitchOnEMCAL();
-       reader->SwitchOnCTS();
-       
-       //Min particle pT
-       reader->SetEMCALPtMin(0.5); 
-       reader->SetPHOSPtMin(0.5);
-       reader->SetCTSPtMin(0.5);
-       
-       reader->SetFiducialCut(fidCut);
-       reader->Print("");
-       
-       
-       //---------------------------------------------------------------------
-       // Analysis algorithm
-       //---------------------------------------------------------------------
-       
-       AliCaloPID * pid = new AliCaloPID();
-       // use selection with simple weights
-       //pid->SetEMCALPhotonWeight(0.7);    pid->SetEMCALPi0Weight(0.7);
-       pid->SetPHOSPhotonWeight(0.7);    pid->SetPHOSPi0Weight(0.7);
-       pid->SetDispersionCut(2);
-       pid->SetTOFCut(5.e-9);
-       pid->SetDebug(-1);
-       pid->Print("");
-
-       AliAnaPhoton *anaphoton = new AliAnaPhoton();
-        anaphoton->SetDebug(-1); //10 for lots of messages
-        anaphoton->SetMinPt(0.1);
-        anaphoton->SetMinDistanceToBadChannel(2, 4, 5);
-        anaphoton->SetCaloPID(pid);
-//        anaphoton->SetFiducialCut(fidCut); //More acceptance selections if needed at this level
-        anaphoton->SetCalorimeter("PHOS");
-        anaphoton->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-        anaphoton->SwitchOffCaloPID();
-        anaphoton->SwitchOffCaloPIDRecalculation(); //recommended for EMCAL
-        anaphoton->SwitchOffFiducialCut();
-        anaphoton->SetOutputAODName("PhotonsPHOS");
-        anaphoton->SetOutputAODClassName("AliAODPWG4Particle");
-        anaphoton->AddToHistogramsName("AnaPhotonPHOS_");
-        //Set Histrograms bins and ranges
-        anaphoton->SetHistoPtRangeAndNBins(0, 50, 100) ;
-        anaphoton->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
-        anaphoton->SetHistoEtaRangeAndNBins(-0.2, 0.2, 100) ;
-        anaphoton->Print("");
-
-       fidCut->Print("");
-       
-       // >>> Second Analysis <<<
-       
-       AliNeutralMesonSelection *nms = new AliNeutralMesonSelection();
-       nms->SetInvMassCutRange(0.11, 0.16)     ;
-       nms->KeepNeutralMesonSelectionHistos(kTRUE);
-       //Set Histrograms bins and ranges
-
-       AliAnaPi0EbE *anapi0EbE = new AliAnaPi0EbE();
-       anapi0EbE->SetDebug(-1);//10 for lots of messages
-       anapi0EbE->SetAnalysisType(AliAnaPi0EbE::kIMCalo);
-       anapi0EbE->SetInputAODName("PhotonsPHOS");
-       anapi0EbE->SetOutputAODName("Pi0sPHOS");
-       anapi0EbE->SetOutputAODClassName("AliAODPWG4Particle");
-       anapi0EbE->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-       anapi0EbE->SetNeutralMesonSelection(nms);
-       anapi0EbE->AddToHistogramsName("AnaPi0EbEPHOS_");
-       //Set Histrograms bins and ranges
-
-       anapi0EbE->Print("");
-       
-        AliAnaOmegaToPi0Gamma *anaomega = new AliAnaOmegaToPi0Gamma();
-        anaomega->SetDebug(-1);//10 for lots of messages
-        anaomega->SetInputAODName("Pi0sPHOS");
-        anaomega->SetInputAODPhotonName("PhotonsPHOS");
-       anaomega->SetNPID(2);
-        anaomega->SetNVtxZ(2);
-        anaomega->SetNBadChDist(1);
-        anaomega->SetNEventsMixed(4);
-        anaomega->SetPi0MassPeakWidthCut(0.008); //
-        anaomega->SetHistoPtRangeAndNBins(0, 10, 200) ;
-        anaomega->SetHistoMassRangeAndNBins(0, 1, 200) ;
-        anaomega->SetPi0OverOmegaPtCut(0.8);
-        anaomega->SetGammaOverOmegaPtCut(0.2);
-        anaomega->SwitchOnFiducialCut();
-        anaomega->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-        anaomega->AddToHistogramsName("AnaOmegaToPi0GammaPHOS_");
-        anaomega->Print("");
-
-//for EMCAL
-        AliCaloPID * pid1 = new AliCaloPID();
-        // use selection with simple weights
-        pid1->SetEMCALPhotonWeight(0.7);    pid1->SetEMCALPi0Weight(0.7);
-        pid1->SetDispersionCut(2);
-        pid1->SetTOFCut(5.e-9);
-        pid1->SetDebug(-1);
-        pid1->Print("");
-
-        AliAnaPhoton *anaphoton1 = new AliAnaPhoton();
-        anaphoton1->SetDebug(-1); //10 for lots of messages
-        anaphoton1->SetMinPt(0.1);
-        anaphoton1->SetMinDistanceToBadChannel(2, 4, 5);
-        anaphoton1->SetCaloPID(pid);
-        anaphoton1->SetCalorimeter("EMCAL");
-        anaphoton1->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-        anaphoton1->SwitchOffCaloPID();
-        anaphoton1->SwitchOffCaloPIDRecalculation(); //recommended for EMCAL
-        anaphoton1->SwitchOffFiducialCut();
-        anaphoton1->SetOutputAODName("PhotonsEMCAL");
-        anaphoton1->SetOutputAODClassName("AliAODPWG4Particle");
-        anaphoton1->AddToHistogramsName("AnaPhotonEMCAL_");
-         //Set Histrograms bins and ranges
-        anaphoton1->SetHistoPtRangeAndNBins(0, 50, 100) ;
-        anaphoton1->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
-        anaphoton1->SetHistoEtaRangeAndNBins(-0.8, 0.8, 100) ;
-        anaphoton1->Print("");
-
-       AliNeutralMesonSelection *nms1 = new AliNeutralMesonSelection();
-        nms1->SetInvMassCutRange(0.11, 0.16)     ;
-        nms1->KeepNeutralMesonSelectionHistos(kTRUE);
-        //Set Histrograms bins and ranges
-
-        AliAnaPi0EbE *anapi0EbEEbE1 = new AliAnaPi0EbE();
-        anapi0EbEEbE1->SetDebug(-1);//10 for lots of messages
-        anapi0EbEEbE1->SetAnalysisType(AliAnaPi0EbE::kIMCalo);
-        anapi0EbEEbE1->SetInputAODName("PhotonsEMCAL");
-        anapi0EbEEbE1->SetOutputAODName("Pi0sEMCAL");
-        anapi0EbEEbE1->SetOutputAODClassName("AliAODPWG4Particle");
-        anapi0EbEEbE1->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-        anapi0EbEEbE1->SetNeutralMesonSelection(nms1);
-        anapi0EbEEbE1->AddToHistogramsName("AnaPi0EbEEMCAL_");
-        //Set Histrograms bins and ranges
-        anapi0EbEEbE1->Print("");
-
-
-        AliAnaOmegaToPi0Gamma *anaomega1 = new AliAnaOmegaToPi0Gamma();
-        anaomega1->SetDebug(-1);//10 for lots of messages
-        anaomega1->SetInputAODName("Pi0sEMCAL");
-        anaomega1->SetInputAODPhotonName("PhotonsEMCAL");
-        anaomega1->SetNPID(2);
-        anaomega1->SetNVtxZ(2);
-        anaomega1->SetNBadChDist(1);
-        anaomega1->SetNEventsMixed(4);
-        anaomega1->SetPi0MassPeakWidthCut(0.015);
-        anaomega1->SetHistoPtRangeAndNBins(0, 10, 200) ;
-        anaomega1->SetHistoMassRangeAndNBins(0, 1, 200) ;
-        anaomega1->SetPi0OverOmegaPtCut(0.8);
-        anaomega1->SetGammaOverOmegaPtCut(0.2);
-        anaomega1->SwitchOnFiducialCut();
-        anaomega1->SwitchOffDataMC() ;//Access MC stack and fill more histograms
-        anaomega1->AddToHistogramsName("AnaOmegaToPi0GammaEMCAL_");
-        anaomega1->Print("");
-
-       //---------------------------------------------------------------------
-       // Set  analysis algorithm and reader
-       //---------------------------------------------------------------------
-       maker = new AliAnaPartCorrMaker();
-       maker->SetReader(reader);//pointer to reader
-       maker->SetAnaDebug(0);
-       maker->AddAnalysis(anaphoton,0);
-       maker->AddAnalysis(anapi0EbE,1);
-               maker->AddAnalysis(anaomega,2);
-
-        maker->AddAnalysis(anaphoton1,3);
-        maker->AddAnalysis(anapi0EbEEbE1,4);
-        maker->AddAnalysis(anaomega1,5);
-
-       maker->SwitchOnHistogramsMaker()  ;
-       maker->SwitchOnAODsMaker()  ;
-       
-       maker->Print("");
-       //
-       printf("======================== \n");
-       printf("END ConfigAnalysis() \n");
-       printf("======================== \n");
-       return maker ;
-}
diff --git a/PWG4/macros/ConfigAnalysisPhotonAOD.C b/PWG4/macros/ConfigAnalysisPhotonAOD.C
deleted file mode 100644 (file)
index c5ee04b..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/* $Id: $ */
-/* $Log$ */
-
-//------------------------------------
-// Configuration macro example:
-//
-// Do photon identification analysis with AODs
-// Gamma in EMCAL. For PHOS clusters change 
-// EMCAL by PHOS where necessary
-//
-// Author : Gustavo Conesa Balbastre (INFN-LNF)
-//------------------------------------
-
-AliAnaPartCorrMaker*  ConfigAnalysis()
-{
-  //
-  // Configuration goes here
-  // 
-  printf("======================== \n");
-  printf("ConfigAnalysis() \n");
-  printf("======================== \n");
-  
-  
-  //Detector Fiducial Cuts
-  AliFiducialCut * fidCut = new AliFiducialCut();
-  fidCut->DoCTSFiducialCut(kFALSE) ;
-  fidCut->DoEMCALFiducialCut(kFALSE) ;
-  fidCut->DoPHOSFiducialCut(kFALSE) ;
-  
-  //fidCut->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut->SetSimplePHOSFiducialCut(0.13,220.,320.);
-   
-  fidCut->Print("");
-  
-  //-----------------------------------------------------------  
-  // Reader
-  //-----------------------------------------------------------
-  AliCaloTrackAODReader *reader = new AliCaloTrackAODReader();
-  reader->SetDebug(-1);
-
-  //Switch on or off the detectors information that you want
-  reader->SwitchOnEMCAL();
-  reader->SwitchOffCTS();
-  reader->SwitchOffPHOS();
-  
-  //Kine
-  reader->SwitchOffStack();          // On  by default, remember to SwitchOnMCData() in analysis classes
-  reader->SwitchOnAODMCParticles();  // Off by default, remember to SwitchOnMCData() in analysis classes
-
-  //Min particle pT
-  reader->SetEMCALPtMin(0.5); 
-  //reader->SetPHOSPtMin(0.5);
-  //reader->SetCTSPtMin(0.2);
-  
-  //In case of generating jet events (with PYTHIA), if pt hard bin is small
-  //reject events with large difference between ptHard and triggered jet       
-  //reader->SetPtHardAndJetPtComparison(kTRUE);
-       
-  reader->SetFiducialCut(fidCut);
-
-  //Embedding/mixing/merging analysis with other events in another AOD file
-  reader->SetSecondInputFileName("./aod.root");
-  //Standard event loop can have less events, start mixing at event N
-  reader->SetSecondInputFirstEvent(0);   
-       
-  // Analysis with tracks, select only tracks with
-  // following bits
-       
-  //     //We want tracks fitted in the detectors:
-  //     ULong_t status=AliAODTrack::kTPCrefit;
-  //     status|=AliAODTrack::kITSrefit;
-    
-  //     We want tracks whose PID bit is set:
-  //     ULong_t status =AliAODTrack::kITSpid;
-  //     status|=AliAODTrack::kTPCpid; 
-
-  //   reader->SetTrackStatus(status);
-       
-  reader->Print("");
-  
-  
-  //---------------------------------------------------------------------
-  // Analysis algorithm
-  //---------------------------------------------------------------------
-  
-  //Detector Fiducial Cuts for analysis part
-  AliFiducialCut * fidCut2 = new AliFiducialCut();
-  fidCut2->DoCTSFiducialCut(kFALSE) ;
-  fidCut2->DoEMCALFiducialCut(kFALSE) ;
-  fidCut2->DoPHOSFiducialCut(kFALSE) ;
-  
-  //fidCut2->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut2->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut2->SetSimplePHOSFiducialCut(0.13,220.,320.);
-
-  fidCut2->Print("");
-
-  AliCaloPID * pid = new AliCaloPID();
-  // use selection with simple weights
-  //pid->SetPHOSPhotonWeight(0.7);    pid->SetPHOSPi0Weight(0.7); 
-  // use more complicated selection, particle weight depending on cluster energy
-//   pid->UsePHOSPIDWeightFormula(kTRUE);
-//   TFormula * photonF = new TFormula("photonWeight","0.98*(x<40)+ 0.68*(x>=100)+(x>=40 && x<100)*(0.98+x*(6e-3)-x*x*(2e-04)+x*x*x*(1.1e-06))");
-//   TFormula * pi0F = new TFormula("pi0Weight","0.98*(x<65)+ 0.915*(x>=100)+(x>=65 && x-x*(1.95e-3)-x*x*(4.31e-05)+x*x*x*(3.61e-07))");
-//   pid->SetPHOSPhotonWeightFormula(photonF);
-//   pid->SetPHOSPi0WeightFormula(pi0F);
-//Check these cuts for EMCAL
-  pid->SetDispersionCut(1.5);
-  pid->SetTOFCut(5.e-9);
-  pid->SetDebug(-1);
-  pid->Print("");
-
-  AliAnaPhoton *ana = new AliAnaPhoton();
-  ana->SetDebug(-1);
-  ana->SetMinPt(5.);
-  ana->SetMinDistanceToBadChannel(2, 4, 5);
-  ana->SetCaloPID(pid);
-  ana->SetFiducialCut(fidCut2);
-  ana->SetCalorimeter("EMCAL");
-  ana->SwitchOnDataMC() ;//Access MC stack and fill more histograms
-  ana->SwitchOffCaloPID();
-  ana->SwitchOffCaloPIDRecalculation(); //recommended for EMCAL
-  ana->SwitchOnTrackMatchRejection(); //Only in use when OnCaloPID
-  ana->SwitchOffFiducialCut();
-  ana->SetOutputAODName("Photons");
-  ana->SetOutputAODClassName("AliAODPWG4Particle");
-  //Set Histrograms bins and ranges
-//     ana->SetHistoPtRangeAndNBins(0, 50, 100) ;
-//     ana->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
-//     ana->SetHistoEtaRangeAndNBins(-0.7, 0.7, 100) ;
-  ana->Print("");
-
-  //---------------------------------------------------------------------
-  // Set  analysis algorithm and reader
-  //---------------------------------------------------------------------
-  maker = new AliAnaPartCorrMaker();
-  maker->SetReader(reader);//pointer to reader
-  maker->AddAnalysis(ana,0);
-  maker->SetAnaDebug(-1)  ;
-  maker->SwitchOnHistogramsMaker()  ;
-  maker->SwitchOnAODsMaker()  ;
-  
-  maker->Print("");
-  //
-  printf("======================== \n");
-  printf("END ConfigAnalysis() \n");
-  printf("======================== \n");
-  return maker ;
-}
diff --git a/PWG4/macros/ConfigAnalysisPhotonESD.C b/PWG4/macros/ConfigAnalysisPhotonESD.C
deleted file mode 100644 (file)
index 559b868..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $Id: $ */
-/* $Log$ */
-
-//------------------------------------
-// Configuration macro example:
-//
-// Do photon identification analysis with ESDs
-// Gamma in PHOS. For EMCAL clusters change 
-// PHOS by EMCAL where necessary
-//
-// Author : Gustavo Conesa Balbastre (INFN-LNF)
-//------------------------------------
-
-AliAnaPartCorrMaker*  ConfigAnalysis()
-{
-  //
-  // Configuration goes here
-  // 
-  printf("======================== \n");
-  printf("ConfigAnalysis() \n");
-  printf("======================== \n");
-  
-  
-  //Detector Fiducial Cuts
-  AliFiducialCut * fidCut = new AliFiducialCut();
-  fidCut->DoCTSFiducialCut(kFALSE) ;
-  fidCut->DoEMCALFiducialCut(kFALSE) ;
-  fidCut->DoPHOSFiducialCut(kFALSE) ;
-  
-  //fidCut->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut->SetSimplePHOSFiducialCut(0.13,220.,320.);
-   
-  fidCut->Print("");
-  
-  //-----------------------------------------------------------  
-  // Reader
-  //-----------------------------------------------------------
-  AliCaloTrackESDReader *reader = new AliCaloTrackESDReader();
-  reader->SetDebug(-1);
-
-  //Switch on or off the detectors information that you want
-  reader->SwitchOffEMCAL();
-  reader->SwitchOffCTS();
-  reader->SwitchOnPHOS();
-  
-  //Min particle pT
-  //reader->SetEMCALPtMin(0.5); 
-  reader->SetPHOSPtMin(0.5);
-  //reader->SetCTSPtMin(0.2);
-  reader->SwitchOnStack(); //On by default, remember to SwitchOnMCData() in analysis classes
-  //In case of generating jet events (with PYTHIA), if pt hard bin is small
-  //reject events with large difference between ptHard and triggered jet       
-  //reader->SetPtHardAndJetPtComparison(kTRUE);
-       
-  reader->SetFiducialCut(fidCut);
-
-  // Analysis with tracks, select only tracks with
-  // following bits
-       
-  //     //We want tracks fitted in the detectors:
-  //     ULong_t status=AliAODTrack::kTPCrefit;
-  //     status|=AliAODTrack::kITSrefit;
-    
-  //     We want tracks whose PID bit is set:
-  //     ULong_t status =AliAODTrack::kITSpid;
-  //     status|=AliAODTrack::kTPCpid; 
-       
-  //   reader->SetTrackStatus(status);
-       
-  reader->SwitchOnCleanStdAOD();
-       
-  reader->Print("");
-  
-  
-  //---------------------------------------------------------------------
-  // Analysis algorithm
-  //---------------------------------------------------------------------
-  
-  //Detector Fiducial Cuts for analysis part
-  AliFiducialCut * fidCut2 = new AliFiducialCut();
-  fidCut2->DoCTSFiducialCut(kFALSE) ;
-  fidCut2->DoEMCALFiducialCut(kFALSE) ;
-  fidCut2->DoPHOSFiducialCut(kFALSE) ;
-  
-  //fidCut2->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut2->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut2->SetSimplePHOSFiducialCut(0.13,220.,320.);
-
-  fidCut2->Print("");
-
-  AliCaloPID * pid = new AliCaloPID();
-  // use selection with simple weights
-  pid->SetPHOSPhotonWeight(0.7);    pid->SetPHOSPi0Weight(0.7); 
-  // use more complicated selection, particle weight depending on cluster energy
-//   pid->UsePHOSPIDWeightFormula(kTRUE);
-//   TFormula * photonF = new TFormula("photonWeight","0.98*(x<40)+ 0.68*(x>=100)+(x>=40 && x<100)*(0.98+x*(6e-3)-x*x*(2e-04)+x*x*x*(1.1e-06))");
-//   TFormula * pi0F = new TFormula("pi0Weight","0.98*(x<65)+ 0.915*(x>=100)+(x>=65 && x-x*(1.95e-3)-x*x*(4.31e-05)+x*x*x*(3.61e-07))");
-//   pid->SetPHOSPhotonWeightFormula(photonF);
-//   pid->SetPHOSPi0WeightFormula(pi0F);
-
-  pid->SetDispersionCut(1.5);
-  pid->SetTOFCut(5.e-9);
-  pid->SetDebug(-1);
-  pid->Print("");
-
-  AliAnaPhoton *ana = new AliAnaPhoton();
-  ana->SetDebug(-1);
-  ana->SetMinPt(5.);
-  ana->SetMinDistanceToBadChannel(2, 4, 5);
-  ana->SetCaloPID(pid);
-  ana->SetFiducialCut(fidCut2);
-  ana->SetCalorimeter("PHOS");
-  ana->SwitchOnDataMC() ;//Access MC stack and fill more histograms
-  ana->SwitchOffCaloPID();
-  ana->SwitchOffCaloPIDRecalculation(); //recommended for EMCAL
-  ana->SwitchOnTrackMatchRejection(); //Only in use when OnCaloPID
-  ana->SwitchOffFiducialCut();
-  ana->SetOutputAODName("Photons");
-  ana->SetOutputAODClassName("AliAODPWG4Particle");
-  //Set Histrograms bins and ranges
-//     ana->SetHistoPtRangeAndNBins(0, 50, 100) ;
-//     ana->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
-//     ana->SetHistoEtaRangeAndNBins(-0.7, 0.7, 100) ;
-  ana->Print("");
-
-  //---------------------------------------------------------------------
-  // Set  analysis algorithm and reader
-  //---------------------------------------------------------------------
-  maker = new AliAnaPartCorrMaker();
-  maker->SetReader(reader);//pointer to reader
-  maker->AddAnalysis(ana,0);
-  maker->SetAnaDebug(-1)  ;
-  maker->SwitchOnHistogramsMaker()  ;
-  maker->SwitchOnAODsMaker()  ;
-  
-  maker->Print("");
-  //
-  printf("======================== \n");
-  printf("END ConfigAnalysis() \n");
-  printf("======================== \n");
-  return maker ;
-}
diff --git a/PWG4/macros/ConfigAnalysisPhotonMC.C b/PWG4/macros/ConfigAnalysisPhotonMC.C
deleted file mode 100644 (file)
index 562e5a6..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Id: $ */
-/* $Log$ */
-
-//------------------------------------
-// Configuration macro example:
-//
-// Do photon identification analysis with Generator data
-// Gamma in PHOS. For EMCAL clusters change 
-// PHOS by EMCAL where necessary
-//
-// Author : Gustavo Conesa Balbastre (INFN-LNF)
-//------------------------------------
-
-AliAnaPartCorrMaker*  ConfigAnalysis()
-{
-  //
-  // Configuration goes here
-  // 
-  printf("======================== \n");
-  printf("ConfigAnalysis() \n");
-  printf("======================== \n");
-  
-  
-  //Detector Fiducial Cuts
-  AliFiducialCut * fidCut = new AliFiducialCut();
-  fidCut->DoCTSFiducialCut(kTRUE) ;
-  fidCut->DoEMCALFiducialCut(kTRUE) ;
-  fidCut->DoPHOSFiducialCut(kTRUE) ;
-  
-  //fidCut->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut->SetSimplePHOSFiducialCut(0.13,220.,320.);
-   
-  fidCut->Print("");
-  
-  //-----------------------------------------------------------  
-  // Reader
-  //-----------------------------------------------------------
-  AliCaloTrackMCReader *reader = new AliCaloTrackMCReader();
-  reader->SetDebug(-1);
-
-  //Switch on or off the detectors information that you want
-  reader->SwitchOffEMCAL();
-  reader->SwitchOffCTS();
-  reader->SwitchOnPHOS();
-  
-  //Min particle pT
-  //reader->SetEMCALPtMin(0.5); 
-  reader->SetPHOSPtMin(0.5);
-  //reader->SetCTSPtMin(0.2);
-  reader->SwitchOnStack(); //On by default, remember to SwitchOnMCData() in analysis classes
-  //In case of generating jet events (with PYTHIA), if pt hard bin is small
-  //reject events with large difference between ptHard and triggered jet       
-  //reader->SetPtHardAndJetPtComparison(kTRUE);
-       
-  reader->SetFiducialCut(fidCut);
-
-  //Anaysis of final particles, not pi0/eta etc.
-  TArrayI statusArray(1) ;
-  statusArray.SetAt(1,0); 
-  reader->AddStatusArray(statusArray)  ;
-  reader->SwitchOnStatusSelection() ;
-
-  //Keep pi0 in the list and not the 2 photon if decay angle is small.
-  reader->SwitchOffOverlapCheck();             
-
-  //Remove the temporal AODs we create.        
-  reader->SwitchOnCleanStdAOD();       
-       
-  reader->Print("");
-  
-  
-  //---------------------------------------------------------------------
-  // Analysis algorithm
-  //---------------------------------------------------------------------
-  
-  //Detector Fiducial Cuts for analysis part
-  AliFiducialCut * fidCut2 = new AliFiducialCut();
-  fidCut2->DoCTSFiducialCut(kFALSE) ;
-  fidCut2->DoEMCALFiducialCut(kFALSE) ;
-  fidCut2->DoPHOSFiducialCut(kFALSE) ;
-  
-  //fidCut2->SetSimpleCTSFiducialCut(0.9,0.,360.);
-  //fidCut2->SetSimpleEMCALFiducialCut(0.7,80.,190.);
-  //fidCut2->SetSimplePHOSFiducialCut(0.13,220.,320.);
-
-  fidCut2->Print("");
-
-  AliAnaPhoton *ana = new AliAnaPhoton();
-  ana->SetDebug(-1);
-  ana->SetMinPt(5.);
-  ana->SetMinDistanceToBadChannel(2, 4, 5);
-  ana->SetFiducialCut(fidCut2);
-  ana->SetCalorimeter("PHOS");
-  ana->SwitchOnDataMC() ;//Access MC stack and fill more histograms
-  ana->SwitchOffCaloPID(); //No need with MC reader
-  ana->SwitchOffCaloPIDRecalculation(); //recommended for EMCAL, no need with MC reader
-  ana->SwitchOffTrackMatchRejection(); //Only in use when OnCaloPID
-  ana->SwitchOffFiducialCut();
-  ana->SetOutputAODName("Photons");
-  ana->SetOutputAODClassName("AliAODPWG4Particle");
-  //Set Histrograms bins and ranges
-//     ana->SetHistoPtRangeAndNBins(0, 50, 100) ;
-//     ana->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 100) ;
-//     ana->SetHistoEtaRangeAndNBins(-0.7, 0.7, 100) ;
-  ana->Print("");
-
-  //---------------------------------------------------------------------
-  // Set  analysis algorithm and reader
-  //---------------------------------------------------------------------
-  maker = new AliAnaPartCorrMaker();
-  maker->SetReader(reader);//pointer to reader
-  maker->AddAnalysis(ana,0);
-  maker->SetAnaDebug(-1)  ;
-  maker->SwitchOnHistogramsMaker()  ;
-  maker->SwitchOnAODsMaker()  ;
-  
-  maker->Print("");
-  //
-  printf("======================== \n");
-  printf("END ConfigAnalysis() \n");
-  printf("======================== \n");
-  return maker ;
-}