From 5c8fd15c03580d80caf57e722e5f75519f0cb5e0 Mon Sep 17 00:00:00 2001 From: gconesab Date: Tue, 1 Mar 2011 16:15:50 +0000 Subject: [PATCH] update some analysis parameters --- PWG4/macros/AddTaskPartCorr.C | 18 ++++++++++-------- PWG4/macros/AddTaskPartCorrM.C | 8 ++++++-- PWG4/macros/AddTaskPi0.C | 16 +++++++++------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/PWG4/macros/AddTaskPartCorr.C b/PWG4/macros/AddTaskPartCorr.C index 1ca8bab2c71..61ba6464ac4 100644 --- a/PWG4/macros/AddTaskPartCorr.C +++ b/PWG4/macros/AddTaskPartCorr.C @@ -32,13 +32,15 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString inputDataType, TStri //if(!kSimulation) reader->SetFiredTriggerClassName("CINT1B-ABCE-NOPF-ALL"); if(calorimeter == "EMCAL") { reader->SwitchOnEMCALCells(); - reader->SwitchOnEMCAL(); + reader->SwitchOnEMCAL(); } if(calorimeter == "PHOS") { reader->SwitchOnPHOSCells(); reader->SwitchOnPHOS(); } + reader->SwitchOnSuspiciousClustersRemoval(); //EMCAL + // for case inputDataType="deltaAOD", no need to fill the EMCAL/PHOS cluster lists if(inputDataType.Contains("delta")){ reader->SwitchOffEMCAL(); @@ -121,16 +123,16 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString inputDataType, TStri anaphoton->SetMultiplicity(80, 120); if(calorimeter == "PHOS"){ - anaphoton->SetNCellCut(0);// At least 2 cells - anaphoton->SetMinPt(0.); + anaphoton->SetNCellCut(2);// At least 3 cells + anaphoton->SetMinPt(0.3); anaphoton->SetMinDistanceToBadChannel(2, 4, 5); } else {//EMCAL - //anaphoton->SetNCellCut(0);// At least 2 cells - anaphoton->SetMinPt(0.1); // no effect minium EMCAL cut. - if(!kUseKinematics) anaphoton->SetTimeCut(400,900);// Time window of [400-900] ns - anaphoton->SetMinDistanceToBadChannel(6, 12, 18); - //anaphoton->SetMinDistanceToBadChannel(1, 2, 3);//For new releases. + anaphoton->SetNCellCut(1);// At least 2 cells + anaphoton->SetMinPt(0.3); + //if(!kUseKinematics) anaphoton->SetTimeCut(400,900);// Time window of [400-900] ns + //anaphoton->SetMinDistanceToBadChannel(6, 12, 18); + anaphoton->SetMinDistanceToBadChannel(1, 2, 3);//For new releases. } anaphoton->SetCalorimeter(calorimeter); if(kUseKinematics) anaphoton->SwitchOnDataMC() ;//Access MC stack and fill more histograms diff --git a/PWG4/macros/AddTaskPartCorrM.C b/PWG4/macros/AddTaskPartCorrM.C index a17a868dcbd..99b74289c9a 100644 --- a/PWG4/macros/AddTaskPartCorrM.C +++ b/PWG4/macros/AddTaskPartCorrM.C @@ -34,6 +34,8 @@ AliAnalysisTaskParticleCorrelationM *AddTaskPartCorrM(TString data, TString calo reader->SwitchOnPHOS(); } + reader->SwitchOnSuspiciousClustersRemoval(); //EMCAL + // for case data="deltaAOD", no need to fill the EMCAL/PHOS cluster lists if(data.Contains("delta")){ reader->SwitchOffEMCAL(); @@ -148,10 +150,12 @@ AliAnalysisTaskParticleCorrelationM *AddTaskPartCorrM(TString data, TString calo if(calorimeter == "EMCAL"){ anaphoton->SetNCellCut(1); - if(!kUseKinematics) anaphoton->SetTimeCut(525, 725); - anaphoton->SetMinDistanceToBadChannel(4, 5, 10); + anaphoton->SetMinPt(0.3); + //if(!kUseKinematics) anaphoton->SetTimeCut(525, 725); + anaphoton->SetMinDistanceToBadChannel(1, 2, 3); } else{ + anaphoton->SetMinPt(0.3); anaphoton->SetMinDistanceToBadChannel(2, 4, 5); anaphoton->SetNCellCut(2); } diff --git a/PWG4/macros/AddTaskPi0.C b/PWG4/macros/AddTaskPi0.C index eb650012815..b82236b02e2 100644 --- a/PWG4/macros/AddTaskPi0.C +++ b/PWG4/macros/AddTaskPi0.C @@ -51,6 +51,8 @@ AliAnalysisTaskParticleCorrelation *AddTaskPi0(TString data, TString calorimeter reader->SwitchOnPHOSCells(); reader->SwitchOnPHOS(); } + + reader->SwitchOnSuspiciousClustersRemoval(); //EMCAL // for case data="deltaAOD", no need to fill the EMCAL/PHOS cluster lists if(data.Contains("delta")){ @@ -128,16 +130,16 @@ AliAnalysisTaskParticleCorrelation *AddTaskPi0(TString data, TString calorimeter AliAnaPhoton *anaphoton = new AliAnaPhoton(); anaphoton->SetDebug(-1); //10 for lots of messages if(calorimeter == "PHOS"){ - anaphoton->SetNCellCut(0);// At least 2 cells - anaphoton->SetMinPt(0.); + anaphoton->SetNCellCut(2);// At least 2 cells + anaphoton->SetMinPt(3.); anaphoton->SetMinDistanceToBadChannel(2, 4, 5); } else {//EMCAL - //anaphoton->SetNCellCut(0);// At least 2 cells - anaphoton->SetMinPt(0.1); // no effect minium EMCAL cut. - if(!kUseKinematics) anaphoton->SetTimeCut(400,900);// Time window of [400-900] ns - anaphoton->SetMinDistanceToBadChannel(6, 12, 18);//For officially produced ESDs/AODs - //anaphoton->SetMinDistanceToBadChannel(1, 2, 3);//For filtered AODs, new releases. + anaphoton->SetNCellCut(1);// At least 2 cells + anaphoton->SetMinPt(0.3); // no effect minium EMCAL cut. + //if(!kUseKinematics) anaphoton->SetTimeCut(400,900);// Time window of [400-900] ns + //anaphoton->SetMinDistanceToBadChannel(6, 12, 18);//For officially produced ESDs/AODs + anaphoton->SetMinDistanceToBadChannel(1, 2, 3);//For filtered AODs, new releases. } anaphoton->SetCalorimeter(calorimeter); if(kUseKinematics) anaphoton->SwitchOnDataMC() ;//Access MC stack and fill more histograms -- 2.39.3