ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitHzz4l/Selection/src/applySelection.cc

Comparing UserCode/MitHzz4l/Selection/src/applySelection.cc (file contents):
Revision 1.60 by dkralph, Tue Oct 23 11:39:21 2012 UTC vs.
Revision 1.61 by anlevin, Wed Oct 31 14:28:14 2012 UTC

#	Line 172 | Line 172 | int main(int argc, char** argv)
172		}
173		ctrl.dump();
174		cout << "\n\nNOTE: now setting era with arguments... double check this doesnt mess something else up\n\n" << endl;
175	<	bool doJets = true;//TString(ctrl.mcfmfname).Contains("doJets");
175	>	bool doJets = false;//TString(ctrl.mcfmfname).Contains("doJets");
176		assert(ctrl.doFSR);
177
178		//
#	Line 264 | Line 264 | int main(int argc, char** argv)
264		TrigInfo ti;
265		initAnalysisTriggers(ti);
266		if(ctrl.do_escale) {
267	<	electron_momentum_correction.initialize_regression("EGamma/EGammaAnalysisTools/data/eleEnergyRegWeights_V1.root");
267	>	electron_momentum_correction.initialize_regression("../EGamma/EGammaAnalysisTools/data/eleEnergyRegWeights_V1.root");
268		if(ctrl.mc) {
269	<	if(ctrl.era == 2011) assert(0); // don't know which file to use yet
269	>	if(ctrl.era == 2011) ctrl.smearing_scaling_dataset = "Fall11";
270		else                 ctrl.smearing_scaling_dataset = "Summer12_DR53X_HCP2012";
271		} else {
272	<	if(ctrl.era == 2011) assert(0); // don't know which file to use yet
272	>	if(ctrl.era == 2011) ctrl.smearing_scaling_dataset = "Jan16ReReco";
273		else                 ctrl.smearing_scaling_dataset = "2012Jul13ReReco";
274		}
275		}
#	Line 395 | Line 395 | int main(int argc, char** argv)
395		currentFile = string(chain->GetFile()->GetEndpointUrl()->GetFile());
396		}
397		if( ctrl.debug ) cout << "file is : " << currentFile  << endl;
398	<	passes_HLT = passHLT(ctrl, triggerBits, ti, info->RunNum()); // NOTE: run value is not used if it's MC
398	>	passes_HLT = passHLT(ctrl, triggerBits, ti, info->RunNum(), hltTable, fTrigObjs); // NOTE: run value is not used if it's MC
399
400	+
401		// data/MC
402		if(ctrl.mc) {
403		if(ctrl.fillGen) fillGenInfo( mcArr, mcEvtInfo, geninfo, genSampleType, ctrl);

Diff Legend

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