ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/dasu/UltraFastSim/generateData.cc

Comparing UserCode/dasu/UltraFastSim/generateData.cc (file contents):
Revision 1.11 by dasu, Thu Feb 24 07:34:29 2011 UTC vs.
Revision 1.14 by dasu, Fri Feb 25 17:10:39 2011 UTC

#	Line 13 | Line 13 | using namespace std;
13		#include "Pythia.h"
14		using namespace Pythia8;
15
16	–	#include "TROOT.h"
17	–	#include "TFile.h"
18	–
16		#include "UltraFastSim.h"
17	<	#include "bbHAnalysis.h"
21	<	#include "ZHAnalysis.h"
17	>	#include "UFSDataStore.h"
18
19		int main(int argc, char **argv) {
20		// Generator. Process selection. LHC initialization. Histogram.
#	Line 172 | Line 168 | int main(int argc, char **argv) {
168		}
169		}
170
175	–	string name(argv[1]);
176	–	name += ".root";
177	–	TFile *outFile = TFile::Open(name.c_str(), "recreate");
178	–
171		// Initialize pythia
172
173		pythia.init( 2212, 2212, 14000.);
#	Line 192 | Line 184 | int main(int argc, char **argv) {
184
185		// Ultra Fast Simulator
186
187	<	UltraFastSim ufs(rndmPtr);
188	<	bbHAnalysis bbH(outFile, &pythia, &ufs, true);
197	<	ZHAnalysis ZH; // outFile, &pythia, &ufs, true);
198	<	ZH.BookTree();
187	>	UltraFastSim ufs;
188	>	UFSDataStore dataStore(argv[1], &ufs);
189
190		// Begin event loop
191		for (int iEvent = 0; iEvent < nEvents; ) {
#	Line 232 | Line 222 | int main(int argc, char **argv) {
222
223		// Ultra fast simulation
224
225	<	if(!ufs.run(pythia.event))
225	>	if(!ufs.run(pythia.event, rndmPtr))
226		{
227		cerr << "Ultra fast simulation failed - aborting" << endl;
228		exit(1);
229		}
230
231	<	// Run bbHAnalysis
242	<
243	<	if(!bbH.run())
244	<	{
245	<	cerr << "bbH Analysis failed - aborting" << endl;
246	<	exit(2);
247	<	}
248	<
249	<	// Run ZHAnalysis
231	>	// Store data
232
233	<	if(!ZH.Run(&ufs))
233	>	if(!dataStore.run())
234		{
235	<	cerr << "ZH Analysis failed - aborting" << endl;
235	>	cerr << "Failed to store data" << endl;
236		exit(3);
237		}
238
#	Line 266 | Line 248 | int main(int argc, char **argv) {
248		pythia.statistics();
249		pileupPythia.statistics();
250
269	–	bbH.end();
270	–
271	–	outFile->cd();
272	–	outFile->Write();
273	–	outFile->Close();
274	–
251		return 0;
252
253		}

Diff Legend

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