ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.cc

Comparing UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.cc (file contents):
Revision 1.116 by wulsin, Sun Aug 4 21:17:37 2013 UTC vs.
Revision 1.122 by jbrinson, Fri Aug 9 11:12:33 2013 UTC

#	Line 127 | Line 127 | OSUAnalysis::OSUAnalysis (const edm::Par
127		if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
128		if(tempInputCollection.find("pairs")==string::npos){ //just a single object
129		if(tempInputCollection.find("secondary")!=string::npos){//secondary object
130	<	int spaceIndex = tempInputCollection.find(" ");
131	<	int secondWordLength = tempInputCollection.size() - spaceIndex;
132	<	objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
133	<	}
134	<	else{
130	>	if(tempInputCollection.find("secondary muons")!=string::npos){//treat secondary muons differently; allow for a different input collection
131	>	objectsToGet.push_back("secondary muons");
132	>	} else {
133	>	int spaceIndex = tempInputCollection.find(" ");
134	>	int secondWordLength = tempInputCollection.size() - spaceIndex;
135	>	objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
136	>	}
137	>	} else{
138		objectsToGet.push_back(tempInputCollection);
139		}
140		objectsToPlot.push_back(tempInputCollection);
#	Line 171 | Line 174 | OSUAnalysis::OSUAnalysis (const edm::Par
174		tempHistogram.variableBinsY = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("variableBinsY", defaultValue);
175		tempHistogram.inputVariables = histogramList_.at(currentHistogram).getParameter<vector<string> >("inputVariables");
176
177	<	histograms.push_back(tempHistogram);
177	>	bool histExists = false;
178	>	for (uint i=0; i<histograms.size(); i++) {
179	>	if (histograms.at(i).name == tempHistogram.name) { histExists = true; break; }
180	>	}
181	>	if (histExists) {
182	>	clog << "Warning:  histogram " << tempHistogram.name << " already exists; will not book an additional instance." << endl;
183	>	} else {
184	>	histograms.push_back(tempHistogram);
185	>	}
186
187		}
188		} //   for(uint currentHistogramSet = 0; currentHistogramSet != histogramSets_.size(); currentHistogramSet++)
#	Line 620 | Line 631 | OSUAnalysis::OSUAnalysis (const edm::Par
631		else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
632		else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
633		else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
634	+	else if(currentObject == "secondary muon-track pairs") currentObject = "secondaryMuonTrackPairs";
635		else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
636		else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
637		else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
#	Line 984 | Line 996 | OSUAnalysis::produce (edm::Event &event,
996		else if(currentObject == "track-event pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(), "track-event pairs");
997		else if(currentObject == "electron-track pairs")    setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),"electron-track pairs");
998		else if(currentObject == "muon-track pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),"muon-track pairs");
999	+	else if(currentObject == "secondary muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,secMuons.product(),tracks.product(),"secondary muon-track pairs");
1000		else if(currentObject == "muon-tau pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),"muon-tau pairs");
1001		else if(currentObject == "tau-tau pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),"tau-tau pairs");
1002		else if(currentObject == "tau-track pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),"tau-track pairs");
#	Line 1200 | Line 1213 | OSUAnalysis::produce (edm::Event &event,
1213		cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1214		else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
1215		cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1216	+	else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill1DHistogram(histo,currentHistogram, secMuons.product(),tracks.product(),
1217	+	cumulativeFlags.at("secondary muon-track pairs").at(currentDir),scaleFactor);
1218		else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
1219		cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1220		else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
#	Line 1274 | Line 1289 | OSUAnalysis::produce (edm::Event &event,
1289		cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1290		else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
1291		cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1292	+	else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill2DHistogram(histo,currentHistogram,secMuons.product(),tracks.product(),
1293	+	cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1294		else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
1295		cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1296		else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
#	Line 1329 | Line 1346 | OSUAnalysis::produce (edm::Event &event,
1346		else if(currentObject == "secondary photons")                  objectToPlot = "secondaryPhotons";
1347		else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
1348		else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
1349	+	else if(currentObject == "secondary muon-track pairs")         objectToPlot = "secondaryMuonTrackPairs";
1350		else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
1351		else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
1352		else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
#	Line 1680 | Line 1698 | OSUAnalysis::valueLookup (const BNjet* o
1698		}
1699
1700
1701	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1701	>	else{clog << "WARNING: invalid jet variable '" << variable << "'\n"; value = -999;}
1702
1703		value = applyFunction(function, value);
1704
#	Line 1855 | Line 1873 | OSUAnalysis::valueLookup (const BNmuon*
1873
1874		//user-defined variables
1875		else if(variable == "looseID") {
1876	<	value = object->pt > 10 &&
1876	>	value = object->pt > 10 &&
1877		(object->isGlobalMuon  > 0 ||
1878		object->isTrackerMuon > 0);
1879		}
1880	+
1881		else if(variable == "looseIDGlobalMuon") {
1882		value = object->pt > 10 &&
1883		object->isGlobalMuon  > 0;
#	Line 2076 | Line 2095 | OSUAnalysis::valueLookup (const BNmuon*
2095
2096
2097
2098	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2098	>	else{clog << "WARNING: invalid muon variable '" << variable << "'\n"; value = -999;}
2099
2100		value = applyFunction(function, value);
2101
#	Line 2523 | Line 2542 | OSUAnalysis::valueLookup (const BNelectr
2542
2543
2544
2545	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2545	>	else{clog << "WARNING: invalid electron variable '" << variable << "'\n"; value = -999;}
2546
2547		value = applyFunction(function, value);
2548
#	Line 2641 | Line 2660 | OSUAnalysis::valueLookup (const BNevent*
2660		pt0 += pt1;
2661		value = pt0.Mod ();
2662		}
2663	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2663	>	else{clog << "WARNING: invalid event variable '" << variable << "'\n"; value = -999;}
2664
2665		value = applyFunction(function, value);
2666
#	Line 2696 | Line 2715 | OSUAnalysis::valueLookup (const BNtau* o
2715		else if(variable == "leadingTrackValid") value = object->leadingTrackValid;
2716
2717		else if (variable == "looseHadronicID") {
2718	<	value = object->pt > 10
2719	<	&& object->eta < 2.3
2718	>	//criteria taken from http://cms.cern.ch/iCMS/jsp/db_notes/showNoteDetails.jsp?noteID=CMS%20AN-2011/019
2719	>	value = object->pt > 30
2720	>	&& fabs(object->eta) < 2.3
2721		&& object->HPSbyLooseCombinedIsolationDeltaBetaCorr > 0
2722		&& object->HPSdecayModeFinding > 0
2723		&& object->HPSagainstElectronLoose > 0
#	Line 2749 | Line 2769 | OSUAnalysis::valueLookup (const BNtau* o
2769		}
2770
2771
2772	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2772	>	else{clog << "WARNING: invalid tau variable '" << variable << "'\n"; value = -999;}
2773
2774		value = applyFunction(function, value);
2775
#	Line 2823 | Line 2843 | OSUAnalysis::valueLookup (const BNmet* o
2843		else if(variable == "pfT1jet10pt") value = object->pfT1jet10pt;
2844		else if(variable == "pfT1jet10phi") value = object->pfT1jet10phi;
2845
2846	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2846	>	else{clog << "WARNING: invalid met variable '" << variable << "'\n"; value = -999;}
2847
2848		value = applyFunction(function, value);
2849
#	Line 2972 | Line 2992 | OSUAnalysis::valueLookup (const BNtrack*
2992		value = trkJetDeltaRMin;
2993		}
2994
2995	+	else if(variable == "deltaRMinElecLooseMvaId") {
2996	+	// calculate minimum deltaR between track and any other electron passing loose mva ID, i.e., mvaNonTrigV0 > 0
2997	+	double trkElecDeltaRMin = 99.;
2998	+	for (uint ielec = 0; ielec<electrons->size(); ielec++) {
2999	+	string empty = "";
3000	+	double mvaNonTrigV0 = valueLookup(&electrons->at(ielec), "mvaNonTrigV0", "", empty);
3001	+	if (mvaNonTrigV0 < 0) continue;  // only consider electrons with mvaNonTrigV0 > 0
3002	+	double elecEta = valueLookup(&electrons->at(ielec), "eta", "", empty);
3003	+	double elecPhi = valueLookup(&electrons->at(ielec), "phi", "", empty);
3004	+	double trkElecDeltaR = deltaR(object->eta, object->phi, elecEta, elecPhi);
3005	+	if (trkElecDeltaR < trkElecDeltaRMin) trkElecDeltaRMin = trkElecDeltaR;
3006	+	}
3007	+	value = trkElecDeltaRMin;
3008	+	}
3009	+
3010	+	else if(variable == "deltaRMinMuonLooseId") {
3011	+	// calculate minimum deltaR between track and any other loose-Id muon
3012	+	double trkMuonDeltaRMin = 99.;
3013	+	//    if (!muons) cout << "ERROR:  could not find muon collection for calculation of deltaRMinMuonLooseId" << endl;
3014	+	for (uint imuon = 0; imuon<muons->size(); imuon++) {
3015	+	string empty = "";
3016	+	double isLooseIdMuon = valueLookup(&muons->at(imuon), "looseID", "", empty);
3017	+	if (!isLooseIdMuon) continue;  // only consider muons that pass the looseID criteria
3018	+	double muonEta = valueLookup(&muons->at(imuon), "eta", "", empty);
3019	+	double muonPhi = valueLookup(&muons->at(imuon), "phi", "", empty);
3020	+	double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);
3021	+	if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3022	+	}
3023	+	value = trkMuonDeltaRMin;
3024	+	}
3025	+
3026	+	else if(variable == "isPassMuonLooseIDVeto") {
3027	+
3028	+	// calculate minimum deltaR between track and any other loose-Id
3029	+	double trkMuonDeltaRMin = 99.;
3030	+	//    if (!muons) cout << "ERROR:  could not find muon collection for calculation of deltaRMinMuonLooseId" <<
3031	+	for (uint imuon = 0; imuon<muons->size(); imuon++) {
3032	+	string empty = "";
3033	+	double isLooseIdMuon = valueLookup(&muons->at(imuon), "looseID", "", empty);
3034	+	if (!isLooseIdMuon) continue;  // only consider muons that pass the looseID
3035	+	double muonEta = valueLookup(&muons->at(imuon), "eta", "", empty);
3036	+	double muonPhi = valueLookup(&muons->at(imuon), "phi", "", empty);
3037	+	double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);
3038	+	if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3039	+	}
3040	+	if (trkMuonDeltaRMin  < 0.15) value = 1;
3041	+	if (trkMuonDeltaRMin  > 0.15) value = 0;
3042	+	}
3043	+
3044	+
3045	+
3046	+	else if(variable == "deltaRMinSecMuonLooseIdGlobal") {
3047	+	// calculate minimum deltaR between track and any other loose-Id muon
3048	+	double trkMuonDeltaRMin = 99.;
3049	+	//    if (!secMuons) cout << "ERROR:  could not find secondary muon collection for calculation of deltaRMinSecMuonLooseIdGlobal" << endl;
3050	+	for (uint imuon = 0; imuon<secMuons->size(); imuon++) {
3051	+	string empty = "";
3052	+	double isLooseIdMuon = valueLookup(&secMuons->at(imuon), "looseIDGlobalMuon", "", empty);
3053	+	if (!isLooseIdMuon) continue;  // only consider muons that pass the looseIDGlobal criteria
3054	+	double muonEta = valueLookup(&secMuons->at(imuon), "eta", "", empty);
3055	+	double muonPhi = valueLookup(&secMuons->at(imuon), "phi", "", empty);
3056	+	double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);
3057	+	if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3058	+	}
3059	+	value = trkMuonDeltaRMin;
3060	+	}
3061	+
3062	+	else if(variable == "deltaRMinTauLooseHadronicId") {
3063	+	// calculate minimum deltaR between track and any other tau passing loose hadronic ID
3064	+	double trkTauDeltaRMin = 99.;
3065	+	//    if (!taus) cout << "ERROR:  could not find tau collection for calculation of deltaRMinTauLooseHadronicId" << endl;
3066	+	for (uint itau = 0; itau<taus->size(); itau++) {
3067	+	string empty = "";
3068	+	double isIdTau = valueLookup(&taus->at(itau), "looseHadronicID", "", empty);
3069	+	if (!isIdTau) continue;  // only consider taus that pass the loose hadronic ID criteria
3070	+	double tauEta = valueLookup(&taus->at(itau), "eta", "", empty);
3071	+	double tauPhi = valueLookup(&taus->at(itau), "phi", "", empty);
3072	+	double trkTauDeltaR = deltaR(object->eta, object->phi, tauEta, tauPhi);
3073	+	if (trkTauDeltaR < trkTauDeltaRMin) trkTauDeltaRMin = trkTauDeltaR;
3074	+	}
3075	+	value = trkTauDeltaRMin;
3076	+	}
3077	+
3078		else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
3079
3080		else if(variable == "genMatchedPdgId"){
#	Line 3019 | Line 3122 | OSUAnalysis::valueLookup (const BNtrack*
3122
3123
3124
3125	<	else{clog << "WARNING: invalid variable '" << variable << "' for BNtrack collection.\n"; value = -999;}
3125	>	else{clog << "WARNING: invalid track variable '" << variable << "'\n"; value = -999;}
3126
3127		value = applyFunction(function, value);
3128
#	Line 3049 | Line 3152 | OSUAnalysis::valueLookup (const BNgenjet
3152		else if(variable == "charge") value = object->charge;
3153
3154
3155	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3155	>	else{clog << "WARNING: invalid genjet variable '" << variable << "'\n"; value = -999;}
3156
3157		value = applyFunction(function, value);
3158
#	Line 3183 | Line 3286 | OSUAnalysis::valueLookup (const BNmcpart
3286		}
3287
3288
3289	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3289	>	else{clog << "WARNING: invalid mcparticle variable '" << variable << "'\n"; value = -999;}
3290
3291		value = applyFunction(function, value);
3292
#	Line 3212 | Line 3315 | OSUAnalysis::valueLookup (const BNprimar
3315		else if(variable == "isGood") value = object->isGood;
3316
3317
3318	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3318	>	else{clog << "WARNING: invalid primaryvertex variable '" << variable << "'\n"; value = -999;}
3319
3320		value = applyFunction(function, value);
3321
#	Line 3230 | Line 3333 | OSUAnalysis::valueLookup (const BNbxlumi
3333		else if(variable == "bx_LUMI_now") value = object->bx_LUMI_now;
3334
3335
3336	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3336	>	else{clog << "WARNING: invalid bxlumi variable '" << variable << "'\n"; value = -999;}
3337
3338		value = applyFunction(function, value);
3339
#	Line 3363 | Line 3466 | OSUAnalysis::valueLookup (const BNphoton
3466		}
3467
3468
3469	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3469	>	else{clog << "WARNING: invalid photon variable '" << variable << "'\n"; value = -999;}
3470
3471		value = applyFunction(function, value);
3472
#	Line 3387 | Line 3490 | OSUAnalysis::valueLookup (const BNsuperc
3490		else if(variable == "theta") value = object->theta;
3491
3492
3493	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3493	>	else{clog << "WARNING: invalid supercluster variable '" << variable << "'\n"; value = -999;}
3494
3495		value = applyFunction(function, value);
3496
#	Line 3421 | Line 3524 | OSUAnalysis::valueLookup (const BNtrigob
3524		stringValue = "none";  // stringValue should only be empty if value is filled
3525		}
3526
3527	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3527	>	else{clog << "WARNING: invalid trigobj variable '" << variable << "'\n"; value = -999;}
3528
3529		value = applyFunction(function, value);
3530
#	Line 3492 | Line 3595 | OSUAnalysis::valueLookup (const BNmuon*
3595		value = object2->correctedD0;
3596		}
3597
3598	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3598	>	else{clog << "WARNING: invalid muon-muon pair variable '" << variable << "'\n"; value = -999;}
3599
3600		value = applyFunction(function, value);
3601
#	Line 3539 | Line 3642 | OSUAnalysis::valueLookup (const BNmuon*
3642		TVector3 threeVector2(object2->px, object2->py, object2->pz);
3643		value = (pi-threeVector1.Angle(threeVector2));
3644		}
3645	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3645	>	else{clog << "WARNING: invalid muon-photon pair variable '" << variable << "'\n"; value = -999;}
3646
3647		value = applyFunction(function, value);
3648
3649		return value;
3650	<	}
3650	>	} // end muon-photon pair valueLookup
3651	>
3652
3653		//!electron-photon pair valueLookup
3654		double
#	Line 3585 | Line 3689 | OSUAnalysis::valueLookup (const BNelectr
3689		TVector3 threeVector2(object2->px, object2->py, object2->pz);
3690		value = (pi-threeVector1.Angle(threeVector2));
3691		}
3692	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3692	>	else{clog << "WARNING: invalid electron-photon pair variable '" << variable << "'\n"; value = -999;}
3693
3694		value = applyFunction(function, value);
3695
3696		return value;
3697	<	}
3697	>	} // end electron-photon pair valueLookup
3698	>
3699
3700		//!electron-electron pair valueLookup
3701		double
#	Line 3641 | Line 3746 | OSUAnalysis::valueLookup (const BNelectr
3746		value = object2->correctedD0;
3747		}
3748
3749	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3749	>	else{clog << "WARNING: invalid electron-electron pair variable '" << variable << "'\n"; value = -999;}
3750
3751		value = applyFunction(function, value);
3752
3753		return value;
3754	<	}
3754	>	} // end electron-electron pair valueLookup
3755	>
3756
3757		//!electron-muon pair valueLookup
3758		double
#	Line 3708 | Line 3814 | OSUAnalysis::valueLookup (const BNelectr
3814		else if(variable == "muonRelPFdBetaIso"){
3815		value = (object2->pfIsoR04SumChargedHadronPt + max(0.0, object2->pfIsoR04SumNeutralHadronEt + object2->pfIsoR04SumPhotonEt - 0.5*object2->pfIsoR04SumPUPt)) / object2->pt;
3816		}
3817	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3817	>	else{clog << "WARNING: invalid electron-muon pair variable '" << variable << "'\n"; value = -999;}
3818		value = applyFunction(function, value);
3819
3820		return value;
#	Line 3748 | Line 3854 | OSUAnalysis::valueLookup (const BNelectr
3854		value = object1->charge*object2->charge;
3855		}
3856
3857	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3857	>	else{clog << "WARNING: invalid electron-jet pair variable '" << variable << "'\n"; value = -999;}
3858		value = applyFunction(function, value);
3859
3860		return value;
#	Line 3773 | Line 3879 | OSUAnalysis::valueLookup (const BNelectr
3879		value = object1->charge*object2->charge;
3880		}
3881
3882	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3882	>	else{clog << "WARNING: invalid electron-mcparticle variable '" << variable << "'\n"; value = -999;}
3883		value = applyFunction(function, value);
3884
3885		return value;
#	Line 3810 | Line 3916 | OSUAnalysis::valueLookup (const BNphoton
3916		TVector3 threeVector2(object2->px, object2->py, object2->pz);
3917		value = (threeVector1.Angle(threeVector2));
3918		}
3919	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3919	>	else{clog << "WARNING: invalid photon-jet pair variable '" << variable << "'\n"; value = -999;}
3920		value = applyFunction(function, value);
3921
3922		return value;
#	Line 3825 | Line 3931 | OSUAnalysis::valueLookup (const BNtrack*
3931		if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3932		else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3933
3934	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3934	>	else{clog << "WARNING: invalid track-jet pair variable '" << variable << "'\n"; value = -999;}
3935		value = applyFunction(function, value);
3936
3937		return value;
#	Line 3842 | Line 3948 | OSUAnalysis::valueLookup (const BNmet* o
3948
3949		if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3950
3951	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3951	>	else{clog << "WARNING: invalid met-jet pair variable '" << variable << "'\n"; value = -999;}
3952		value = applyFunction(function, value);
3953
3954		return value;
#	Line 3888 | Line 3994 | OSUAnalysis::valueLookup (const BNmuon*
3994		value = object1->charge*object2->charge;
3995		}
3996
3997	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3997	>	else{clog << "WARNING: invalid muon-jet pair variable '" << variable << "'\n"; value = -999;}
3998		value = applyFunction(function, value);
3999
4000		return value;
4001	<	}
4001	>	} // end muon-jet pair valueLookup
4002	>
4003
4004		//!muon-event valueLookup
4005		double
#	Line 3906 | Line 4013 | OSUAnalysis::valueLookup (const BNmuon*
4013		else if(variable == "Ht") value = getHt(jets.product());
4014		else if(variable == "pthat")   value = object2->pthat;
4015		else if(variable == "relPFdBetaIso") value = (object1->pfIsoR04SumChargedHadronPt + max(0.0, object1->pfIsoR04SumNeutralHadronEt + object1->pfIsoR04SumPhotonEt - 0.5*object1->pfIsoR04SumPUPt)) / object1->pt;
4016	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4016	>	else{clog << "WARNING: invalid muon-event pair variable '" << variable << "'\n"; value = -999;}
4017		value = applyFunction(function, value);
4018
4019		return value;
#	Line 3941 | Line 4048 | OSUAnalysis::valueLookup (const BNjet* o
4048		value = object1->charge*object2->charge;
4049		}
4050
4051	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4051	>	else{clog << "WARNING: invalid jet-jet pair variable '" << variable << "'\n"; value = -999;}
4052		value = applyFunction(function, value);
4053
4054		return value;
#	Line 3972 | Line 4079 | OSUAnalysis::valueLookup (const BNelectr
4079		else if(variable == "chargeProduct"){
4080		value = object1->charge*object2->charge;
4081		}
4082	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4082	>	else{clog << "WARNING: invalid electron-track pair variable '" << variable << "'\n"; value = -999;}
4083		value = applyFunction(function, value);
4084		return value;
4085
#	Line 3982 | Line 4089 | OSUAnalysis::valueLookup (const BNelectr
4089		//!muon-track pair valueLookup
4090		double
4091		OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3985	–	double pionMass = 0.140;
3986	–	double muonMass = 0.106;
4092		double value = 0.0;
3988	–	TLorentzVector fourVector1(0, 0, 0, 0);
3989	–	TLorentzVector fourVector2(0, 0, 0, 0);
4093		if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4094		else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4095		else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
#	Line 3997 | Line 4100 | OSUAnalysis::valueLookup (const BNmuon*
4100		if (isLooseId) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4101		else           value = 99.;
4102		}
4103	+	else if(variable == "deltaRGlobalMuon") {
4104	+	// only consider muons that pass looseId criteria; otherwise return very large value (99.)
4105	+	if (object1->isGlobalMuon) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4106	+	else                       value = 99.;
4107	+	}
4108		else if(variable == "invMass"){
4109	+	double pionMass = 0.140;
4110	+	double muonMass = 0.106;
4111	+	TLorentzVector fourVector1(0, 0, 0, 0);
4112	+	TLorentzVector fourVector2(0, 0, 0, 0);
4113		fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, muonMass);
4114		fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
4003	–
4115		value = (fourVector1 + fourVector2).M();
4116		}
4117		else if(variable == "chargeProduct"){
4118		value = object1->charge*object2->charge;
4119		}
4120
4121	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4121	>	else{clog << "WARNING: invalid muon-track pair variable '" << variable << "'\n"; value = -999;}
4122		value = applyFunction(function, value);
4123		return value;
4124		}
#	Line 4029 | Line 4140 | OSUAnalysis::valueLookup (const BNtau* o
4140		value = object1->charge*object2->charge;
4141		}
4142
4143	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4143	>	else{clog << "WARNING: invalid tau-tau pair variable '" << variable << "'\n"; value = -999;}
4144		value = applyFunction(function, value);
4145		return value;
4146		}
#	Line 4051 | Line 4162 | OSUAnalysis::valueLookup (const BNmuon*
4162		value = object1->charge*object2->charge;
4163		}
4164
4165	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4165	>	else{clog << "WARNING: invalid muon-tau pair variable '" << variable << "'\n"; value = -999;}
4166		value = applyFunction(function, value);
4167		return value;
4168		}
#	Line 4070 | Line 4181 | OSUAnalysis::valueLookup (const BNtau* o
4181		if (isLooseHadronicID) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4182		else                   value = 99.;
4183		}
4184	+	else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4185	+	else if(variable == "invMass"){
4186	+	double tauMass = 1.777;  // PDG 2010
4187	+	double pionMass = 0.140; // PDG 2010
4188	+	TLorentzVector fourVector1(0, 0, 0, 0);
4189	+	TLorentzVector fourVector2(0, 0, 0, 0);
4190	+	fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, tauMass);
4191	+	fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
4192	+	value = (fourVector1 + fourVector2).M();
4193	+	}
4194		else if(variable == "chargeProduct"){
4195		value = object1->charge*object2->charge;
4196		}
4197
4198	<	else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4198	>	else{clog << "WARNING: invalid tau-track pair variable '" << variable << "'\n"; value = -999;}
4199		value = applyFunction(function, value);
4200		return value;
4201		}
#	Line 4094 | Line 4215 | OSUAnalysis::valueLookup (const BNtrack*
4215		else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);
4216		else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;
4217
4218	<	else { clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
4218	>	else { clog << "WARNING: invalid track-event pair variable '" << variable << "'\n"; value = -999; }
4219
4220		value = applyFunction(function, value);
4221
#	Line 4116 | Line 4237 | OSUAnalysis::valueLookup (const BNelectr
4237		stringValue = "none";
4238		}
4239
4240	<	else { clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
4240	>	else { clog << "WARNING: invalid electron-trigobj variable '" << variable << "'\n"; value = -999; }
4241
4242		value = applyFunction(function, value);
4243
#	Line 4132 | Line 4253 | OSUAnalysis::valueLookup (const BNmuon*
4253
4254		if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4255
4256	<	else { clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
4256	>	else { clog << "WARNING: invalid muon-trigobj variable '" << variable << "'\n"; value = -999; }
4257
4258		value = applyFunction(function, value);
4259
#	Line 4252 | Line 4373 | OSUAnalysis::valueLookup (const BNstop*
4373
4374
4375
4376	<	else { clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
4376	>	else { clog << "WARNING: invalid stop variable '" << variable << "'\n"; value = -999; }
4377
4378		value = applyFunction(function, value);
4379

Diff Legend

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