ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitHzz4l/NonMCBackground/src/applyEMU.cc

Comparing UserCode/MitHzz4l/NonMCBackground/src/applyEMU.cc (file contents):
Revision 1.3 by khahn, Wed Jun 20 19:17:19 2012 UTC vs.
Revision 1.4 by dkralph, Thu Jun 21 21:26:33 2012 UTC

#	Line 95 | Line 95 | vector<bool>   PFnoPUflag;;
95		//
96		// prototypes
97		//----------------------------------------------------------------------------
98	<	void initRunLumiRangeMap();
99	<
98	>	void initRunLumiRangeMap(ControlFlags &ctrl);
99
100		//
101		// MAIN
#	Line 205 | Line 204 | int main(int argc, char** argv)
204		}
205
206		} else {
207	<	initRunLumiRangeMap();
207	>	initRunLumiRangeMap(ctrl);
208		}
209
210		//  initMuonIDMVA();
#	Line 315 | Line 314 | int main(int argc, char** argv)
314		if( ctrl.fillGen )
315		fillGenInfo( mcArr, mcEvtInfo, geninfo, ESampleType::kHZZ, ctrl);
316		} else {
318	–	/*
319	–	// JSON
317		if(!(ctrl.noJSON) ) {
318	<	RunLumiRangeMap::RunLumiPairType rl(info->RunNum(), info->LumiSec());
319	<	if( !(rlrm.HasRunLumi(rl)) )  {
323	<	if( ctrl.debug ) cout << "\tfails JSON" << endl;
324	<	continue;
325	<	}
318	>	RunLumiRangeMap::RunLumiPairType rl(info->RunNum(), info->LumiSec());
319	>	if( !(rlrm.HasRunLumi(rl)) ) continue;
320		}
327	–	*/
321		// if( !passHLTEMU(ctrl,triggerBits) ) {
322		//   continue;
323		// }
#	Line 352 | Line 345 | int main(int argc, char** argv)
345		if( ret4l.status.pass() ) {
346
347		TLorentzVector pfmet; pfmet.SetPxPyPzE(metArr->At(0)->Mex(),metArr->At(0)->Mey(),0,0);
348	<	fillEventInfo(info,pfmet,evtinfo);
348	>	fillEventInfo( info, pfmet, evtinfo, ctrl.mc ? getNPU(puArr) : 0);
349		foTree.Fill();
350
351		if( ctrl.mc)
#	Line 367 | Line 360 | int main(int argc, char** argv)
360		nt.WriteClose();
361		}
362		//----------------------------------------------------------------------------
363	<	void initRunLumiRangeMap()
363	>	void initRunLumiRangeMap(ControlFlags &ctrl)
364		//----------------------------------------------------------------------------
365		{
366		/*
#	Line 381 | Line 374 | void initRunLumiRangeMap()
374		*/
375
376		// 2012 only for now ...
377	<	rlrm.AddJSONFile(std::string("./data/Cert_190456-194479_8TeV_PromptReco_Collisions12_JSON.txt"));
377	>	rlrm.AddJSONFile(string(ctrl.jsonFile));
378
379		};

Diff Legend

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