change string of detector name to int

diff --git a/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx
index b97642f7795eee3f6d53c7207b47bde748b4575a..ad4f448e6dc9c2306b0d2012bbf641d09d85b16b 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx
+++ b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx
@@ -23,7 +23,6 @@
 #include <TLorentzVector.h>
 #include <TH2.h>
 #include <TList.h>
-#include <TString.h>
 
 //---- AliRoot system ----
 #include "AliNeutralMesonSelection.h" 
@@ -216,7 +215,7 @@ Bool_t AliNeutralMesonSelection::IsAngleInWindow(Float_t angle, Float_t e) const
 //_________________________________________________________________
 Bool_t  AliNeutralMesonSelection::SelectPair(TLorentzVector gammai, 
                                              TLorentzVector gammaj, 
-                                             TString calo)  
+                                             Int_t calo)
 {  
   
   //Search for the neutral pion within selection cuts
@@ -274,7 +273,8 @@ Bool_t  AliNeutralMesonSelection::SelectPair(TLorentzVector gammai,
   Float_t invmassRightBandMinCut = fRightBandMinCut;
   Float_t invmassRightBandMixCut = fRightBandMaxCut;
 
-  if(calo=="EMCAL" && e > 6.)
+  // kEMCAL=0, kPHOS=1
+  if(calo==0 && e > 6.)
   { // for EMCAL, pi0s, mass depends strongly with energy for e > 6, loose max cut
   
     invmassmaxcut = (fInvMassMaxCutParam[0]+fInvMassMaxCut)+fInvMassMaxCutParam[1]*e+fInvMassMaxCutParam[2]*e*e;

diff --git a/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h
index c5db9988eabb6d8808abf004012aa389411c4ca4..e70e364d964f44ee0fede57e4f2cd98b92066970 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h
+++ b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h
@@ -18,7 +18,6 @@
 class TLorentzVector ;
 class TList   ;
 class TH2F    ;
-class TString ;
 
 class AliNeutralMesonSelection : public TObject {
   
@@ -37,7 +36,7 @@ class AliNeutralMesonSelection : public TObject {
   Bool_t   AreNeutralMesonSelectionHistosKept()   const { return fKeepNeutralMesonHistos ; }
   void     KeepNeutralMesonSelectionHistos(Bool_t keep) { fKeepNeutralMesonHistos = keep ; }
   
-  Bool_t   SelectPair(TLorentzVector particlei,  TLorentzVector particlej, TString calo)  ;
+  Bool_t   SelectPair(TLorentzVector particlei,  TLorentzVector particlej, Int_t calo)  ;
   
   void     SetParticle(TString particleName) ;  // Do some default settings for "Pi0" or "Eta"
   TString  GetParticle()                          const { return fParticle               ; }