ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitPhysics/Utils/src/MVATools.cc
(Generate patch)

Comparing UserCode/MitPhysics/Utils/src/MVATools.cc (file contents):
Revision 1.2 by mingyang, Thu Oct 13 18:34:50 2011 UTC vs.
Revision 1.3 by fabstoec, Tue Oct 18 11:27:19 2011 UTC

# Line 116 | Line 116 | void MVATools::InitializeMVA(int Variabl
116  
117   //--------------------------------------------------------------------------------------------------
118  
119 < Bool_t MVATools::PassMVASelection(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els,double MVAPtMin, Float_t bdtCutBarrel, Float_t bdtCutEndcap) {
119 > Bool_t MVATools::PassMVASelection(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els,double MVAPtMin, Float_t bdtCutBarrel, Float_t bdtCutEndcap, Bool_t applyEleVeto) {
120    
121    // these values are taken from the H2GGlobe code... (actually from Marco/s mail)
122    float cic4_allcuts_temp_sublead[] = {
# Line 143 | Line 143 | Bool_t MVATools::PassMVASelection(const
143    
144    wVtxInd = 0;
145    
146 <  trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol);//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
146 >  trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyEleVeto ? els : NULL) );//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
147    
148    // track iso only
149 <  trackIso3 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol);
149 >  trackIso3 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyEleVeto ? els : NULL));
150    
151    // track iso worst vtx
152 <  trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol);
152 >  trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol, (!applyEleVeto ? els : NULL));
153    
154    combIso1 = ecalIso3+hcalIso4+trackIso1 - 0.17*_tRho;
155    combIso2 = ecalIso4+hcalIso4+trackIso2 - 0.52*_tRho;
# Line 200 | Line 200 | Bool_t MVATools::PassMVASelection(const
200    if ( !isbarrel ) _tCat = 3;
201    if ( R9 < 0.94 ) _tCat++;
202    
203 <  //Electron Veto
204 <  if(dRTrack > cic4_allcuts_temp_sublead[_tCat-1+6*4]){
203 >  //Electron Veto (made electron Veto optinal (Fabian) )
204 >  if(dRTrack > cic4_allcuts_temp_sublead[_tCat-1+6*4] || !applyEleVeto ){
205      PassElecVeto=kTRUE;
206    }
207    

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines