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.21 by mingyang, Tue Jul 30 21:08:50 2013 UTC vs.
Revision 1.22 by mingyang, Sat Nov 9 15:06:27 2013 UTC

# Line 199 | Line 199 | void MVATools::InitializeMVA(MVATools::I
199  
200      break;
201  
202 <  case k2013FinalIdMVA:
202 >  case k2013FinalIdMVA_8TeV:
203      
204      EndcapWeights =      (gSystem->Getenv("CMSSW_BASE")+
205 <                          TString("/src/MitPhysics/data/")+
206 <                          TString("2013FinalPaper_PhotonID_Endcap_BDT_TrainRangePT15.")+
205 >                          TString("/src/MitPhysics/data/2013FinalPaper_PhotonID_Weight/8TeV/")+
206 >                          TString("2013FinalPaper_PhotonID_Endcap_BDT_TrainRangePT15_8TeV.")+
207                            TString("weights.xml"));
208      BarrelWeights =      (gSystem->Getenv("CMSSW_BASE")+
209 <                          TString("/src/MitPhysics/data/")+
210 <                          TString("2013FinalPaper_PhotonID_Barrel_BDT_TrainRangePT15.")+
209 >                          TString("/src/MitPhysics/data/2013FinalPaper_PhotonID_Weight/8TeV/")+
210 >                          TString("2013FinalPaper_PhotonID_Barrel_BDT_TrainRangePT15_8TeV.")+
211 >                          TString("weights.xml"));
212 >
213 >    mvaVars.resize(13);
214 >    varNames.push_back("ph.scrawe"                    );
215 >    varNames.push_back("ph.r9"                        );
216 >    varNames.push_back("ph.sigietaieta"               );
217 >    varNames.push_back("ph.scetawidth"                );
218 >    varNames.push_back("ph.scphiwidth"                );
219 >    varNames.push_back("ph.idmva_CoviEtaiPhi"         );
220 >    varNames.push_back("ph.idmva_s4ratio"             );
221 >    varNames.push_back("ph.idmva_GammaIso"            );
222 >    varNames.push_back("ph.idmva_ChargedIso_selvtx"   );
223 >    varNames.push_back("ph.idmva_ChargedIso_worstvtx" );
224 >    varNames.push_back("ph.sceta"                     );
225 >    varNames.push_back("rho"                          );
226 >    varNames.push_back("ph.idmva_PsEffWidthSigmaRR"   );
227 >
228 >    for( unsigned int iV = 0; iV < mvaVars.size() - 1; ++iV) {
229 >      mvaVarMapEB.insert(  std::pair<std::string,unsigned int>(varNames[iV], iV) );
230 >      mvaVarMapEE.insert(  std::pair<std::string,unsigned int>(varNames[iV], iV) );
231 >    }
232 >    
233 >    // pre-shower only used for Endcaps
234 >    mvaVarMapEE.insert( std::pair<std::string,unsigned int> ( varNames[mvaVars.size() - 1], mvaVars.size() - 1) );
235 >
236 >    break;
237 >
238 >  case k2013FinalIdMVA_7TeV:
239 >    
240 >    EndcapWeights =      (gSystem->Getenv("CMSSW_BASE")+
241 >                          TString("/src/MitPhysics/data/2013FinalPaper_PhotonID_Weight/7TeV/")+
242 >                          TString("2013FinalPaper_PhotonID_Endcap_BDT_TrainRangePT15_7TeV.")+
243 >                          TString("weights.xml"));
244 >    BarrelWeights =      (gSystem->Getenv("CMSSW_BASE")+
245 >                          TString("/src/MitPhysics/data/2013FinalPaper_PhotonID_Weight/7TeV/")+
246 >                          TString("2013FinalPaper_PhotonID_Barrel_BDT_TrainRangePT15_7TeV.")+
247                            TString("weights.xml"));
248  
249      mvaVars.resize(13);
# Line 496 | Line 532 | void MVATools::InitializeMVA(MVATools::I
532   Double_t MVATools::GetMVAbdtValue(const Photon* p, const Vertex* vtx, const TrackCol* trackCol, const VertexCol* vtxCol, Double_t _tRho, const PFCandidateCol *fPFCands, const ElectronCol* els, Bool_t applyElectronVeto) {
533  
534    // if there's no reader, or the type is kNone, return the default values of -99.
535 +  //if( ( !fReaderBarrel || !fReaderEndcap ) ) return -199.;
536    if( ( !fReaderBarrel || !fReaderEndcap ) || fMVAType == kNone ) return -99.;
537  
538    // we compute the variable names... make sure no confilcts when adding new variables...

Diff Legend

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