ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitPhysics/Utils/src/ElectronIDMVA.cc

Comparing UserCode/MitPhysics/Utils/src/ElectronIDMVA.cc (file contents):
Revision 1.22 by ceballos, Mon May 7 18:05:52 2012 UTC vs.
Revision 1.23 by ceballos, Sat May 12 07:03:53 2012 UTC

#	Line 685 | Line 685 | Double_t ElectronIDMVA::MVAValue_IDNonTr
685		return mva;
686		}
687
688	–
688		//--------------------------------------------------------------------------------------------------
689		Double_t ElectronIDMVA::MVAValue(const Electron *ele, const Vertex *vertex,
690		const PFCandidateCol *PFCands,
#	Line 699 | Line 698 | Double_t ElectronIDMVA::MVAValue(const E
698		}
699
700		Double_t Rho = 0;
701	<	switch(fTheRhoType) {
701	>	switch(fTheRhoType) {
702		case RhoUtilities::MIT_RHO_VORONOI_HIGH_ETA:
703		Rho = PileupEnergyDensity->At(0)->Rho();
704		break;
#	Line 734 | Line 733 | Double_t ElectronIDMVA::MVAValue(const E
733		if (!TMath::IsNaN(ele->SCluster()->Seed()->CoviPhiiPhi())) fMVAVar_EleSigmaIPhiIPhi = TMath::Sqrt(ele->SCluster()->Seed()->CoviPhiiPhi());
734		else fMVAVar_EleSigmaIPhiIPhi = ele->CoviEtaiEta();
735		fMVAVar_EleNBrem = ele->NumberOfClusters() - 1;
736	<	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->SCluster()->Energy())) - 1.0 / ele->BestTrk()->P();
736	>	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->CorrectedEcalEnergy())) - 1.0 / ele->BestTrk()->P();
737		fMVAVar_EleESeedClusterOverPIn = ele->ESeedClusterOverPIn();
738		fMVAVar_EleIP3d = ele->Ip3dPV();
739		fMVAVar_EleIP3dSig = ele->Ip3dPVSignificance();
#	Line 852 | Line 851 | Double_t ElectronIDMVA::MVAValue(const E
851		if (!TMath::IsNaN(ele->SCluster()->Seed()->CoviPhiiPhi())) fMVAVar_EleSigmaIPhiIPhi = TMath::Sqrt(ele->SCluster()->Seed()->CoviPhiiPhi());
852		else fMVAVar_EleSigmaIPhiIPhi = ele->CoviEtaiEta();
853		fMVAVar_EleNBrem = ele->NumberOfClusters() - 1;
854	<	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->SCluster()->Energy())) - 1.0 / ele->BestTrk()->P();
854	>	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->CorrectedEcalEnergy())) - 1.0 / ele->BestTrk()->P();
855		fMVAVar_EleESeedClusterOverPIn = ele->ESeedClusterOverPIn();
856		fMVAVar_EleIP3d = ele->Ip3dPV();
857		fMVAVar_EleIP3dSig = ele->Ip3dPVSignificance();
#	Line 874 | Line 873 | Double_t ElectronIDMVA::MVAValue(const E
873		fMVAVar_EleR9 = ele->SCluster()->R9();
874		fMVAVar_EleHoverE = ele->HadronicOverEm();
875		fMVAVar_EleEOverP = ele->ESuperClusterOverP();
876	<	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->SCluster()->Energy())) - 1.0 / ele->BestTrk()->P();
876	>	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->CorrectedEcalEnergy())) - 1.0 / ele->BestTrk()->P();
877		fMVAVar_EleR9 = ele->SCluster()->R9();
878		fMVAVar_ElePreShowerOverRaw = ele->SCluster()->PreshowerEnergy() / ele->SCluster()->RawEnergy();
879
#	Line 980 | Line 979 | Double_t ElectronIDMVA::MVAValue(const E
979		fMVAVar_EleFBrem = TMath::Max(double(ele->FBrem()),-1.0);
980		fMVAVar_EleEOverP = TMath::Min(double(ele->ESuperClusterOverP()), 20.0);
981		fMVAVar_EleESeedClusterOverPout = TMath::Min(double(ele->ESeedClusterOverPout()),20.0);
982	<	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->SCluster()->Energy())) - 1.0 / ele->P();
982	>	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->CorrectedEcalEnergy())) - 1.0 / ele->P();
983		fMVAVar_EleGsfTrackChi2OverNdof = TMath::Min(double( ele->BestTrk()->Chi2() / ele->BestTrk()->Ndof()),200.0);
984		fMVAVar_EledEtaCalo =  TMath::Min(fabs(double(ele->DeltaEtaSeedClusterTrackAtCalo())),0.2);
985		fMVAVar_EleR9 = TMath::Min(double(ele->SCluster()->R9()), 5.0);
#	Line 990 | Line 989 | Double_t ElectronIDMVA::MVAValue(const E
989		fMVAVar_EleFBrem = ele->FBrem();
990		fMVAVar_EleEOverP = ele->ESuperClusterOverP();
991		fMVAVar_EleESeedClusterOverPout = ele->ESeedClusterOverPout();
992	<	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->SCluster()->Energy())) - 1.0 / ele->BestTrk()->P();
992	>	fMVAVar_EleOneOverEMinusOneOverP = (1.0/(ele->CorrectedEcalEnergy())) - 1.0 / ele->BestTrk()->P();
993		fMVAVar_EleGsfTrackChi2OverNdof = ele->BestTrk()->Chi2() / ele->BestTrk()->Ndof();
994		fMVAVar_EledEtaCalo =  ele->DeltaEtaSeedClusterTrackAtCalo();
995		fMVAVar_EleR9 = ele->SCluster()->R9();
#	Line 1206 | Line 1205 | Double_t ElectronIDMVA::MVAValue(const E
1205		<< " IoEmIoP " << fMVAVar_EleOneOverEMinusOneOverP
1206		<< " eleEoPout " << fMVAVar_EleEEleClusterOverPout
1207		<< " EoPout " << fMVAVar_EleESeedClusterOverPout
1208	+	<< " PreShowerOverRaw" << fMVAVar_ElePreShowerOverRaw
1209		<< " d0 " << fMVAVar_EleD0
1210		<< " ip3d " << fMVAVar_EleIP3d
1211		<< " eta " << fMVAVar_EleEta

Diff Legend

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