- changes to Calo selection classes & addtasks in Conversion-PWGGA branch

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
index 85fe4c8cef85784c74d48e681a696ff77d802726..be0ba5754e967a560c07f37e9318aa490f49eacd 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
@@ -1254,7 +1254,7 @@ void AliAnalysisTaskGammaConvCalo::ProcessClusters()
        Int_t nclus = 0;
        nclus = fInputEvent->GetNumberOfCaloClusters();
        
-       cout << nclus << endl;
+//     cout << nclus << endl;
        
        if(nclus == 0)  return;
        
@@ -1284,7 +1284,7 @@ void AliAnalysisTaskGammaConvCalo::ProcessClusters()
                if(fIsMC){
                        mclab[0] = clus->GetLabel();
                        mclab[1] = clus->GetLabel();
-                       cout << "mclabels: " << mclab[0] << " " << mclab[1] << endl;
+//                     cout << "mclabels: " << mclab[0] << " " << mclab[1] << endl;
                }
                
                PhotonCandidate->SetMCLabel(mclab);

diff --git a/PWGGA/GammaConv/AliCaloPhotonCuts.cxx b/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
index 0ec31f28f59da839f2cb4035fc7291fa562a29b6..86155b6796b14d31a146ef338e55fd33099956f9 100644 (file)
--- a/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
+++ b/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
@@ -76,21 +76,33 @@ AliCaloPhotonCuts::AliCaloPhotonCuts(const char *name,const char *title) :
        fClusterType(0),
        fMinEtaCut(-10),
        fMaxEtaCut(10),
+       fUseEtaCut(0),
        fMinPhiCut(-10000),
        fMaxPhiCut(-10000),
+       fUsePhiCut(0),
        fMinDistanceToBadChannel(0),
+       fUseDistanceToBadChannel(0),
        fMaxTimeDiff(10e10),
+       fUseTimeDiff(0),
        fMinDistTrackToCluster(0),
+       fUseDistTrackToCluster(0),
        fExoticCell(0),
+       fUseExoticCell(0),
        fMinEnergy(0),
+       fUseMinEnergy(0),
        fMinNCells(0),
+       fUseNCells(0),
        fMaxM02(1000),
        fMinM02(0),
+       fUseM02(0),
        fMaxM20(1000),
        fMinM20(0),
+       fUseM20(0),
        fMaxDispersion(1000),
+       fUseDispersion(0),
        fMinNLM(0),
        fMaxNLM(1000),
+       fUseNLM(0),
        fCutString(NULL),
        fHistCutIndex(NULL),
        fHistAcceptanceCuts(NULL),
@@ -127,24 +139,36 @@ AliCaloPhotonCuts::AliCaloPhotonCuts(const char *name,const char *title) :
 AliCaloPhotonCuts::AliCaloPhotonCuts(const AliCaloPhotonCuts &ref) :
    AliAnalysisCuts(ref),
        fHistograms(NULL),      
-       fClusterType(ref.fClusterType),
+       fClusterType(ref.fClusterType),
        fMinEtaCut(ref.fMinEtaCut),
        fMaxEtaCut(ref.fMaxEtaCut),
+       fUseEtaCut(ref.fUseEtaCut),
        fMinPhiCut(ref.fMinPhiCut),
        fMaxPhiCut(ref.fMaxPhiCut),
+       fUsePhiCut(ref.fUsePhiCut),
        fMinDistanceToBadChannel(ref.fMinDistanceToBadChannel),
+       fUseDistanceToBadChannel(ref.fUseDistanceToBadChannel),
        fMaxTimeDiff(ref.fMaxTimeDiff),
+       fUseTimeDiff(ref.fUseTimeDiff),
        fMinDistTrackToCluster(ref.fMinDistTrackToCluster),
+       fUseDistTrackToCluster(ref.fUseDistTrackToCluster),
        fExoticCell(ref.fExoticCell),
+       fUseExoticCell(ref.fUseExoticCell),
        fMinEnergy(ref.fMinEnergy),
+       fUseMinEnergy(ref.fUseMinEnergy),
        fMinNCells(ref.fMinNCells),
+       fUseNCells(ref.fUseNCells),
        fMaxM02(ref.fMaxM02),
        fMinM02(ref.fMinM02),
+       fUseM02(ref.fUseM02),
        fMaxM20(ref.fMaxM20),
        fMinM20(ref.fMinM20),
+       fUseM20(ref.fUseDispersion),
        fMaxDispersion(ref.fMaxDispersion),
+       fUseDispersion(ref.fUseDispersion),
        fMinNLM(ref.fMinNLM),
        fMaxNLM(ref.fMaxNLM),
+       fUseNLM(ref.fUseNLM),
        fCutString(NULL),
        fHistCutIndex(NULL),
        fHistAcceptanceCuts(NULL),
@@ -229,17 +253,18 @@ void AliCaloPhotonCuts::InitCutHistograms(TString name){
        fHistograms->Add(fHistAcceptanceCuts);
 
        // Cluster Cuts
-       fHistClusterIdentificationCuts =new TH1F(Form("ClusterQualityCuts %s",GetCutNumber().Data()),"ClusterQualityCuts",10,-0.5,9.5);
+       fHistClusterIdentificationCuts =new TH1F(Form("ClusterQualityCuts %s",GetCutNumber().Data()),"ClusterQualityCuts",11,-0.5,10.5);
        fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(1,"in");
        fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(2,"timing");
        fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(3,"track matching");
        fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(4,"Exotics");
        fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(5,"minimum energy");
-       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(6,"M02");
-       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(7,"M20");
-       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(8,"dispersion");
-       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(9,"NLM");
-       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(10,"out");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(6,"minimum NCells");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(7,"M02");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(8,"M20");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(9,"dispersion");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(10,"NLM");
+       fHistClusterIdentificationCuts->GetXaxis()->SetBinLabel(11,"out");
        fHistograms->Add(fHistClusterIdentificationCuts);
 
        // Acceptance related histogramms
@@ -502,17 +527,21 @@ Bool_t AliCaloPhotonCuts::ClusterQualityCuts(AliVCluster* cluster, AliVEvent *ev
 //     if(fHistNLMBeforeQA) fHistNLMBeforeQA->Fill(cluster->GetNExMax());
        
        // Check wether timing is ok
-       if(abs(cluster->GetTOF()) > fMaxTimeDiff && !isMC){
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //1
-               return kFALSE;
-       }
+       if (fUseTimeDiff){
+               if(abs(cluster->GetTOF()) > fMaxTimeDiff && !isMC){
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //1
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //2, next cut
 
        // Minimum distance to track
-       if(cluster->GetEmcCpvDistance() < fMinDistTrackToCluster){
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //2
-               return kFALSE;
-       }
+       if (fUseDistTrackToCluster){
+               if(cluster->GetEmcCpvDistance() < fMinDistTrackToCluster){
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //2
+                       return kFALSE;
+               }
+       }       
        cutIndex++;//3, next cut
 
        // exotic cell cut --IMPLEMENT LATER---
@@ -523,45 +552,57 @@ Bool_t AliCaloPhotonCuts::ClusterQualityCuts(AliVCluster* cluster, AliVEvent *ev
        cutIndex++; //4, next cut
        
        // minimum cell energy cut
-       if(cluster->E() < fMinEnergy){
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //4
-               return kFALSE;
-       }
+       if (fUseMinEnergy){
+               if(cluster->E() < fMinEnergy){
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //4
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //5, next cut
        
        // minimum number of cells
-       if(cluster->GetNCells() < fMinNCells) {
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //5
-               return kFALSE;
-       }
+       if (fUseNCells){
+               if(cluster->GetNCells() < fMinNCells) {
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //5
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //6, next cut
        
        // M02 cut
-       if( cluster->GetM02()< fMinM02 || cluster->GetM02() > fMaxM02 ) {
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //6
-               return kFALSE;
-       }
+       if (fUseM02){
+               if( cluster->GetM02()< fMinM02 || cluster->GetM02() > fMaxM02 ) {
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //6
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //7, next cut
        
        // M20 cut
-       if( cluster->GetM20()< fMinM20 || cluster->GetM20() > fMaxM20 ) {
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //7
-               return kFALSE;
-       }
+       if (fUseM20){
+               if( cluster->GetM20()< fMinM20 || cluster->GetM20() > fMaxM20 ) {
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //7
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //8, next cut
        
        // dispersion cut
-       if( cluster->GetDispersion()> fMaxDispersion) {
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //8
-               return kFALSE;
-       }
+       if (fUseDispersion){
+               if( cluster->GetDispersion()> fMaxDispersion) {
+                       if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //8
+                       return kFALSE;
+               }
+       }       
        cutIndex++; //9, next cut
        
        // NLM cut --IMPLEMENT LATER---
-       if( cluster->GetDispersion()> fMaxDispersion) {
-               if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //9
-               return kFALSE;
-       }
+//     if (fUseNLM){
+//             if( cluster->GetDispersion()> fMaxDispersion) {
+//                     if(fHistClusterIdentificationCuts)fHistClusterIdentificationCuts->Fill(cutIndex); //9
+//                     return kFALSE;
+//             }
+//     }       
        cutIndex++; //9, next cut
        
        // DONE with selecting photons
@@ -615,10 +656,12 @@ Bool_t AliCaloPhotonCuts::ClusterIsSelected(AliVCluster *cluster, AliVEvent * ev
                //Select EMCAL cluster
                if (fClusterType == 1 && !cluster->IsEMCAL()){
                        FillClusterCutIndex(kDetector);
+                       return kFALSE;
                }
                //Select PHOS cluster
                if (fClusterType == 2 && !cluster->IsPHOS()){
                        FillClusterCutIndex(kDetector);
+                       return kFALSE;
                }
        }
        
@@ -658,16 +701,16 @@ Bool_t AliCaloPhotonCuts::AcceptanceCuts(AliVCluster *cluster, AliVEvent* event)
        Double_t phiCluster = clusterVector.Phi();
        
        // check eta range
-       if (fMinEtaCut !=-10 && fMaxEtaCut !=10 ){
+       if (fUseEtaCut){
                if (etaCluster < fMinEtaCut || etaCluster > fMaxEtaCut){
                        if(fHistAcceptanceCuts)fHistAcceptanceCuts->Fill(cutIndex);
                        return kFALSE;
                }
-       }       
+       }
        cutIndex++;
        
        // check phi range
-       if (fMinPhiCut !=-10000 && fMaxPhiCut !=-10000 ){
+       if (fUsePhiCut ){
                if (phiCluster < fMinPhiCut || phiCluster > fMaxEtaCut){
                        if(fHistAcceptanceCuts)fHistAcceptanceCuts->Fill(cutIndex);
                        return kFALSE;
@@ -676,11 +719,13 @@ Bool_t AliCaloPhotonCuts::AcceptanceCuts(AliVCluster *cluster, AliVEvent* event)
        cutIndex++;
        
        // check distance to bad channel
-       if (cluster->GetDistanceToBadChannel() < fMinDistanceToBadChannel){
-               if(fHistAcceptanceCuts)fHistAcceptanceCuts->Fill(cutIndex);
-               return kFALSE;
-       }       
-
+       if (fUseDistanceToBadChannel){
+               if (cluster->GetDistanceToBadChannel() < fMinDistanceToBadChannel){
+                       if(fHistAcceptanceCuts)fHistAcceptanceCuts->Fill(cutIndex);
+                       return kFALSE;
+               }       
+       }
+       cutIndex++;
        if(fHistAcceptanceCuts)fHistAcceptanceCuts->Fill(cutIndex);
 
        // Histos after cuts
@@ -874,15 +919,23 @@ void AliCaloPhotonCuts::PrintCuts() {
 void AliCaloPhotonCuts::PrintCutsWithValues() {
        // Print out current Cut Selection with value
        printf("Acceptance cuts: \n");
-       printf("\t%3.2f < eta_{cluster} < %3.2f\n", fMinEtaCut, fMaxEtaCut );
-       printf("\t%3.2f < phi_{cluster} < %3.2f\n", fMinPhiCut, fMaxPhiCut );
-       printf("\tmin distance to bad channel > %3.2f\n", fMinDistanceToBadChannel );
+       if (fClusterType == 0) printf("\tall calorimeter clusters are used\n");
+       if (fClusterType == 1) printf("\tEMCAL calorimeter clusters are used\n");
+       if (fClusterType == 2) printf("\tPHOS calorimeter clusters are used\n");
+       if (fUseEtaCut) printf("\t%3.2f < eta_{cluster} < %3.2f\n", fMinEtaCut, fMaxEtaCut );
+       if (fUsePhiCut) printf("\t%3.2f < phi_{cluster} < %3.2f\n", fMinPhiCut, fMaxPhiCut );
+       if (fUseDistanceToBadChannel) printf("\tcut on exotics applied \n");
        
        printf("Cluster Quality cuts: \n");
-       printf("\t time difference < %3.2f\n", fMaxTimeDiff );
-       printf("\t min distance to track > %3.2f\n", fMinDistTrackToCluster );
-    printf("\t E_{cluster} > %3.2f\n", fMinEnergy );
-       printf("\t %3.2f < M02 < %3.2f\n", fMinM02, fMaxM02 );
+       if (fUseTimeDiff) printf("\t time difference < %3.2f\n", fMaxTimeDiff );
+       if (fUseDistTrackToCluster) printf("\tmin distance to track > %3.2f\n", fMinDistTrackToCluster );
+       if (fUseExoticCell)printf("\t min distance to track > %3.2f\n", fMinDistTrackToCluster );
+    if (fUseMinEnergy)printf("\t E_{cluster} > %3.2f\n", fMinEnergy );
+       if (fUseNCells) printf("\t number of cells per cluster > %d\n", fMinNCells );
+       if (fUseM02) printf("\t %3.2f < M02 < %3.2f\n", fMinM02, fMaxM02 );
+       if (fUseM20) printf("\t %3.2f < M20 < %3.2f\n", fMinM20, fMaxM20 );
+       if (fUseDispersion) printf("\t dispersion < %3.2f\n", fMaxDispersion );
+       if (fUseNLM) printf("\t %d < NLM < %d\n", fMinNLM, fMaxNLM );
        
 }
 
@@ -915,13 +968,20 @@ Bool_t AliCaloPhotonCuts::SetClusterTypeCut(Int_t clusterType)
 Bool_t AliCaloPhotonCuts::SetMinEtaCut(Int_t minEta)
 {
        switch(minEta){
-       case 0: 
+       case 0:
+               if (!fUseEtaCut) fUseEtaCut=0;
+               fMinEtaCut=-10.;
+               break;
+       case 1:
+               if (!fUseEtaCut) fUseEtaCut=1;
                fMinEtaCut=-0.6687;
                break;
-       case 1: 
+       case 2: 
+               if (!fUseEtaCut) fUseEtaCut=1;
                fClusterType=-0.5;
                break;
-       case 2: 
+       case 3: 
+               if (!fUseEtaCut) fUseEtaCut=1;
                fClusterType=-2;
                break;
        default:
@@ -937,12 +997,19 @@ Bool_t AliCaloPhotonCuts::SetMaxEtaCut(Int_t maxEta)
 {
        switch(maxEta){
        case 0: 
+               if (!fUseEtaCut) fUseEtaCut=0;
+               fMaxEtaCut=10;
+               break;          
+       case 1:
+               if (!fUseEtaCut) fUseEtaCut=1;
                fMaxEtaCut=0.66465;
                break;
-       case 1: 
+       case 2: 
+               if (!fUseEtaCut) fUseEtaCut=1;
                fMaxEtaCut=0.5;
                break;
-       case 2: 
+       case 3: 
+               if (!fUseEtaCut) fUseEtaCut=1;
                fMaxEtaCut=2;
                break;
        default:
@@ -957,9 +1024,11 @@ Bool_t AliCaloPhotonCuts::SetMinPhiCut(Int_t minPhi)
 {
        switch(minPhi){
        case 0: 
+               if (!fUsePhiCut) fUsePhiCut=0;
                fMinPhiCut=-10000;
                break;
        case 1: 
+               if (!fUsePhiCut) fUsePhiCut=1;
                fMinPhiCut=1.39626;
                break;
        default:
@@ -974,9 +1043,11 @@ Bool_t AliCaloPhotonCuts::SetMaxPhiCut(Int_t maxPhi)
 {
        switch(maxPhi){
        case 0: 
+               if (!fUsePhiCut) fUsePhiCut=0;
                fMaxPhiCut=-10000;
                break;
        case 1: 
+               if (!fUsePhiCut) fUsePhiCut=1;
                fMaxPhiCut=3.125;
                break;
        default:
@@ -991,9 +1062,11 @@ Bool_t AliCaloPhotonCuts::SetDistanceToBadChannelCut(Int_t distanceToBadChannel)
 {
        switch(distanceToBadChannel){
        case 0: 
+               fUseDistanceToBadChannel=0;
                fMinDistanceToBadChannel=0;
                break;
        case 1: 
+               if (!fUseDistanceToBadChannel) fUseDistanceToBadChannel=1;
                fMinDistanceToBadChannel=5;
                break;
        default:
@@ -1008,21 +1081,27 @@ Bool_t AliCaloPhotonCuts::SetTimingCut(Int_t timing)
 {
        switch(timing){
        case 0: 
+               fUseTimeDiff=0;
                fMaxTimeDiff=500;
                break;
        case 1: 
+               if (!fUseTimeDiff) fUseTimeDiff=1;
                fMaxTimeDiff=10e-7; //1000ns
                break;
        case 2: 
+               if (!fUseTimeDiff) fUseTimeDiff=1;
                fMaxTimeDiff=50e-8; //500ns
                break;
        case 3: 
+               if (!fUseTimeDiff) fUseTimeDiff=1;
                fMaxTimeDiff=20e-8; //200ns
                break;
        case 4: 
+               if (!fUseTimeDiff) fUseTimeDiff=1;
                fMaxTimeDiff=10e-8; //100ns
                break;
        case 5: 
+               if (!fUseTimeDiff) fUseTimeDiff=1;
                fMaxTimeDiff=50e-9; //50ns
                break;
 
@@ -1038,9 +1117,11 @@ Bool_t AliCaloPhotonCuts::SetTrackMatchingCut(Int_t trackMatching)
 {
        switch(trackMatching){
        case 0: 
+               fUseDistTrackToCluster=0;
                fMinDistTrackToCluster=0;
                break;
        case 1: 
+               if (!fUseDistTrackToCluster) fUseDistTrackToCluster=1;
                fMinDistTrackToCluster=5; 
                break;
        default:
@@ -1055,9 +1136,11 @@ Bool_t AliCaloPhotonCuts::SetExoticCellCut(Int_t exoticCell)
 {
        switch(exoticCell){
        case 0: 
+               fUseExoticCell=0;
                fExoticCell=0;
                break;
        case 1: 
+               if (!fUseExoticCell) fUseExoticCell=1;
                fExoticCell=5; 
                break;
        default:
@@ -1072,33 +1155,43 @@ Bool_t AliCaloPhotonCuts::SetMinEnergyCut(Int_t minEnergy)
 {
        switch(minEnergy){
        case 0: 
+               if (!fUseMinEnergy) fUseMinEnergy=0;
                fMinEnergy=0;
                break;
        case 1: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.05; 
                break;
        case 2: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.1; 
                break;
        case 3: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.15; 
                break;
        case 4: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.2; 
                break;
        case 5: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.3; 
                break;
        case 6: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.5; 
                break;
        case 7: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=0.75; 
                break;
        case 8: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=1.; 
                break;
        case 9: 
+               if (!fUseMinEnergy) fUseMinEnergy=1;
                fMinEnergy=1.25; 
                break;
        default:
@@ -1112,25 +1205,32 @@ Bool_t AliCaloPhotonCuts::SetMinEnergyCut(Int_t minEnergy)
 Bool_t AliCaloPhotonCuts::SetMinNCellsCut(Int_t minNCells)
 {
        switch(minNCells){
-       case 0: 
+       case 0:
+               if (!fUseNCells) fUseNCells=0;
                fMinNCells=0;
                break;
        case 1: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=1; 
                break;
        case 2: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=2; 
                break;
        case 3: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=3; 
                break;
        case 4: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=4; 
                break;
        case 5: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=5; 
                break;
        case 6: 
+               if (!fUseNCells) fUseNCells=1;
                fMinNCells=6; 
                break;
 
@@ -1146,21 +1246,25 @@ Bool_t AliCaloPhotonCuts::SetMaxM02(Int_t maxM02)
 {
        switch(maxM02){
        case 0: 
+               if (!fUseM02) fUseM02=0;
                fMaxM02=100;
                break;
        case 1: 
+               if (!fUseM02) fUseM02=1;
                fMaxM02=1.; 
                break;
        case 2: 
+               if (!fUseM02) fUseM02=1;
                fMaxM02=0.7; 
                break;
        case 3: 
+               if (!fUseM02) fUseM02=1;
                fMaxM02=0.5; 
                break;
        case 4: 
+               if (!fUseM02) fUseM02=1;
                fMaxM02=0.4; 
                break;
-
        default:
                AliError(Form("Max M02 Cut not defined %d",maxM02));
                return kFALSE;
@@ -1173,9 +1277,11 @@ Bool_t AliCaloPhotonCuts::SetMinM02(Int_t minM02)
 {
        switch(minM02){
        case 0: 
+               if (!fUseM02) fUseM02=0;
                fMinM02=0;
                break;
        case 1: 
+               if (!fUseM02) fUseM02=1;
                fMinM02=0.002; 
                break;
        default:
@@ -1190,9 +1296,11 @@ Bool_t AliCaloPhotonCuts::SetMaxM20(Int_t maxM20)
 {
        switch(maxM20){
        case 0: 
+               if (!fUseM20) fUseM20=0;
                fMaxM20=100;
                break;
        case 1: 
+               if (!fUseM20) fUseM20=1;
                fMaxM20=0.5; 
                break;
        default:
@@ -1207,9 +1315,11 @@ Bool_t AliCaloPhotonCuts::SetMinM20(Int_t minM20)
 {
        switch(minM20){
        case 0: 
+               if (!fUseM20) fUseM20=0;
                fMinM20=0;
                break;
        case 1: 
+               if (!fUseM20) fUseM20=1;
                fMinM20=0.002; 
                break;
        default:
@@ -1224,9 +1334,11 @@ Bool_t AliCaloPhotonCuts::SetDispersion(Int_t dispersion)
 {
        switch(dispersion){
        case 0: 
+               if (!fUseDispersion) fUseDispersion=0;
                fMaxDispersion =100;
                break;
        case 1: 
+               if (!fUseDispersion) fUseDispersion=1;
                fMaxDispersion=2.; 
                break;
        default:
@@ -1241,10 +1353,12 @@ Bool_t AliCaloPhotonCuts::SetNLM(Int_t nlm)
 {
        switch(nlm){
        case 0: 
+               if (!fUseNLM) fUseNLM=0;
                fMinNLM =0;
                fMaxNLM =100;
                break;
        case 1: 
+               if (!fUseNLM) fUseNLM=1;
                fMinNLM =0;
                fMaxNLM =1;
                break;

diff --git a/PWGGA/GammaConv/AliCaloPhotonCuts.h b/PWGGA/GammaConv/AliCaloPhotonCuts.h
index e02a9c8f02fc31b70b6b8f9ff327cfe27f1b6059..1216b964823d775c49ba7b3677390f5513ba3895 100644 (file)
--- a/PWGGA/GammaConv/AliCaloPhotonCuts.h
+++ b/PWGGA/GammaConv/AliCaloPhotonCuts.h
@@ -127,21 +127,33 @@ class AliCaloPhotonCuts : public AliAnalysisCuts {
                Int_t   fClusterType;                                           // which cluster do we have
                Double_t fMinEtaCut;                                            // min eta cut
                Double_t fMaxEtaCut;                                            // max eta cut
+               Bool_t fUseEtaCut;                                                      // flag for switching on eta cut
                Double_t fMinPhiCut;                                            // phi cut
                Double_t fMaxPhiCut;                                            // phi cut
+               Bool_t fUsePhiCut;                                                      // flag for switching on phi cut
                Double_t fMinDistanceToBadChannel;                      // minimum distance to bad channel
+               Bool_t fUseDistanceToBadChannel;                        // flag for switching on distance to bad channel cut
                Double_t fMaxTimeDiff;                                          // maximum time difference to triggered collision
+               Bool_t fUseTimeDiff;                                            // flag for switching on time difference cut
                Double_t fMinDistTrackToCluster;                        // minimum distance between track and cluster
+               Bool_t fUseDistTrackToCluster;                          // flag for switching on distance between track and cluster cut
                Double_t fExoticCell;                                           // exotic cell cut
+               Bool_t fUseExoticCell;                                          // flag for switching on exotic cell cut
                Double_t fMinEnergy;                                            // minium energy per cluster
+               Bool_t fUseMinEnergy;                                           // flag for switching on minimum energy cut
                Int_t fMinNCells;                                                       // minimum number of cells 
+               Bool_t fUseNCells;                                                      // flag for switching on minimum N Cells cut
                Double_t fMaxM02;                                                       // maximum M02
                Double_t fMinM02;                                                       // minimum M02
+               Bool_t fUseM02;                                                         // flag for switching on M02 cut
                Double_t fMaxM20;                                                       // maximum M20
                Double_t fMinM20;                                                       // minimum M20
+               Bool_t fUseM20;                                                         // flag for switching on M20 cut
                Double_t fMaxDispersion;                                        // maximum dispersion
+               Bool_t fUseDispersion;                                          // flag for switching on dispersion cut
                Int_t fMinNLM;                                                          // minimum number of local maxima in cluster
                Int_t fMaxNLM;                                                          // maximum number of local maxima in cluster
+               Bool_t fUseNLM;                                                         // flag for switching on NLM cut
                
                // CutString
                TObjString *fCutString;                                         // cut number used for analysis

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
index 6fd0adae66903774793f0bcb6d0922d9314368b1..f663be6229f508c955c8a6c12d639bace2fe5412 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
@@ -102,12 +102,20 @@ void AddTask_GammaConvCalo_PbPb(          Int_t trainConfig = 1,  //change different s
        // meson cuts
        // meson type (Dalitz or not), BG scheme, pool depth, rotation degrees, rapidity cut, radius cut, alpha, chi2, shared electrons, reject to close v0, MC smearing, dca, dca, dca
   
-       if (trainConfig == 1){ 
+       if (trainConfig == 1){ // EMCAL clusters
                cutarray[ 0] = "6010001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[ 0] = "01525065000000"; // 0-5%
                cutarray[ 1] = "6120001002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[ 1] = "01525065000000"; // 5-10%
                cutarray[ 2] = "5010001002092970028250400000"; clustercutarray[2] = "10000040022030000"; mesonCutArray[ 2] = "01525065000000"; // 0-10%
                cutarray[ 3] = "5240001002092970028250400000"; clustercutarray[3] = "10000040022030000"; mesonCutArray[ 3] = "01525065000000"; // 20-40%
                cutarray[ 4] = "5250001002092970028250400000"; clustercutarray[4] = "10000040022030000"; mesonCutArray[ 4] = "01525065000000"; // 20-50%
+       } else if (trainConfig == 2){ // PHOS clusters
+               cutarray[ 0] = "6010001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[ 0] = "01525065000000"; // 0-5%
+               cutarray[ 1] = "6120001002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[ 1] = "01525065000000"; // 5-10%
+               cutarray[ 2] = "5010001002092970028250400000"; clustercutarray[2] = "20000040022030000"; mesonCutArray[ 2] = "01525065000000"; // 0-10%
+               cutarray[ 3] = "5240001002092970028250400000"; clustercutarray[3] = "20000040022030000"; mesonCutArray[ 3] = "01525065000000"; // 20-40%
+               cutarray[ 4] = "5250001002092970028250400000"; clustercutarray[4] = "20000040022030000"; mesonCutArray[ 4] = "01525065000000"; // 20-50%
+
+               
        } else {
                Error(Form("GammaConvCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
index 94de2918b697b8590bff14283748742a3b8bf12e..537b2d43d1b21b2a351466a75b8f667b55c27465 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
@@ -105,8 +105,11 @@ void AddTask_GammaConvCalo_pPb(  Int_t trainConfig = 1,  //change different set
        // 9 "MinEnergy", 10 "MinNCells", 11 "MinM02", 12 "MaxM02", 13 "MinM20", 14 "MaxM20", 15 "MaximumDispersion", 16 "NLM"
        
        if (trainConfig == 1){ 
-               cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7
-               cutarray[ 1] = "8005201002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut, kEMC7
+               cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7 // EMCAL clusters
+               cutarray[ 1] = "8005201002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut, kEMC7 // EMCAL clusters
+       } else if (trainConfig == 2) {  
+               cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7 // PHOS clusters
+               cutarray[ 1] = "8006201002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut, kPHI7     // PHOS clusters        
        } else {
                Error(Form("GammaConvCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
index 915b2bc6baef1403202cfa61f6818d7c82c18a4f..6f53fb7184b4f57dc6cafa10a53e0638ad72ad2d 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
@@ -100,9 +100,15 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
        // meson type (Dalitz or not), BG scheme, pool depth, rotation degrees, rapidity cut, radius cut, alpha, chi2, shared electrons, reject to close v0, MC smearing, dca, dca, dca
        
        if (trainConfig == 1){ 
-               cutarray[ 0] = "0000001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[0] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kMB
-               cutarray[ 1] = "0005101002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kEMC1
-               cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "10000040022030000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR
+               cutarray[ 0] = "0000001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[0] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kMB // EMCAL clusters
+               cutarray[ 1] = "0005101002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kEMC1 // EMCAL clusters
+               cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "10000040022030000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR // EMCAL clusters
+       } else if (trainConfig == 2){ 
+               cutarray[ 0] = "0000001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[0] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kMB   // PHOS clusters
+               cutarray[ 1] = "0006101002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kPHI1 // PHOS clusters
+               cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "20000040022030000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR //PHOS clusters
+
+               
        } else {
                Error(Form("GammaConvCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;